Revert C and C++ grammar change (#71997)

* Revert C and C++ grammar change Fixes #71821
microsoft · Apr 10, 2019 · 2f7c397 · 2f7c397
1 parent e6f8493
commit 2f7c397
Show file tree

Hide file tree

Showing 10 changed files with 948 additions and 3,714 deletions.
diff --git a/extensions/cpp/build/update-grammars.js b/extensions/cpp/build/update-grammars.js
@@ -6,8 +6,8 @@
 
 var updateGrammar = require('../../../build/npm/update-grammar');
 
-updateGrammar.update('jeff-hykin/cpp-textmate-grammar', '/syntaxes/c.tmLanguage.json', './syntaxes/c.tmLanguage.json');
-updateGrammar.update('jeff-hykin/cpp-textmate-grammar', '/syntaxes/cpp.tmLanguage.json', './syntaxes/cpp.tmLanguage.json');
+updateGrammar.update('atom/language-c', 'grammars/c.cson', './syntaxes/c.tmLanguage.json');
+updateGrammar.update('atom/language-c', 'grammars/c%2B%2B.cson', './syntaxes/cpp.tmLanguage.json');
 
 // `source.c.platform` which is still included by other grammars
 updateGrammar.update('textmate/c.tmbundle', 'Syntaxes/Platform.tmLanguage', './syntaxes/platform.tmLanguage.json');

diff --git a/extensions/cpp/cgmanifest.json b/extensions/cpp/cgmanifest.json
@@ -4,14 +4,14 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "jeff-hykin/cpp-textmate-grammar",
-					"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
-					"commitHash": "d57808aa3db2242f1f2be1aec19649a852aaa52e"
+					"name": "atom/language-c",
+					"repositoryUrl": "https://github.com/atom/language-c",
+					"commitHash": "9c0c5f202741a5647025db8d5df5fefba47b036c"
 				}
 			},
 			"license": "MIT",
-			"version": "1.4.5",
-			"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
+			"version": "0.58.1",
+			"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from the Atom package https://atom.io/packages/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
 		},
 		{
 			"component": {

diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.tmLanguage.json