github-linguist 5.3.3 → 6.0.0

data/grammars/source.ruby.rspec.cucumber.steps.json

@@ -1,28 +1,14 @@
 {
-  "fileTypes": [
-    "steps.rb"
-  ],
-  "foldingStartMarker": "^\\s*\\b(Given|When|Then|def)",
-  "foldingStopMarker": "^\\s*(end)$",
-  "keyEquivalent": "^~C",
   "name": "Cucumber Steps",
+  "scopeName": "source.ruby.rspec.cucumber.steps",
   "patterns": [
     {
-      "match": "\\b(GivenScenario|Given|When|Then)\\b",
-      "name": "keyword.other.step.cucumber"
+      "name": "keyword.other.step.cucumber",
+      "match": "\\b(GivenScenario|Given|When|Then)\\b"
     },
     {
-      "begin": "\\b(?<=GivenScenario|Given|When|Then) (\")",
-      "captures": {
-        "1": {
-          "name": "string.quoted.double.ruby"
-        },
-        "2": {
-          "name": "punctuation.definition.string.ruby"
-        }
-      },
-      "comment": "string after a Cucumber keyword",
       "contentName": "string.quoted.step.cucumber.classic.ruby",
+      "begin": "\\b(?\u003c=GivenScenario|Given|When|Then) (\")",
       "end": "((\\1))",
       "patterns": [
         {
@@ -31,20 +17,19 @@
         {
           "include": "#regex_sub"
         }
-      ]
-    },
-    {
-      "begin": "\\b(?<=GivenScenario|Given|When|Then) (')",
+      ],
       "captures": {
         "1": {
-          "name": "string.quoted.single.ruby"
+          "name": "string.quoted.double.ruby"
         },
         "2": {
           "name": "punctuation.definition.string.ruby"
         }
-      },
-      "comment": "string after a Cucumber keyword",
+      }
+    },
+    {
       "contentName": "string.quoted.step.cucumber.classic.ruby",
+      "begin": "\\b(?\u003c=GivenScenario|Given|When|Then) (')",
       "end": "((\\1))",
       "patterns": [
         {
@@ -53,67 +38,72 @@
         {
           "include": "#interpolated_ruby"
         }
-      ]
-    },
-    {
-      "begin": "\\b(?<=GivenScenario|Given|When|Then) (/)",
+      ],
       "captures": {
         "1": {
-          "name": "string.regexp.classic.ruby"
+          "name": "string.quoted.single.ruby"
         },
         "2": {
           "name": "punctuation.definition.string.ruby"
         }
-      },
-      "comment": "regular expression after a Cucumber keyword",
+      }
+    },
+    {
       "contentName": "string.regexp.step.cucumber.classic.ruby",
+      "begin": "\\b(?\u003c=GivenScenario|Given|When|Then) (/)",
       "end": "((/[eimnosux]*))",
       "patterns": [
         {
           "include": "#regex_sub"
         }
-      ]
-    },
-    {
-      "begin": "\\b(?<=GivenScenario|Given|When|Then) (%r{)",
+      ],
       "captures": {
         "1": {
-          "name": "string.regexp.mod-r.ruby"
+          "name": "string.regexp.classic.ruby"
         },
         "2": {
           "name": "punctuation.definition.string.ruby"
         }
-      },
-      "comment": "regular expression after a Cucumber keyword",
+      }
+    },
+    {
       "contentName": "string.regexp.step.cucumber.mod-r.ruby",
+      "begin": "\\b(?\u003c=GivenScenario|Given|When|Then) (%r{)",
       "end": "((}[eimnosux]*))",
       "patterns": [
         {
           "include": "#regex_sub"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "string.regexp.mod-r.ruby"
+        },
+        "2": {
+          "name": "punctuation.definition.string.ruby"
+        }
+      }
     },
     {
-      "begin": "(?><<-CUCUMBER\\b)",
+      "name": "string.unquoted.embedded.cucumber.feature",
+      "contentName": "text.cucumber.embedded.ruby",
+      "begin": "(?\u003e\u003c\u003c-CUCUMBER\\b)",
+      "end": "\\s*CUCUMBER$",
+      "patterns": [
+        {
+          "include": "text.gherkin.feature"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "comment": "embedded Cucumber feature",
-      "contentName": "text.cucumber.embedded.ruby",
-      "end": "\\s*CUCUMBER$",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
-      "name": "string.unquoted.embedded.cucumber.feature",
-      "patterns": [
-        {
-          "include": "text.gherkin.feature"
-        }
-      ]
+      }
     },
     {
       "include": "source.ruby"
@@ -121,12 +111,14 @@
   ],
   "repository": {
     "escaped_char": {
-      "match": "\\\\(?:[0-7]{1,3}|x[\\da-fA-F]{1,2}|.)",
-      "name": "constant.character.escape.ruby"
+      "name": "constant.character.escape.ruby",
+      "match": "\\\\(?:[0-7]{1,3}|x[\\da-fA-F]{1,2}|.)"
     },
     "interpolated_ruby": {
       "patterns": [
         {
+          "name": "source.ruby.embedded.source",
+          "match": "#\\{(\\})",
           "captures": {
             "0": {
               "name": "punctuation.section.embedded.ruby"
@@ -134,19 +126,12 @@
             "1": {
               "name": "source.ruby.embedded.source.empty"
             }
-          },
-          "match": "#\\{(\\})",
-          "name": "source.ruby.embedded.source"
+          }
         },
         {
+          "name": "source.ruby.embedded.source",
           "begin": "#\\{",
-          "captures": {
-            "0": {
-              "name": "punctuation.section.embedded.ruby"
-            }
-          },
           "end": "\\}",
-          "name": "source.ruby.embedded.source",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
@@ -154,34 +139,39 @@
             {
               "include": "source.ruby"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.embedded.ruby"
+            }
+          }
         },
         {
+          "name": "variable.other.readwrite.instance.ruby",
+          "match": "(#@)[a-zA-Z_]\\w*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.ruby"
             }
-          },
-          "match": "(#@)[a-zA-Z_]\\w*",
-          "name": "variable.other.readwrite.instance.ruby"
+          }
         },
         {
+          "name": "variable.other.readwrite.class.ruby",
+          "match": "(#@@)[a-zA-Z_]\\w*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.ruby"
             }
