Update service and adopt HTML provider interface

extensions/html-language-features/server/src/htmlServerMain.ts

@@ -11,7 +11,6 @@ import {
 } from 'vscode-languageserver';
 import { TextDocument, Diagnostic, DocumentLink, SymbolInformation } from 'vscode-languageserver-types';
 import { getLanguageModes, LanguageModes, Settings } from './modes/languageModes';
-import * as fs from 'fs';
 
 import { format } from './modes/formatting';
 import { pushAll } from './utils/arrays';
@@ -20,8 +19,7 @@ import uri from 'vscode-uri';
 import { formatError, runSafe, runSafeAsync } from './utils/runner';
 
 import { getFoldingRanges } from './modes/htmlFolding';
-import { parseHTMLData } from './utils/tagDefinitions';
-import { HTMLData } from 'vscode-html-languageservice';
+import { getDataProviders } from './customData';
 
 namespace TagCloseRequest {
 	export const type: RequestType<TextDocumentPositionParams, string | null, any, any> = new RequestType('html/tag');
@@ -92,37 +90,14 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 	}
 
 	const dataPaths: string[] = params.initializationOptions.dataPaths;
-
-	let allHtmlData: HTMLData = {
-		tags: [],
-		globalAttributes: [],
-		valueSetMap: {}
-	};
-
-	if (dataPaths) {
-		dataPaths.forEach(path => {
-			try {
-				if (fs.existsSync(path)) {
-					const htmlData = parseHTMLData(fs.readFileSync(path, 'utf-8'));
-					if (htmlData.tags) {
-						allHtmlData.tags = allHtmlData.tags!.concat(htmlData.tags);
-					}
-					if (htmlData.globalAttributes) {
-						allHtmlData.globalAttributes = allHtmlData.globalAttributes!.concat(htmlData.globalAttributes);
-					}
-				}
-			} catch (err) {
-				console.log(`Failed to laod tag from ${path}`);
-			}
-		});
-	}
+	const providers = getDataProviders(dataPaths);
 
 	const workspace = {
 		get settings() { return globalSettings; },
 		get folders() { return workspaceFolders; }
 	};
 
-	languageModes = getLanguageModes(initializationOptions ? initializationOptions.embeddedLanguages : { css: true, javascript: true }, workspace, allHtmlData);
+	languageModes = getLanguageModes(initializationOptions ? initializationOptions.embeddedLanguages : { css: true, javascript: true }, workspace, providers);
 
 	documents.onDidClose(e => {
 		languageModes.onDocumentRemoved(e.document);