Extract diff language into its own extension (#136967)

extensions/diff/.vscodeignore

@@ -0,0 +1,2 @@
+build/**
+cgmanifest.json

extensions/diff/cgmanifest.json

@@ -0,0 +1,32 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "textmate/diff.tmbundle",
+					"repositoryUrl": "https://github.com/textmate/diff.tmbundle",
+					"commitHash": "0593bb775eab1824af97ef2172fd38822abd97d7"
+				}
+			},
+			"licenseDetail": [
+				"Copyright (c) textmate-diff.tmbundle project authors",
+				"",
+				"If not otherwise specified (see below), files in this repository fall under the following license:",
+				"",
+				"Permission to copy, use, modify, sell and distribute this",
+				"software is granted. This software is provided \"as is\" without",
+				"express or implied warranty, and with no claim as to its",
+				"suitability for any purpose.",
+				"",
+				"An exception is made for files in readable text which contain their own license information,",
+				"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
+				"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
+				"\"tidy\" is accompanied by \"tidy-license.txt\"."
+			],
+			"license": "TextMate Bundle License",
+			"version": "0.0.0"
+		}
+	],
+	"version": 1
+}

extensions/git/languages/diff.language-configuration.json → extensions/diff/language-configuration.json

@@ -8,4 +8,4 @@
 		["[", "]"],
 		["(", ")"]
 	]
-}
+}

extensions/diff/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "diff",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "publisher": "vscode",
+  "license": "MIT",
+  "engines": {
+    "vscode": "0.10.x"
+  },
+  "scripts": {
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/diff.tmbundle Syntaxes/Diff.plist ./syntaxes/diff.tmLanguage.json"
+  },
+  "contributes": {
+    "languages": [
+      {
+        "id": "diff",
+        "aliases": [
+          "Diff",
+          "diff"
+        ],
+        "extensions": [
+          ".diff",
+          ".patch",
+          ".rej"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "diff",
+        "scopeName": "source.diff",
+        "path": "./syntaxes/diff.tmLanguage.json"
+      }
+    ]
+  }
+}

extensions/diff/package.nls.json

@@ -0,0 +1,4 @@
+{
+	"displayName": "Diff Language Basics",
+	"description": "Provides syntax highlighting & bracket matching in Diff files."
+}

extensions/git/build/update-grammars.js

@@ -8,9 +8,3 @@ var updateGrammar = require('vscode-grammar-updater');
 
 updateGrammar.update('textmate/git.tmbundle', 'Syntaxes/Git%20Commit%20Message.tmLanguage', './syntaxes/git-commit.tmLanguage.json');
 updateGrammar.update('textmate/git.tmbundle', 'Syntaxes/Git%20Rebase%20Message.tmLanguage', './syntaxes/git-rebase.tmLanguage.json');
-updateGrammar.update('textmate/diff.tmbundle', 'Syntaxes/Diff.plist', './syntaxes/diff.tmLanguage.json');
-
-
-
-
-

extensions/git/cgmanifest.json

@@ -33,34 +33,7 @@
 			],
 			"license": "MIT",
 			"version": "0.0.0"
-		},
-		{
-			"component": {
-				"type": "git",
-				"git": {
-					"name": "textmate/diff.tmbundle",
-					"repositoryUrl": "https://github.com/textmate/diff.tmbundle",
-					"commitHash": "0593bb775eab1824af97ef2172fd38822abd97d7"
-				}
-			},
-			"licenseDetail": [
-				"Copyright (c) textmate-diff.tmbundle project authors",
-				"",
-				"If not otherwise specified (see below), files in this repository fall under the following license:",
-				"",
-				"Permission to copy, use, modify, sell and distribute this",
-				"software is granted. This software is provided \"as is\" without",
-				"express or implied warranty, and with no claim as to its",
-				"suitability for any purpose.",
-				"",
-				"An exception is made for files in readable text which contain their own license information,",
-				"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added",
-				"to the base-name name of the original file, and an extension of txt, html, or similar. For example",
-				"\"tidy\" is accompanied by \"tidy-license.txt\"."
-			],
-			"license": "TextMate Bundle License",
-			"version": "0.0.0"
 		}
 	],
 	"version": 1
-}
+}

extensions/git/package.json

@@ -2314,19 +2314,6 @@
         ],
         "configuration": "./languages/git-rebase.language-configuration.json"
       },
-      {
-        "id": "diff",
-        "aliases": [
-          "Diff",
-          "diff"
-        ],
-        "extensions": [
-          ".diff",
-          ".patch",
-          ".rej"
-        ],
-        "configuration": "./languages/diff.language-configuration.json"
-      },
       {
         "id": "ignore",
         "aliases": [
@@ -2351,11 +2338,6 @@
         "scopeName": "text.git-rebase",
         "path": "./syntaxes/git-rebase.tmLanguage.json"
       },
-      {
-        "language": "diff",
-        "scopeName": "source.diff",
-        "path": "./syntaxes/diff.tmLanguage.json"
-      },
       {
         "language": "ignore",
         "scopeName": "source.ignore",