From 890cfc134482cb760b1a299d6b9d754c4760a7ee Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Thu, 12 Sep 2019 09:56:42 -0400 Subject: [PATCH 1/2] Ensure that the settings panel shows TypeScript and JavaScript with caps for the S --- src/vs/workbench/contrib/preferences/browser/settingsLayout.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts index 4b0a52f9aa3..46882483301 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts @@ -218,3 +218,5 @@ export const knownAcronyms = new Set(); export const knownTermMappings = new Map(); knownTermMappings.set('power shell', 'PowerShell'); knownTermMappings.set('powershell', 'PowerShell'); +knownTermMappings.set('javascript', 'JavaScript'); +knownTermMappings.set('typescript', 'TypeScript'); From a89b72bf636dbf412f086e4431945380a33f42ed Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Thu, 12 Sep 2019 09:58:03 -0400 Subject: [PATCH 2/2] Fix hardcoded lower case S issues for JS/TS only for presentation-ish strinngs --- extensions/json/syntaxes/JSON.tmLanguage.json | 4 ++-- extensions/typescript-language-features/package.nls.json | 4 ++-- extensions/typescript-language-features/src/features/task.ts | 2 +- src/main.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/json/syntaxes/JSON.tmLanguage.json b/extensions/json/syntaxes/JSON.tmLanguage.json index 910045be39e..d296aac33eb 100644 --- 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 @@ ] } } -} \ No newline at end of file +} diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json index a83acf9c6f2..67ed1d77698 100644 --- 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.", @@ -70,4 +70,4 @@ "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.", "configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.", "typescript.preferences.renameShorthandProperties": "Enable/disable introducing aliases for object shorthand properties during renames. Requires using TypeScript 3.4 or newer in the workspace." -} \ No newline at end of file +} diff --git a/extensions/typescript-language-features/src/features/task.ts b/extensions/typescript-language-features/src/features/task.ts index 64057555d5f..e41a4b66d0d 100644 --- 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 index 4be5f2ed955..4b0be14bf99 100644 --- a/src/main.js +++ b/src/main.js @@ -102,7 +102,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); }