From 70696746b0aa3cfc1c635734009e308eb6136b63 Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Wed, 9 Jan 2019 12:43:51 -0800
Subject: [PATCH] Address feedback

---
 .../server/src/cssServerMain.ts               | 30 +++++--------------
 .../server/src/{ => utils}/languageFacts.ts   |  4 ++-
 2 files changed, 11 insertions(+), 23 deletions(-)
 rename extensions/css-language-features/server/src/{ => utils}/languageFacts.ts (85%)

diff --git a/extensions/css-language-features/server/src/cssServerMain.ts b/extensions/css-language-features/server/src/cssServerMain.ts
index e376eaec816..0108e1df628 100644
--- a/extensions/css-language-features/server/src/cssServerMain.ts
+++ b/extensions/css-language-features/server/src/cssServerMain.ts
@@ -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
diff --git a/extensions/css-language-features/server/src/languageFacts.ts b/extensions/css-language-features/server/src/utils/languageFacts.ts
similarity index 85%
rename from extensions/css-language-features/server/src/languageFacts.ts
rename to extensions/css-language-features/server/src/utils/languageFacts.ts
index 3e2061101e3..c6d9b2ee641 100644
--- a/extensions/css-language-features/server/src/languageFacts.ts
+++ b/extensions/css-language-features/server/src/utils/languageFacts.ts
@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export function parseCSSData(source: string) {
+import { CSSData } from 'vscode-css-languageservice';
+
+export function parseCSSData(source: string): CSSData {
 	let rawData: any;
 
 	try {
-- 
GitLab