Try new Rust grammar (#108254)

Part of #64488
microsoft · Nov 2, 2020 · a5d719c · a5d719c
1 parent 6d20077
commit a5d719c
Show file tree

Hide file tree

Showing 5 changed files with 2,268 additions and 811 deletions.
diff --git a/extensions/rust/cgmanifest.json b/extensions/rust/cgmanifest.json
@@ -4,14 +4,14 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "language-rust",
-					"repositoryUrl": "https://github.com/zargony/atom-language-rust",
-					"commitHash": "7d59e2ad79fbe5925bd2fd3bd3857bf9f421ff6f"
+					"name": "rust-syntax",
+					"repositoryUrl": "https://github.com/dustypomerleau/rust-syntax",
+					"commitHash": "f3eb2221c8c334f1aae1fbc7af9a6c0b753bb29b"
 				}
 			},
 			"license": "MIT",
-			"description": "The files syntaxes/rust.tmLanguage.json was derived from the Atom package https://atom.io/packages/language-rust.",
-			"version": "0.4.12"
+			"description": "A TextMate-style grammar for Rust.",
+			"version": "0.2.10"
 		}
 	],
 	"version": 1

diff --git a/extensions/rust/package.json b/extensions/rust/package.json
@@ -5,21 +5,32 @@
 	"version": "1.0.0",
 	"publisher": "vscode",
 	"license": "MIT",
-	"engines": { "vscode": "*" },
+	"engines": {
+		"vscode": "*"
+	},
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js zargony/atom-language-rust grammars/rust.cson ./syntaxes/rust.tmLanguage.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js dustypomerleau/rust-syntax syntaxes/rust.tmLanguage.json ./syntaxes/rust.tmLanguage.json"
 	},
 	"contributes": {
-		"languages": [{
-			"id": "rust",
-			"extensions": [".rs"],
-			"aliases": ["Rust", "rust"],
-			"configuration": "./language-configuration.json"
-		}],
-		"grammars": [{
-			"language": "rust",
-			"path": "./syntaxes/rust.tmLanguage.json",
-			"scopeName":"source.rust"
-		}]
+		"languages": [
+			{
+				"id": "rust",
+				"extensions": [
+					".rs"
+				],
+				"aliases": [
+					"Rust",
+					"rust"
+				],
+				"configuration": "./language-configuration.json"
+			}
+		],
+		"grammars": [
+			{
+				"language": "rust",
+				"path": "./syntaxes/rust.tmLanguage.json",
+				"scopeName": "source.rust"
+			}
+		]
 	}
-}
+}