Merge pull request microsoft#80801 from orta/capital_S

roblourens · web-flow · commit 099485461dee · 2019-09-15T14:55:34.000-07:00
Fixes some capital S typoes with JS/TS
diff --git a/extensions/json/syntaxes/JSON.tmLanguage.json b/extensions/json/syntaxes/JSON.tmLanguage.json
@@ -5,7 +5,7 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/Microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70",
-	"name": "JSON (Javascript Next)",
+	"name": "JSON (JavaScript Next)",
 	"scopeName": "source.json",
 	"patterns": [
 		{
@@ -210,4 +210,4 @@
 			]
 		}
 	}
-}
+}
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
@@ -7,7 +7,7 @@
 	"typescript.tsdk.desc": "Specifies the folder path containing the tsserver and lib*.d.ts files to use.",
 	"typescript.disableAutomaticTypeAcquisition": "Disables automatic type acquisition. Automatic type acquisition fetches `@types` packages from npm to improve IntelliSense for external libraries.",
 	"typescript.tsserver.log": "Enables logging of the TS server to a file. This log can be used to diagnose TS Server issues. The log may contain file paths, source code, and other potentially sensitive information from your project.",
-	"typescript.tsserver.pluginPaths": "Additional paths to discover Typescript Language Service plugins. Requires using TypeScript 2.3.0 or newer in the workspace.",
+	"typescript.tsserver.pluginPaths": "Additional paths to discover TypeScript Language Service plugins. Requires using TypeScript 2.3.0 or newer in the workspace.",
 	"typescript.tsserver.pluginPaths.item": "Either an absolute or relative path. Relative path will be resolved against workspace folder(s).",
 	"typescript.tsserver.trace": "Enables tracing of messages sent to the TS server. This trace can be used to diagnose TS Server issues. The trace may contain file paths, source code, and other potentially sensitive information from your project.",
 	"typescript.validate.enable": "Enable/disable TypeScript validation.",
diff --git a/extensions/typescript-language-features/src/features/task.ts b/extensions/typescript-language-features/src/features/task.ts
@@ -75,7 +75,7 @@ export default class TscTaskProvider implements vscode.TaskProvider {
 		const badTsconfig = /\\tsconfig.*\.json/;
 		if (badTsconfig.exec(definition.tsconfig) !== null) {
 			// Warn that the task has the wrong slash type
-			vscode.window.showWarningMessage(localize('badTsConfig', "Typescript Task in tasks.json contains \"\\\\\". Typescript tasks tsconfig must use \"/\""));
+			vscode.window.showWarningMessage(localize('badTsConfig', "TypeScript Task in tasks.json contains \"\\\\\". TypeScript tasks tsconfig must use \"/\""));
 			return undefined;
 		}
 
diff --git a/src/main.js b/src/main.js
@@ -107,7 +107,7 @@ function onReady() {
 				});
 			};
 
-			// We recevied a valid nlsConfig from a user defined locale
+			// We received a valid nlsConfig from a user defined locale
 			if (nlsConfig) {
 				startup(nlsConfig);
 			}
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -223,3 +223,5 @@ export const knownAcronyms = new Set<string>();
 export const knownTermMappings = new Map<string, string>();
 knownTermMappings.set('power shell', 'PowerShell');
 knownTermMappings.set('powershell', 'PowerShell');
+knownTermMappings.set('javascript', 'JavaScript');
+knownTermMappings.set('typescript', 'TypeScript');

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"Once accepted there, we are happy to receive an update request."`
`6`	`6`	`],`
`7`	`7`	`"version": "https://github.com/Microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70",`
`8`		`- "name": "JSON (Javascript Next)",`
	`8`	`+ "name": "JSON (JavaScript Next)",`
`9`	`9`	`"scopeName": "source.json",`
`10`	`10`	`"patterns": [`
`11`	`11`	`{`
`@@ -210,4 +210,4 @@`
`210`	`210`	`]`
`211`	`211`	`}`
`212`	`212`	`}`
`213`		`-}`
	`213`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ export default class TscTaskProvider implements vscode.TaskProvider {`
`75`	`75`	`const badTsconfig = /\\tsconfig.*\.json/;`
`76`	`76`	`if (badTsconfig.exec(definition.tsconfig) !== null) {`
`77`	`77`	`// Warn that the task has the wrong slash type`
`78`		`- vscode.window.showWarningMessage(localize('badTsConfig', "Typescript Task in tasks.json contains \"\\\\\". Typescript tasks tsconfig must use \"/\""));`
	`78`	`+ vscode.window.showWarningMessage(localize('badTsConfig', "TypeScript Task in tasks.json contains \"\\\\\". TypeScript tasks tsconfig must use \"/\""));`
`79`	`79`	`return undefined;`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ function onReady() {`
`107`	`107`	`});`
`108`	`108`	`};`
`109`	`109`
`110`		`- // We recevied a valid nlsConfig from a user defined locale`
	`110`	`+ // We received a valid nlsConfig from a user defined locale`
`111`	`111`	`if (nlsConfig) {`
`112`	`112`	`startup(nlsConfig);`
`113`	`113`	`}`