From 76d4daa9f03627e034e618915246d8f2eceb2987 Mon Sep 17 00:00:00 2001 From: Pine Wu Date: Wed, 2 May 2018 10:13:29 -0700 Subject: [PATCH] Revert "Restrict html/css to only handling file and untitled files. Part of #48777" This reverts commit 0dfeec2eefa7074b905caf255bfe56e42d6e9328. --- extensions/css-language-features/client/src/cssMain.ts | 9 +-------- extensions/html-language-features/client/src/htmlMain.ts | 9 +-------- .../html-language-features/server/src/htmlServerMain.ts | 7 +------ 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/extensions/css-language-features/client/src/cssMain.ts b/extensions/css-language-features/client/src/cssMain.ts index c587c0a5a875f..a7a031bda3c28 100644 --- a/extensions/css-language-features/client/src/cssMain.ts +++ b/extensions/css-language-features/client/src/cssMain.ts @@ -27,14 +27,7 @@ export function activate(context: ExtensionContext) { debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions } }; - let documentSelector = [ - { language: 'css', scheme: 'file' }, - { language: 'css', scheme: 'untitled' }, - { language: 'scss', scheme: 'file' }, - { language: 'scss', scheme: 'untitled' }, - { language: 'less', scheme: 'file' }, - { language: 'less', scheme: 'untitled' }, - ]; + let documentSelector = ['css', 'scss', 'less']; // Options to control the language client let clientOptions: LanguageClientOptions = { diff --git a/extensions/html-language-features/client/src/htmlMain.ts b/extensions/html-language-features/client/src/htmlMain.ts index 021a4aa625e16..313542681127d 100644 --- a/extensions/html-language-features/client/src/htmlMain.ts +++ b/extensions/html-language-features/client/src/htmlMain.ts @@ -47,14 +47,7 @@ export function activate(context: ExtensionContext) { debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions } }; - let documentSelector = [ - { language: 'html', scheme: 'file' }, - { language: 'html', scheme: 'untitled' }, - { language: 'handlebars', scheme: 'file' }, - { language: 'handlebars', scheme: 'untitled' }, - { language: 'razor', scheme: 'file' }, - { language: 'razor', scheme: 'untitled' } - ]; + let documentSelector = ['html', 'handlebars', 'razor']; let embeddedLanguages = { css: true, javascript: true }; // Options to control the language client diff --git a/extensions/html-language-features/server/src/htmlServerMain.ts b/extensions/html-language-features/server/src/htmlServerMain.ts index 8c6babddedbec..7e9253c83e60e 100644 --- a/extensions/html-language-features/server/src/htmlServerMain.ts +++ b/extensions/html-language-features/server/src/htmlServerMain.ts @@ -171,12 +171,7 @@ connection.onDidChangeConfiguration((change) => { let enableFormatter = globalSettings && globalSettings.html && globalSettings.html.format && globalSettings.html.format.enable; if (enableFormatter) { if (!formatterRegistration) { - let documentSelector: DocumentSelector = [ - { language: 'html', scheme: 'file' }, - { language: 'html', scheme: 'untitled' }, - { language: 'handlebars', scheme: 'file' }, - { language: 'handlebars', scheme: 'untitled' } - ]; // don't register razor, the formatter does more harm than good + let documentSelector: DocumentSelector = [{ language: 'html' }, { language: 'handlebars' }]; // don't register razor, the formatter does more harm than good formatterRegistration = connection.client.register(DocumentRangeFormattingRequest.type, { documentSelector }); } } else if (formatterRegistration) {