Merge pull request #38 from icedrocket/fix-attributes-in-call

Fix attributes highlighting in function call

Author: Wilfred

syntaxes/rust.tmLanguage.json

@@ -117,54 +117,6 @@
                 }
             }
         },
-        {
-            "comment": "attributes",
-            "name": "meta.attribute.rust",
-            "begin": "(#)(\\!?)(\\[)",
-            "beginCaptures": {
-                "1": {
-                    "name": "punctuation.definition.attribute.rust"
-                },
-                "2": {
-                    "name": "keyword.operator.attribute.inner.rust"
-                },
-                "3": {
-                    "name": "punctuation.brackets.attribute.rust"
-                }
-            },
-            "end": "\\]",
-            "endCaptures": {
-                "0": {
-                    "name": "punctuation.brackets.attribute.rust"
-                }
-            },
-            "patterns": [
-                {
-                    "include": "#block-comments"
-                },
-                {
-                    "include": "#comments"
-                },
-                {
-                    "include": "#keywords"
-                },
-                {
-                    "include": "#lifetimes"
-                },
-                {
-                    "include": "#punctuation"
-                },
-                {
-                    "include": "#strings"
-                },
-                {
-                    "include": "#gtypes"
-                },
-                {
-                    "include": "#types"
-                }
-            ]
-        },
         {
             "comment": "modules",
             "match": "(mod)\\s+((?:r#(?!crate|[Ss]elf|super))?[a-z][A-Za-z0-9_]*)",
@@ -255,6 +207,9 @@
         {
             "include": "#comments"
         },
+        {
+            "include": "#attributes"
+        },
         {
             "include": "#lvariables"
         },
@@ -438,6 +393,51 @@
                 }
             }
         },
+        "attributes": {
+            "comment": "attributes",
+            "name": "meta.attribute.rust",
+            "begin": "(#)(\\!?)(\\[)",
+            "beginCaptures": {
+                "1": {
+                    "name": "punctuation.definition.attribute.rust"
+                },
+                "3": {
+                    "name": "punctuation.brackets.attribute.rust"
+                }
+            },
+            "end": "\\]",
+            "endCaptures": {
+                "0": {
+                    "name": "punctuation.brackets.attribute.rust"
+                }
+            },
+            "patterns": [
+                {
+                    "include": "#block-comments"
+                },
+                {
+                    "include": "#comments"
+                },
+                {
+                    "include": "#keywords"
+                },
+                {
+                    "include": "#lifetimes"
+                },
+                {
+                    "include": "#punctuation"
+                },
+                {
+                    "include": "#strings"
+                },
+                {
+                    "include": "#gtypes"
+                },
+                {
+                    "include": "#types"
+                }
+            ]
+        },
         "functions": {
             "patterns": [
                 {
@@ -546,6 +546,9 @@
                         {
                             "include": "#comments"
                         },
+                        {
+                            "include": "#attributes"
+                        },
                         {
                             "include": "#keywords"
                         },
@@ -606,6 +609,9 @@
                         {
                             "include": "#comments"
                         },
+                        {
+                            "include": "#attributes"
+                        },
                         {
                             "include": "#keywords"
                         },

syntaxes/rust.tmLanguage.yml

@@ -71,30 +71,6 @@ patterns:
         name: entity.name.type.macro.rust
       5:
         name: punctuation.brackets.curly.rust
-  -
-    comment: attributes
-    name: meta.attribute.rust
-    begin: '(#)(\!?)(\[)'
-    beginCaptures:
-      1:
-        name: punctuation.definition.attribute.rust
-      2:
-        name: keyword.operator.attribute.inner.rust
-      3:
-        name: punctuation.brackets.attribute.rust
-    end: '\]'
-    endCaptures:
-      0:
-        name: punctuation.brackets.attribute.rust
-    patterns:
-      - include: '#block-comments'
-      - include: '#comments'
-      - include: '#keywords'
-      - include: '#lifetimes'
-      - include: '#punctuation'
-      - include: '#strings'
-      - include: '#gtypes'
-      - include: '#types'
   -
     comment: modules
     match: (mod)\s+((?:r#(?!crate|[Ss]elf|super))?[a-z][A-Za-z0-9_]*)
@@ -142,6 +118,7 @@ patterns:
       - include: '#lvariables'
   - include: '#block-comments'
   - include: '#comments'
+  - include: '#attributes'
   - include: '#lvariables'
   - include: '#constants'
   - include: '#gtypes'
@@ -254,6 +231,28 @@ repository:
         name: constant.character.escape.unicode.punctuation.rust
       5:
         name: constant.character.escape.unicode.punctuation.rust
+  attributes:
+    comment: attributes
+    name: meta.attribute.rust
+    begin: '(#)(\!?)(\[)'
+    beginCaptures:
+      1:
+        name: punctuation.definition.attribute.rust
+      3:
+        name: punctuation.brackets.attribute.rust
+    end: '\]'
+    endCaptures:
+      0:
+        name: punctuation.brackets.attribute.rust
+    patterns:
+      - include: '#block-comments'
+      - include: '#comments'
+      - include: '#keywords'
+      - include: '#lifetimes'
+      - include: '#punctuation'
+      - include: '#strings'
+      - include: '#gtypes'
+      - include: '#types'
   functions:
     patterns:
       -
@@ -317,6 +316,7 @@ repository:
         patterns:
           - include: '#block-comments'
           - include: '#comments'
+          - include: "#attributes"
           - include: '#keywords'
           - include: '#lvariables'
           - include: '#constants'
@@ -343,6 +343,7 @@ repository:
         patterns:
           - include: '#block-comments'
           - include: '#comments'
+          - include: "#attributes"
           - include: '#keywords'
           - include: '#lvariables'
           - include: '#constants'