-          },
-          "match": "(#@@)[a-zA-Z_]\\w*",
-          "name": "variable.other.readwrite.class.ruby"
+          }
         },
         {
+          "name": "variable.other.readwrite.global.ruby",
+          "match": "(#\\$)[a-zA-Z_]\\w*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.ruby"
             }
-          },
-          "match": "(#\\$)[a-zA-Z_]\\w*",
-          "name": "variable.other.readwrite.global.ruby"
+          }
         }
       ]
     },
@@ -189,17 +179,17 @@
       "patterns": [
         {
           "begin": "\\{",
-          "captures": {
-            "0": {
-              "name": "punctuation.section.scope.ruby"
-            }
-          },
           "end": "\\}",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.scope.ruby"
+            }
+          }
         },
         {
           "include": "source.ruby"
@@ -215,6 +205,8 @@
           "include": "#escaped_char"
         },
         {
+          "name": "string.regexp.arbitrary-repitition.ruby",
+          "match": "(\\{)\\d+(,\\d+)?(\\})",
           "captures": {
             "1": {
               "name": "punctuation.definition.arbitrary-repitition.ruby"
@@ -222,53 +214,48 @@
             "3": {
               "name": "punctuation.definition.arbitrary-repitition.ruby"
             }
-          },
-          "match": "(\\{)\\d+(,\\d+)?(\\})",
-          "name": "string.regexp.arbitrary-repitition.ruby"
+          }
         },
         {
+          "name": "string.regexp.character-class.ruby",
           "begin": "\\[(?:\\^?\\])?",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.character-class.ruby"
-            }
-          },
           "end": "\\]",
-          "name": "string.regexp.character-class.ruby",
           "patterns": [
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "\\(",
+          ],
           "captures": {
             "0": {
-              "name": "punctuation.definition.group.ruby"
+              "name": "punctuation.definition.character-class.ruby"
             }
-          },
-          "end": "\\)",
+          }
+        },
+        {
           "name": "string.regexp.group.ruby",
+          "begin": "\\(",
+          "end": "\\)",
           "patterns": [
             {
               "include": "#regex_sub"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.group.ruby"
+            }
+          }
         },
         {
+          "name": "comment.line.number-sign.ruby",
+          "match": "(?\u003c=^|\\s)(#)\\s[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.ruby"
             }
