Use specific scope name for js vs ts

mjbvz · mjbvz · commit 6aab56dd6255 · 2019-10-25T10:53:04.000-07:00
Fixes microsoft#83289
diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json
@@ -79,15 +79,15 @@
         }
       },
       {
-        "scopeName": "documentation.injection",
+        "scopeName": "documentation.injection.ts",
         "path": "./syntaxes/jsdoc.ts.injection.tmLanguage.json",
         "injectTo": [
           "source.ts",
           "source.tsx"
         ]
       },
       {
-        "scopeName": "documentation.injection",
+        "scopeName": "documentation.injection.js.jsx",
         "path": "./syntaxes/jsdoc.js.injection.tmLanguage.json",
         "injectTo": [
           "source.js",
diff --git a/extensions/typescript-basics/syntaxes/jsdoc.js.injection.tmLanguage.json b/extensions/typescript-basics/syntaxes/jsdoc.js.injection.tmLanguage.json
@@ -50,5 +50,5 @@
 			]
 		}
 	},
-	"scopeName": "documentation.injection"
+	"scopeName": "documentation.injection.js.jsx"
 }
diff --git a/extensions/typescript-basics/syntaxes/jsdoc.ts.injection.tmLanguage.json b/extensions/typescript-basics/syntaxes/jsdoc.ts.injection.tmLanguage.json
@@ -50,5 +50,5 @@
 			]
 		}
 	},
-	"scopeName": "documentation.injection"
+	"scopeName": "documentation.injection.ts"
 }
diff --git a/src/vs/workbench/contrib/webview/browser/pre/main.js b/src/vs/workbench/contrib/webview/browser/pre/main.js
@@ -231,7 +231,8 @@
 		/**
 		 * @param {MouseEvent} event
 		 */
-		const handleAuxClick = (event) => {
+		const handleAuxClick =
+		(event) => {
 			// Prevent middle clicks opening a broken link in the browser
 			if (!event.view || !event.view.document) {
 				return;

Original file line number	Diff line number	Diff line change
`@@ -79,15 +79,15 @@`
`79`	`79`	`}`
`80`	`80`	`},`
`81`	`81`	`{`
`82`		`- "scopeName": "documentation.injection",`
	`82`	`+ "scopeName": "documentation.injection.ts",`
`83`	`83`	`"path": "./syntaxes/jsdoc.ts.injection.tmLanguage.json",`
`84`	`84`	`"injectTo": [`
`85`	`85`	`"source.ts",`
`86`	`86`	`"source.tsx"`
`87`	`87`	`]`
`88`	`88`	`},`
`89`	`89`	`{`
`90`		`- "scopeName": "documentation.injection",`
	`90`	`+ "scopeName": "documentation.injection.js.jsx",`
`91`	`91`	`"path": "./syntaxes/jsdoc.js.injection.tmLanguage.json",`
`92`	`92`	`"injectTo": [`
`93`	`93`	`"source.js",`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,5 @@`
`50`	`50`	`]`
`51`	`51`	`}`
`52`	`52`	`},`
`53`		`- "scopeName": "documentation.injection"`
	`53`	`+ "scopeName": "documentation.injection.js.jsx"`
`54`	`54`	`}`