Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Restrict html/css to only handling file and untitled files. Part of #48777"

Browse Source 
This reverts commit 0dfeec2eef.
This commit is contained in:
Pine Wu
2018-05-02 10:13:29 -07:00
parent c26adc1916
commit e4e7c25708
3 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/css-language-features/client/src/cssMain.ts
View File

@@ -27,14 +27,7 @@ export function activate(context: ExtensionContext) {
debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions } debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
}; };
let documentSelector = [ let documentSelector = ['css', 'scss', 'less'];
{ language: 'css', scheme: 'file' },
{ language: 'css', scheme: 'untitled' },
{ language: 'scss', scheme: 'file' },
{ language: 'scss', scheme: 'untitled' },
{ language: 'less', scheme: 'file' },
{ language: 'less', scheme: 'untitled' },
];
// Options to control the language client // Options to control the language client
let clientOptions: LanguageClientOptions = { let clientOptions: LanguageClientOptions = {

9
extensions/html-language-features/client/src/htmlMain.ts
View File

@@ -47,14 +47,7 @@ export function activate(context: ExtensionContext) {
debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions } debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
}; };
let documentSelector = [ let documentSelector = ['html', 'handlebars', 'razor'];
{ 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 embeddedLanguages = { css: true, javascript: true }; let embeddedLanguages = { css: true, javascript: true };
// Options to control the language client // Options to control the language client

7
extensions/html-language-features/server/src/htmlServerMain.ts
View File

@@ -171,12 +171,7 @@ connection.onDidChangeConfiguration((change) => {
let enableFormatter = globalSettings && globalSettings.html && globalSettings.html.format && globalSettings.html.format.enable; let enableFormatter = globalSettings && globalSettings.html && globalSettings.html.format && globalSettings.html.format.enable;
if (enableFormatter) { if (enableFormatter) {
if (!formatterRegistration) { if (!formatterRegistration) {
let documentSelector: DocumentSelector = [ let documentSelector: DocumentSelector = [{ language: 'html' }, { language: 'handlebars' }]; // don't register razor, the formatter does more harm than good
{ 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
formatterRegistration = connection.client.register(DocumentRangeFormattingRequest.type, { documentSelector }); formatterRegistration = connection.client.register(DocumentRangeFormattingRequest.type, { documentSelector });
} }
} else if (formatterRegistration) { } else if (formatterRegistration) {