-          },
-          "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
-          "match": "(?<=^|\\s)(#)\\s[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$",
-          "name": "comment.line.number-sign.ruby"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.ruby.rspec.cucumber.steps",
-  "uuid": "B269B8F3-3A6D-4169-9E70-DD89A679416A"
-}
+  }
+}

data/grammars/source.rust.json

@@ -1,220 +1,10 @@
 {
   "name": "Rust",
   "scopeName": "source.rust",
-  "fileTypes": [
-    "rs"
-  ],
-  "repository": {
-    "block_doc_comment": {
-      "comment": "Block documentation comment",
-      "name": "comment.block.documentation.rust",
-      "begin": "/\\*[\\*!](?![\\*/])",
-      "end": "\\*/",
-      "patterns": [
-        {
-          "include": "#block_doc_comment"
-        },
-        {
-          "include": "#block_comment"
-        }
-      ]
-    },
-    "block_comment": {
-      "comment": "Block comment",
-      "name": "comment.block.rust",
-      "begin": "/\\*",
-      "end": "\\*/",
-      "patterns": [
-        {
-          "include": "#block_doc_comment"
-        },
-        {
-          "include": "#block_comment"
-        }
-      ]
-    },
-    "line_doc_comment": {
-      "comment": "Single-line documentation comment",
-      "name": "comment.line.documentation.rust",
-      "begin": "//[!/](?=[^/])",
-      "end": "$"
-    },
-    "line_comment": {
-      "comment": "Single-line comment",
-      "name": "comment.line.double-slash.rust",
-      "begin": "//",
-      "end": "$"
-    },
-    "escaped_character": {
-      "name": "constant.character.escape.rust",
-      "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
-    },
-    "string_literal": {
-      "comment": "Double-quote string literal",
-      "name": "string.quoted.double.rust",
-      "begin": "b?\"",
-      "end": "\"",
-      "patterns": [
-        {
-          "include": "#escaped_character"
-        }
-      ]
-    },
-    "raw_string_literal": {
-      "comment": "Raw double-quote string literal",
-      "name": "string.quoted.double.raw.rust",
-      "begin": "b?r(#*)\"",
-      "end": "\"\\1"
-    },
-    "sigils": {
-      "comment": "Sigil",
-      "name": "keyword.operator.sigil.rust",
-      "match": "[&*](?=[a-zA-Z0-9_\\(\\[\\|\\\"]+)"
-    },
-    "self": {
-      "comment": "Self variable",
-      "name": "variable.language.rust",
-      "match": "\\bself\\b"
-    },
-    "mut": {
-      "comment": "Mutable storage modifier",
-      "name": "storage.modifier.mut.rust",
-      "match": "\\bmut\\b"
-    },
-    "box": {
-      "comment": "Box storage modifier",
-      "name": "storage.modifier.box.rust",
-      "match": "\\bbox\\b"
-    },
-    "const": {
-      "comment": "Const storage modifier",
-      "name": "storage.modifier.const.rust",
-      "match": "\\bconst\\b"
-    },
-    "pub": {
-      "comment": "Visibility modifier",
-      "name": "storage.modifier.visibility.rust",
-      "match": "\\bpub\\b"
-    },
-    "unsafe": {
-      "comment": "Unsafe code keyword",
-      "name": "keyword.other.unsafe.rust",
-      "match": "\\bunsafe\\b"
-    },
-    "where": {
-      "comment": "Generic where clause",
-      "name": "keyword.other.where.rust",
-      "match": "\\bwhere\\b"
-    },
-    "lifetime": {
-      "comment": "Named lifetime",
-      "name": "storage.modifier.lifetime.rust",
-      "match": "'([a-zA-Z_][a-zA-Z0-9_]*)\\b",
-      "captures": {
-        "1": {
-          "name": "entity.name.lifetime.rust"
-        }
-      }
-    },
-    "ref_lifetime": {
-      "comment": "Reference with named lifetime",
-      "match": "&('([a-zA-Z_][a-zA-Z0-9_]*))\\b",
-      "captures": {
-        "1": {
-          "name": "storage.modifier.lifetime.rust"
-        },
-        "2": {
-          "name": "entity.name.lifetime.rust"
-        }
-      }
-    },
-    "core_types": {
-      "comment": "Built-in/core type",
-      "name": "storage.type.core.rust",
-      "match": "\\b(bool|char|usize|isize|u8|u16|u32|u64|u128|i8|i16|i32|i64|i128|f32|f64|str|Self|Option|Result)\\b"
-    },
-    "core_vars": {
-      "comment": "Core type variant",
-      "name": "support.constant.core.rust",
-      "match": "\\b(Some|None|Ok|Err)\\b"
-    },
-    "core_marker": {
-      "comment": "Core trait (marker)",
-      "name": "support.type.marker.rust",
-      "match": "\\b(Copy|Send|Sized|Sync)\\b"
-    },
-    "core_traits": {
-      "comment": "Core trait",
-      "name": "support.type.core.rust",
-      "match": "\\b(Drop|Fn|FnMut|FnOnce|Clone|PartialEq|PartialOrd|Eq|Ord|AsRef|AsMut|Into|From|Default|Iterator|Extend|IntoIterator|DoubleEndedIterator|ExactSizeIterator)\\b"
-    },
-    "std_types": {
-      "comment": "Standard library type",
-      "name": "storage.class.std.rust",
-      "match": "\\b(Box|String|Vec|Path|PathBuf)\\b"
-    },
-    "std_traits": {
-      "comment": "Standard library trait",
-      "name": "support.type.std.rust",
-      "match": "\\b(ToOwned|ToString)\\b"
-    },
-    "type": {
-      "comment": "A type",
-      "name": "entity.name.type.rust",
-      "match": "\\b([A-Za-z][_A-Za-z0-9]*|_[_A-Za-z0-9]+)\\b"
-    },
-    "type_params": {
-      "comment": "Type parameters",
-      "name": "meta.type_params.rust",
-      "begin": "<(?![=<])",
-      "end": "(?<![-])>",
-      "patterns": [
-        {
-          "include": "#block_comment"
-        },
-        {
-          "include": "#line_comment"
-        },
-        {
-          "include": "#sigils"
-        },
-        {
-          "include": "#mut"
-        },
-        {
-          "include": "#lifetime"
-        },
-        {
-          "include": "#core_types"
-        },
-        {
-          "include": "#core_marker"
-        },
-        {
-          "include": "#core_traits"
-        },
-        {
-          "include": "#std_types"
-        },
-        {
-          "include": "#std_traits"
-        },
-        {
-          "include": "#type_params"
-        }
-      ]
-    }
-  },
   "patterns": [
     {
-      "comment": "Implementation",
       "begin": "\\b(impl)\\b",
       "end": "\\{",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.rust"
-        }
-      },
       "patterns": [
         {
           "include": "#block_comment"
@@ -259,7 +49,12 @@
         {
           "include": "#type"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.rust"
+        }
+      }
     },
     {
       "include": "#block_doc_comment"
@@ -274,7 +69,6 @@
       "include": "#line_comment"
     },
     {
-      "comment": "Attribute",
       "name": "meta.attribute.rust",
       "begin": "#\\!?\\[",
       "end": "\\]",
@@ -297,7 +91,6 @@
       ]
     },
     {
-      "comment": "Single-quote string literal (character)",
       "name": "string.quoted.single.rust",
       "match": "b?'([^'\\\\]|\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.))'"
     },
