From 6657623b9820b273a4b640f5785b69b973788ece Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 16 Apr 2018 14:11:12 +0200 Subject: [PATCH] css/html/json typos (for #47894) --- .../css-language-features/server/src/cssServerMain.ts | 2 +- .../html-language-features/server/src/htmlServerMain.ts | 4 ++-- .../server/src/modes/javascriptMode.ts | 2 +- .../server/src/modes/languageModes.ts | 4 ++-- .../server/src/test/completions.test.ts | 2 +- .../html-language-features/server/src/test/folding.test.ts | 6 +++--- .../json-language-features/server/src/jsonServerMain.ts | 2 +- .../json-language-features/server/src/test/folding.test.ts | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extensions/css-language-features/server/src/cssServerMain.ts b/extensions/css-language-features/server/src/cssServerMain.ts index bd2a13c7124..f952ed9a0e5 100644 --- a/extensions/css-language-features/server/src/cssServerMain.ts +++ b/extensions/css-language-features/server/src/cssServerMain.ts @@ -51,7 +51,7 @@ connection.onShutdown(() => { let scopedSettingsSupport = false; let workspaceFolders: WorkspaceFolder[]; -// After the server has started the client sends an initilize request. The server receives +// After the server has started the client sends an initialize request. The server receives // in the passed params the rootPath of the workspace plus the client capabilities. connection.onInitialize((params: InitializeParams): InitializeResult => { workspaceFolders = (params).workspaceFolders; diff --git a/extensions/html-language-features/server/src/htmlServerMain.ts b/extensions/html-language-features/server/src/htmlServerMain.ts index d86ecb5fd68..3f3db9f6361 100644 --- a/extensions/html-language-features/server/src/htmlServerMain.ts +++ b/extensions/html-language-features/server/src/htmlServerMain.ts @@ -81,8 +81,8 @@ let emmetSettings: any = {}; let currentEmmetExtensionsPath: string; const emmetTriggerCharacters = ['!', '.', '}', ':', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']; -// After the server has started the client sends an initilize request. The server receives -// in the passed params the rootPath of the workspace plus the client capabilites +// After the server has started the client sends an initialize request. The server receives +// in the passed params the rootPath of the workspace plus the client capabilities connection.onInitialize((params: InitializeParams): InitializeResult => { let initializationOptions = params.initializationOptions; diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts index 8243399a8f0..97a9c5877af 100644 --- a/extensions/html-language-features/server/src/modes/javascriptMode.ts +++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts @@ -19,7 +19,7 @@ const JQUERY_D_TS = join(__dirname, '../../lib/jquery.d.ts'); const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g; -export function getJavascriptMode(documentRegions: LanguageModelCache, workspace: Workspace): LanguageMode { +export function getJavaScriptMode(documentRegions: LanguageModelCache, workspace: Workspace): LanguageMode { let jsDocuments = getLanguageModelCache(10, 60, document => documentRegions.get(document).getEmbeddedDocument('javascript')); let compilerOptions: ts.CompilerOptions = { allowNonTsExtensions: true, allowJs: true, lib: ['lib.es6.d.ts'], target: ts.ScriptTarget.Latest, moduleResolution: ts.ModuleResolutionKind.Classic }; diff --git a/extensions/html-language-features/server/src/modes/languageModes.ts b/extensions/html-language-features/server/src/modes/languageModes.ts index 823d608fbae..13242925d5a 100644 --- a/extensions/html-language-features/server/src/modes/languageModes.ts +++ b/extensions/html-language-features/server/src/modes/languageModes.ts @@ -15,7 +15,7 @@ import { FoldingRange } from 'vscode-languageserver-protocol-foldingprovider'; import { getLanguageModelCache, LanguageModelCache } from '../languageModelCache'; import { getDocumentRegions, HTMLDocumentRegions } from './embeddedSupport'; import { getCSSMode } from './cssMode'; -import { getJavascriptMode } from './javascriptMode'; +import { getJavaScriptMode } from './javascriptMode'; import { getHTMLMode } from './htmlMode'; export { ColorInformation, ColorPresentation, Color }; @@ -82,7 +82,7 @@ export function getLanguageModes(supportedLanguages: { [languageId: string]: boo modes['css'] = getCSSMode(documentRegions, workspace); } if (supportedLanguages['javascript']) { - modes['javascript'] = getJavascriptMode(documentRegions, workspace); + modes['javascript'] = getJavaScriptMode(documentRegions, workspace); } return { getModeAtPosition(document: TextDocument, position: Position): LanguageMode | undefined { diff --git a/extensions/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts index 1b2b2076ead..7bc12b33731 100644 --- a/extensions/html-language-features/server/src/test/completions.test.ts +++ b/extensions/html-language-features/server/src/test/completions.test.ts @@ -76,7 +76,7 @@ export function testCompletionFor(value: string, expected: { count?: number, ite } suite('HTML Completion', () => { - test('HTML Javascript Completions', function (): any { + test('HTML JavaScript Completions', function (): any { testCompletionFor('', { items: [ { label: 'location', resultText: '' }, diff --git a/extensions/html-language-features/server/src/test/folding.test.ts b/extensions/html-language-features/server/src/test/folding.test.ts index 801344428a1..c64621a9e07 100644 --- a/extensions/html-language-features/server/src/test/folding.test.ts +++ b/extensions/html-language-features/server/src/test/folding.test.ts @@ -88,7 +88,7 @@ suite('HTML Folding', () => { assertRanges(input, [r(0, 7), r(5, 6)]); }); - test('Fold commment', () => { + test('Fold comment', () => { let input = [ /*0*/'