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

Address feedback

Browse Source
This commit is contained in:
Pine Wu
2019-01-09 12:43:51 -08:00
parent 9d8216aecd
commit 70696746b0
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/css-language-features/server/src/cssServerMain.ts
View File

@@ -10,12 +10,12 @@ import URI from 'vscode-uri';
import * as fs from 'fs';
import { TextDocument, CompletionList } from 'vscode-languageserver-types';
import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet } from 'vscode-css-languageservice';
import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet, CSSData } from 'vscode-css-languageservice';
import { getLanguageModelCache } from './languageModelCache';
import { getPathCompletionParticipant } from './pathCompletion';
import { formatError, runSafe } from './utils/runner';
import { getDocumentContext } from './utils/documentContext';
import { parseCSSData } from './languageFacts';
import { parseCSSData } from './utils/languageFacts';
export interface Settings {
css: LanguageSettings;
@@ -67,26 +67,12 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
const dataPaths: string[] = params.initializationOptions.dataPaths;
let customData = {
customProperties: [],
customAtDirectives: [],
customPseudoElements: [],
customPseudoClasses: []
};
const customDataCollections: CSSData[] = [];
dataPaths.forEach(p => {
if (fs.existsSync(p)) {
const {
properties,
atDirectives,
pseudoClasses,
pseudoElements
} = parseCSSData(fs.readFileSync(p, 'utf-8'));
customData.customProperties = customData.customProperties.concat(properties);
customData.customAtDirectives = customData.customAtDirectives.concat(atDirectives);
customData.customPseudoClasses = customData.customPseudoClasses.concat(pseudoClasses);
customData.customPseudoElements = customData.customPseudoElements.concat(pseudoElements);
const data = parseCSSData(fs.readFileSync(p, 'utf-8'));
customDataCollections.push(data);
} else {
return;
}
@@ -107,9 +93,9 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
scopedSettingsSupport = !!getClientCapability('workspace.configuration', false);
foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE);
languageServices.css = getCSSLanguageService(customData);
languageServices.scss = getSCSSLanguageService(customData);
languageServices.less = getLESSLanguageService(customData);
languageServices.css = getCSSLanguageService({ customDataCollections });
languageServices.scss = getSCSSLanguageService({ customDataCollections });
languageServices.less = getLESSLanguageService({ customDataCollections });
const capabilities: ServerCapabilities = {
// Tell the client that the server works in FULL text document sync mode