@@ -308,62 +101,50 @@
       "include": "#raw_string_literal"
     },
     {
-      "comment": "Floating point literal (fraction)",
       "name": "constant.numeric.float.rust",
       "match": "\\b[0-9][0-9_]*\\.[0-9][0-9_]*([eE][+-]?[0-9_]+)?(f32|f64)?\\b"
     },
     {
-      "comment": "Floating point literal (exponent)",
       "name": "constant.numeric.float.rust",
       "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?[eE][+-]?[0-9_]+(f32|f64)?\\b"
     },
     {
-      "comment": "Floating point literal (typed)",
       "name": "constant.numeric.float.rust",
       "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?([eE][+-]?[0-9_]+)?(f32|f64)\\b"
     },
     {
-      "comment": "Integer literal (decimal)",
       "name": "constant.numeric.integer.decimal.rust",
       "match": "\\b[0-9][0-9_]*([ui](8|16|32|64|128|s|size))?\\b"
     },
     {
-      "comment": "Integer literal (hexadecimal)",
       "name": "constant.numeric.integer.hexadecimal.rust",
       "match": "\\b0x[a-fA-F0-9_]+([ui](8|16|32|64|128|s|size))?\\b"
     },
     {
-      "comment": "Integer literal (octal)",
       "name": "constant.numeric.integer.octal.rust",
       "match": "\\b0o[0-7_]+([ui](8|16|32|64|128|s|size))?\\b"
     },
     {
-      "comment": "Integer literal (binary)",
       "name": "constant.numeric.integer.binary.rust",
       "match": "\\b0b[01_]+([ui](8|16|32|64|128|s|size))?\\b"
     },
     {
-      "comment": "Static storage modifier",
       "name": "storage.modifier.static.rust",
       "match": "\\bstatic\\b"
     },
     {
-      "comment": "Boolean constant",
       "name": "constant.language.boolean.rust",
       "match": "\\b(true|false)\\b"
     },
     {
-      "comment": "Control keyword",
       "name": "keyword.control.rust",
       "match": "\\b(break|continue|else|if|in|for|loop|match|return|while)\\b"
     },
     {
-      "comment": "Keyword",
       "name": "keyword.other.rust",
       "match": "\\b(crate|extern|mod|let|ref|use|super|move)\\b"
     },
     {
-      "comment": "Reserved keyword",
       "name": "invalid.deprecated.rust",
       "match": "\\b(abstract|alignof|become|do|final|macro|offsetof|override|priv|proc|pure|sizeof|typeof|virtual|yield)\\b"
     },
