fix: html / css custom data not working

#707 (comment)

Author: johnsoncodehk

plugins/css/src/index.ts

@@ -3,6 +3,7 @@ import * as shared from '@volar/shared';
 import * as css from 'vscode-css-languageservice';
 import * as vscode from 'vscode-languageserver-protocol';
 import { TextDocument } from 'vscode-languageserver-textdocument';
+import * as path from 'path';
 
 const wordPatterns: { [lang: string]: RegExp; } = {
 	css: /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g,
@@ -240,25 +241,13 @@ export default function (): LanguageServicePlugin {
 
 		if (configHost) {
 
-			const paths = new Set<string>();
 			const customData: string[] = await configHost.getConfiguration('css.customData') ?? [];
-			const rootPath = shared.getPathOfUri(context.env.rootUri.toString());
-
-			for (const customDataPath of customData) {
-				try {
-					const jsonPath = require.resolve(customDataPath, { paths: [rootPath] });
-					paths.add(jsonPath);
-				}
-				catch (error) {
-					console.error(error);
-				}
-			}
-
 			const newData: css.ICSSDataProvider[] = [];
 
-			for (const path of paths) {
+			for (const customDataPath of customData) {
 				try {
-					newData.push(css.newCSSDataProvider(require(path)));
+					const jsonPath = path.resolve(customDataPath);
+					newData.push(css.newCSSDataProvider(require(jsonPath)));
 				}
 				catch (error) {
 					console.error(error);

plugins/html/package.json

@@ -14,7 +14,6 @@
 	},
 	"dependencies": {
 		"@volar/language-service": "1.0.0-rc.3",
-		"@volar/shared": "1.0.0-rc.3",
 		"vscode-html-languageservice": "^5.0.1",
 		"vscode-languageserver-protocol": "^3.17.2",
 		"vscode-languageserver-textdocument": "^1.0.7"

plugins/html/src/index.ts

@@ -1,8 +1,8 @@
 import { LanguageServicePlugin, LanguageServicePluginContext } from '@volar/language-service';
-import * as shared from '@volar/shared';
 import * as html from 'vscode-html-languageservice';
 import * as vscode from 'vscode-languageserver-protocol';
 import { TextDocument } from 'vscode-languageserver-textdocument';
+import * as path from 'path';
 
 export default function (options: {
 	validLang?: string,
@@ -217,25 +217,13 @@ export default function (options: {
 
 		if (configHost) {
 
-			const paths = new Set<string>();
 			const customData: string[] = await configHost.getConfiguration('html.customData') ?? [];
-			const rootPath = shared.getPathOfUri(context.env.rootUri.toString());
-
-			for (const customDataPath of customData) {
-				try {
-					const jsonPath = require.resolve(customDataPath, { paths: [rootPath] });
-					paths.add(jsonPath);
-				}
-				catch (error) {
-					console.error(error);
-				}
-			}
-
 			const newData: html.IHTMLDataProvider[] = [];
 
-			for (const path of paths) {
+			for (const customDataPath of customData) {
 				try {
-					newData.push(html.newHTMLDataProvider(path, require(path)));
+					const jsonPath = path.resolve(customDataPath);
+					newData.push(html.newHTMLDataProvider(customDataPath, require(jsonPath)));
 				}
 				catch (error) {
 					console.error(error);