mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #6450

Browse Source 
6450: Textmate grammar: Distinguish turbofish function calls from namespaces r=dustypomerleau a=dustypomerleau

Fixes #6446. 

Co-authored-by: Dusty Pomerleau <dustypomerleau@users.noreply.github.com>
This commit is contained in:
bors[bot] 2020-11-03 12:55:38 +00:00 committed by GitHub
commit 0373434ed4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
editors/code/rust.tmGrammar.json
View File

@ -544,9 +544,66 @@
{
"include": "#lvariables"
},
{
"include": "#constants"
},
{
"include": "#gtypes"
},
{
"include": "#functions"
},
{
"include": "#lifetimes"
},
{
"include": "#macros"
},
{
"include": "#namespaces"
},
{
"include": "#punctuation"
},
{
"include": "#strings"
},
{
"include": "#types"
},
{
"include": "#variables"
}
]
},
{
"comment": "function/method calls with turbofish",
"name": "meta.function.call.rust",
"begin": "((?:r#(?!crate|[Ss]elf|super))?[A-Za-z0-9_]+)(?=::<.*>\\()",
"beginCaptures": {
"1": {
"name": "entity.name.function.rust"
}
},
"end": "\\)",
"endCaptures": {
"0": {
"name": "punctuation.brackets.round.rust"
}
},
"patterns": [
{
"include": "#block-comments"
},
{
"include": "#comments"
},
{
"include": "#keywords"
},
{
"include": "#lvariables"
},
{
"include": "#constants"
},
@ -562,6 +619,9 @@
{
"include": "#macros"
},
{
"include": "#namespaces"
},
{
"include": "#punctuation"
},