@@ -395,29 +176,24 @@
       "include": "#pub"
     },
     {
-      "comment": "Miscellaneous operator",
       "name": "keyword.operator.misc.rust",
-      "match": "(=>|::|\\bas\\b)"
+      "match": "(=\u003e|::|\\bas\\b)"
     },
     {
-      "comment": "Comparison operator",
       "name": "keyword.operator.comparison.rust",
-      "match": "(&&|\\|\\||==|!=)"
+      "match": "(\u0026\u0026|\\|\\||==|!=)"
     },
     {
-      "comment": "Assignment operator",
       "name": "keyword.operator.assignment.rust",
-      "match": "(\\+=|-=|/=|\\*=|%=|\\^=|&=|\\|=|<<=|>>=|=)"
+      "match": "(\\+=|-=|/=|\\*=|%=|\\^=|\u0026=|\\|=|\u003c\u003c=|\u003e\u003e=|=)"
     },
     {
-      "comment": "Arithmetic operator",
       "name": "keyword.operator.arithmetic.rust",
-      "match": "(!|\\+|-|/|\\*|%|\\^|&|\\||<<|>>)"
+      "match": "(!|\\+|-|/|\\*|%|\\^|\u0026|\\||\u003c\u003c|\u003e\u003e)"
     },
     {
-      "comment": "Comparison operator (second group because of regex precedence)",
       "name": "keyword.operator.comparison.rust",
-      "match": "(<=|>=|<|>)"
+      "match": "(\u003c=|\u003e=|\u003c|\u003e)"
     },
     {
       "include": "#core_types"
@@ -438,27 +214,22 @@
       "include": "#std_traits"
     },
     {
-      "comment": "Built-in macro",
       "name": "support.function.builtin.rust",
-      "match": "\\b(macro_rules|format_args|env|option_env|concat_idents|concat|log_syntax|line|column|file|stringify|include|include_str|include_bytes|module_path|asm|cfg|trace_macros)!"
+      "match": "\\b(macro_rules|compile_error|format_args|env|option_env|concat_idents|concat|line|column|file|stringify|include|include_str|include_bytes|module_path|cfg)!"
     },
     {
-      "comment": "Core macro",
       "name": "support.function.core.rust",
-      "match": "\\b(panic|assert|assert_eq|debug_assert|debug_assert_eq|try|write|writeln|unreachable|unimplemented)!"
+      "match": "\\b(panic|assert|assert_eq|assert_ne|debug_assert|debug_assert_eq|debug_assert_ne|try|write|writeln|unreachable|unimplemented)!"
     },
     {
-      "comment": "Standard library macro",
       "name": "support.function.std.rust",
-      "match": "\\b(format|print|println|select|vec)!"
+      "match": "\\b(format|print|println|eprint|eprintln|select|vec)!"
     },
     {
-      "comment": "Logging macro",
       "name": "support.function.log.rust",
       "match": "\\b(log|error|warn|info|debug|trace|log_enabled)!"
     },
     {
-      "comment": "Invokation of a macro",
       "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*\\!)\\s*[({\\[]",
       "captures": {
         "1": {
@@ -467,7 +238,6 @@
       }
     },
     {
-      "comment": "Function call",
       "match": "\\b([A-Za-z][A-Za-z0-9_]*|_[A-Za-z0-9_]+)\\s*\\(",
       "captures": {
         "1": {
@@ -476,9 +246,13 @@
       }
     },
     {
-      "comment": "Function call with type parameters",
-      "begin": "\\b([A-Za-z][A-Za-z0-9_]*|_[A-Za-z0-9_]+)\\s*(::)(?=\\s*<.*>\\s*\\()",
+      "begin": "\\b([A-Za-z][A-Za-z0-9_]*|_[A-Za-z0-9_]+)\\s*(::)(?=\\s*\u003c.*\u003e\\s*\\()",
       "end": "\\(",
+      "patterns": [
+        {
+          "include": "#type_params"
+        }
+      ],
       "captures": {
         "1": {
           "name": "entity.name.function.rust"
@@ -486,25 +260,11 @@
         "2": {
           "name": "keyword.operator.misc.rust"
         }
-      },
-      "patterns": [
-        {
-          "include": "#type_params"
-        }
-      ]
+      }
     },
     {
-      "comment": "Function definition",
       "begin": "\\b(fn)\\s+([A-Za-z][A-Za-z0-9_]*|_[A-Za-z0-9_]+)",
       "end": "[\\{;]",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.fn.rust"
-        },
-        "2": {
-          "name": "entity.name.function.rust"
-        }
-      },
       "patterns": [
         {
           "include": "#block_comment"
@@ -552,24 +312,22 @@
           "include": "#unsafe"
         },
         {
-          "comment": "Function arguments",
-          "match": "\bfn\b",
-          "name": "keyword.other.fn.rust"
+          "name": "keyword.other.fn.rust",
+          "match": "\u0008fn\u0008"
         }
-      ]
-    },
-    {
-      "comment": "Type declaration",
-      "begin": "\\b(enum|struct|trait|union)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
-      "end": "[\\{\\(;]",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "storage.type.rust"
+          "name": "keyword.other.fn.rust"
         },
         "2": {
-          "name": "entity.name.type.rust"
+          "name": "entity.name.function.rust"
         }
