Adopt rust-analyzer's Rust TM grammar

Xanewok · Xanewok · commit 64c92e1b69a6 · 2020-08-19T22:27:26.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ### Unreleased
 
+* Update built-in Rust grammar
+
 ### 0.7.8 - 2020-05-13
 
 * Rebrand extension as RLS-agnostic
diff --git a/package.json b/package.json
@@ -82,6 +82,13 @@
                 "configuration": "./language-configuration.json"
             }
         ],
+        "grammars": [
+            {
+                "language": "rust",
+                "scopeName": "source.rust",
+                "path": "rust.tmGrammar.json"
+            }
+        ],
         "snippets": [
             {
                 "language": "rust",
diff --git a/rust-analyzer/editors/code/package.json b/rust-analyzer/editors/code/package.json
@@ -641,11 +641,6 @@
             }
         ],
         "grammars": [
-            {
-                "language": "rust",
-                "scopeName": "source.rust",
-                "path": "rust.tmGrammar.json"
-            },
             {
                 "language": "ra_syntax_tree",
                 "scopeName": "source.ra_syntax_tree",
diff --git a/rust.tmGrammar.json b/rust.tmGrammar.json

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,13 @@`
`82`	`82`	`"configuration": "./language-configuration.json"`
`83`	`83`	`}`
`84`	`84`	`],`
	`85`	`+ "grammars": [`
	`86`	`+ {`
	`87`	`+ "language": "rust",`
	`88`	`+ "scopeName": "source.rust",`
	`89`	`+ "path": "rust.tmGrammar.json"`
	`90`	`+ }`
	`91`	`+ ],`
`85`	`92`	`"snippets": [`
`86`	`93`	`{`
`87`	`94`	`"language": "rust",`
Original file line number	Diff line number	Diff line change
`@@ -641,11 +641,6 @@`
`641`	`641`	`}`
`642`	`642`	`],`
`643`	`643`	`"grammars": [`
`644`		`- {`
`645`		`- "language": "rust",`
`646`		`- "scopeName": "source.rust",`
`647`		`- "path": "rust.tmGrammar.json"`
`648`		`- },`
`649`	`644`	`{`
`650`	`645`	`"language": "ra_syntax_tree",`
`651`	`646`	`"scopeName": "source.ra_syntax_tree",`