-      },
+      }
+    },
+    {
+      "begin": "\\b(enum|struct|trait|union)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
+      "end": "[\\{\\(;]",
       "patterns": [
         {
           "include": "#block_comment"
@@ -595,12 +353,57 @@
         {
           "include": "#where"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.rust"
+        },
+        "2": {
+          "name": "entity.name.type.rust"
+        }
+      }
     },
     {
-      "comment": "Type alias",
       "begin": "\\b(type)\\s+([a-zA-Z_][a-zA-Z0-9_]*)",
       "end": ";",
+      "patterns": [
+        {
+          "include": "#block_comment"
+        },
+        {
+          "include": "#line_comment"
+        },
+        {
+          "include": "#sigils"
+        },
+        {
+          "include": "#mut"
+        },
+        {
+          "include": "#lifetime"
+        },
+        {
+          "include": "#ref_lifetime"
+        },
+        {
+          "include": "#core_types"
+        },
+        {
+          "include": "#core_marker"
+        },
+        {
+          "include": "#core_traits"
+        },
+        {
+          "include": "#std_types"
+        },
+        {
+          "include": "#std_traits"
+        },
+        {
+          "include": "#type_params"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.rust"
@@ -608,7 +411,141 @@
         "2": {
           "name": "entity.name.type.rust"
         }
-      },
+      }
+    }
+  ],
+  "repository": {
+    "block_comment": {
+      "name": "comment.block.rust",
+      "begin": "/\\*",
+      "end": "\\*/",
+      "patterns": [
+        {
+          "include": "#block_doc_comment"
+        },
+        {
+          "include": "#block_comment"
+        }
+      ]
+    },
+    "block_doc_comment": {
+      "name": "comment.block.documentation.rust",
+      "begin": "/\\*[\\*!](?![\\*/])",
+      "end": "\\*/",
+      "patterns": [
+        {
+          "include": "#block_doc_comment"
+        },
+        {
+          "include": "#block_comment"
+        }
+      ]
+    },
+    "box": {
+      "name": "storage.modifier.box.rust",
+      "match": "\\bbox\\b"
+    },
+    "const": {
+      "name": "storage.modifier.const.rust",
+      "match": "\\bconst\\b"
+    },
+    "core_marker": {
+      "name": "support.type.marker.rust",
+      "match": "\\b(Copy|Send|Sized|Sync)\\b"
+    },
+    "core_traits": {
+      "name": "support.type.core.rust",
+      "match": "\\b(Drop|Fn|FnMut|FnOnce|Clone|PartialEq|PartialOrd|Eq|Ord|AsRef|AsMut|Into|From|Default|Iterator|Extend|IntoIterator|DoubleEndedIterator|ExactSizeIterator)\\b"
+    },
+    "core_types": {
+      "name": "storage.type.core.rust",
+      "match": "\\b(bool|char|usize|isize|u8|u16|u32|u64|u128|i8|i16|i32|i64|i128|f32|f64|str|Self|Option|Result)\\b"
+    },
+    "core_vars": {
+      "name": "support.constant.core.rust",
+      "match": "\\b(Some|None|Ok|Err)\\b"
+    },
+    "escaped_character": {
+      "name": "constant.character.escape.rust",
+      "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
+    },
+    "lifetime": {
+      "name": "storage.modifier.lifetime.rust",
+      "match": "'([a-zA-Z_][a-zA-Z0-9_]*)\\b",
+      "captures": {
+        "1": {
+          "name": "entity.name.lifetime.rust"
+        }
+      }
+    },
+    "line_comment": {
+      "name": "comment.line.double-slash.rust",
+      "begin": "//",
+      "end": "$"
+    },
+    "line_doc_comment": {
+      "name": "comment.line.documentation.rust",
+      "begin": "//[!/](?=[^/])",
+      "end": "$"
+    },
+    "mut": {
+      "name": "storage.modifier.mut.rust",
+      "match": "\\bmut\\b"
+    },
+    "pub": {
+      "name": "storage.modifier.visibility.rust",
+      "match": "\\bpub\\b"
+    },
+    "raw_string_literal": {
+      "name": "string.quoted.double.raw.rust",
+      "begin": "b?r(#*)\"",
+      "end": "\"\\1"
+    },
+    "ref_lifetime": {
+      "match": "\u0026('([a-zA-Z_][a-zA-Z0-9_]*))\\b",
+      "captures": {
+        "1": {
+          "name": "storage.modifier.lifetime.rust"
+        },
+        "2": {
+          "name": "entity.name.lifetime.rust"
+        }
+      }
+    },
+    "self": {
+      "name": "variable.language.rust",
+      "match": "\\bself\\b"
+    },
+    "sigils": {
+      "name": "keyword.operator.sigil.rust",
+      "match": "[\u0026*](?=[a-zA-Z0-9_\\(\\[\\|\\\"]+)"
+    },
+    "std_traits": {
+      "name": "support.type.std.rust",
+      "match": "\\b(ToOwned|ToString)\\b"
+    },
+    "std_types": {
+      "name": "storage.class.std.rust",
+      "match": "\\b(Box|String|Vec|Path|PathBuf)\\b"
+    },
+    "string_literal": {
+      "name": "string.quoted.double.rust",
+      "begin": "b?\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#escaped_character"
+        }
+      ]
+    },
+    "type": {
+      "name": "entity.name.type.rust",
+      "match": "\\b([A-Za-z][_A-Za-z0-9]*|_[_A-Za-z0-9]+)\\b"
+    },
+    "type_params": {
+      "name": "meta.type_params.rust",
+      "begin": "\u003c(?![=\u003c])",
+      "end": "(?\u003c![-])\u003e",
       "patterns": [
         {
           "include": "#block_comment"
@@ -625,9 +562,6 @@
         {
           "include": "#lifetime"
         },
-        {
-          "include": "#ref_lifetime"
-        },
         {
           "include": "#core_types"
         },
@@ -647,6 +581,14 @@
           "include": "#type_params"
         }
       ]
+    },
+    "unsafe": {
+      "name": "keyword.other.unsafe.rust",
+      "match": "\\bunsafe\\b"
+    },
+    "where": {
+      "name": "keyword.other.where.rust",
+      "match": "\\bwhere\\b"
     }
-  ]
-}
+  }
+}