refactor: remove root path depend for vue.createLanguageModules

plugin path already resolved by vue-language-core
vuejs · Dec 31, 2022 · a219c7f · a219c7f
1 parent 82347c8
commit a219c7f
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 19 deletions.
diff --git a/examples/vue-and-svelte-language-server/package.json b/examples/vue-and-svelte-language-server/package.json
@@ -19,7 +19,6 @@
 		"@volar-examples/svelte-language-core": "1.0.19",
 		"@volar-plugins/typescript": "1.0.19",
 		"@volar/language-server": "1.0.19",
-		"@volar/shared": "1.0.19",
 		"@volar/vue-language-core": "1.0.19"
 	}
 }
diff --git a/examples/vue-and-svelte-language-server/src/index.ts b/examples/vue-and-svelte-language-server/src/index.ts
@@ -1,7 +1,6 @@
 import { languageModule as svelteLanguageModule } from '@volar-examples/svelte-language-core';
 import useTsPlugin from '@volar-plugins/typescript';
 import { createLanguageServer, LanguageModule, LanguageServerInitializationOptions, LanguageServerPlugin } from '@volar/language-server/node';
-import * as shared from '@volar/shared';
 import * as vue from '@volar/vue-language-core';
 
 const plugin: LanguageServerPlugin<LanguageServerInitializationOptions, vue.LanguageServiceHost> = () => {
@@ -24,7 +23,6 @@ const plugin: LanguageServerPlugin<LanguageServerInitializationOptions, vue.Lang
 			getLanguageModules(host) {
 				const vueLanguageModules = vue.createLanguageModules(
 					host.getTypeScriptModule(),
-					host.getCurrentDirectory(),
 					host.getCompilationSettings(),
 					host.getVueCompilationSettings(),
 				);
@@ -40,8 +38,8 @@ const plugin: LanguageServerPlugin<LanguageServerInitializationOptions, vue.Lang
 			},
 		},
 		syntacticService: {
-			getLanguageModules(ts, env) {
-				const vueLanguagePlugins = vue.getDefaultVueLanguagePlugins(ts, shared.getPathOfUri(env.rootUri.toString()), {}, {}, []);
+			getLanguageModules(ts) {
+				const vueLanguagePlugins = vue.getDefaultVueLanguagePlugins(ts, {}, {}, []);
 				const vueLanguageModule: LanguageModule = {
 					createFile(fileName, snapshot) {
 						if (fileName.endsWith('.vue')) {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/vue-language-tools/vue-component-meta/src/index.ts b/vue-language-tools/vue-component-meta/src/index.ts
@@ -170,7 +170,6 @@ export function baseCreate(
 	}) as vue.LanguageServiceHost;
 	const vueLanguageModules = vue.createLanguageModules(
 		host.getTypeScriptModule(),
-		host.getCurrentDirectory(),
 		host.getCompilationSettings(),
 		host.getVueCompilationSettings(),
 	);

diff --git a/vue-language-tools/vue-language-core/src/languageModule.ts b/vue-language-tools/vue-language-core/src/languageModule.ts
@@ -9,7 +9,6 @@ import type * as ts from 'typescript/lib/tsserverlibrary';
 
 export function createLanguageModules(
 	ts: typeof import('typescript/lib/tsserverlibrary'),
-	rootDir: string,
 	compilerOptions: ts.CompilerOptions,
 	_vueCompilerOptions: VueCompilerOptions,
 	extraPlugins: VueLanguagePlugin[] = [],
@@ -18,7 +17,6 @@ export function createLanguageModules(
 	const vueCompilerOptions = resolveVueCompilerOptions(_vueCompilerOptions);
 	const vueLanguagePlugin = getDefaultVueLanguagePlugins(
 		ts,
-		rootDir,
 		compilerOptions,
 		_vueCompilerOptions,
 		extraPlugins,

diff --git a/vue-language-tools/vue-language-core/src/plugins.ts b/vue-language-tools/vue-language-core/src/plugins.ts
@@ -16,7 +16,6 @@ import * as CompilerVue2 from './utils/vue2TemplateCompiler';
 
 export function getDefaultVueLanguagePlugins(
 	ts: typeof import('typescript/lib/tsserverlibrary'),
-	rootDir: string,
 	compilerOptions: ts.CompilerOptions,
 	_vueCompilerOptions: VueCompilerOptions,
 	extraPlugins: VueLanguagePlugin[] = [],
@@ -39,7 +38,7 @@ export function getDefaultVueLanguagePlugins(
 	if (typeof require?.resolve === 'function') {
 		for (const pluginPath of vueCompilerOptions.plugins) {
 			try {
-				const importPath = require.resolve(pluginPath, { paths: [rootDir] });
+				const importPath = require.resolve(pluginPath);
 				const plugin = require(importPath);
 				pluginPaths.set(_plugins.length, pluginPath);
 				_plugins.push(plugin);

diff --git a/vue-language-tools/vue-language-server/src/languageServerPlugin.ts b/vue-language-tools/vue-language-server/src/languageServerPlugin.ts
@@ -44,7 +44,6 @@ const plugin: LanguageServerPlugin<VueServerInitializationOptions, vue.LanguageS
 			getLanguageModules(host) {
 				const vueLanguageModules = vue2.createLanguageModules(
 					host.getTypeScriptModule(),
-					host.getCurrentDirectory(),
 					host.getCompilationSettings(),
 					host.getVueCompilationSettings(),
 				);
@@ -106,9 +105,9 @@ const plugin: LanguageServerPlugin<VueServerInitializationOptions, vue.LanguageS
 			},
 		},
 		syntacticService: {
-			getLanguageModules(ts, env) {
+			getLanguageModules(ts) {
 				const vueOptions: vue.VueCompilerOptions = { extensions: getVueExts(['.vue']) };
-				const vueLanguagePlugins = vue2.getDefaultVueLanguagePlugins(ts, shared.getPathOfUri(env.rootUri.toString()), {}, vueOptions, []);
+				const vueLanguagePlugins = vue2.getDefaultVueLanguagePlugins(ts, {}, vueOptions, []);
 				const vueLanguageModule: embedded.LanguageModule = {
 					createFile(fileName, snapshot) {
 						if (vueOptions.extensions?.some(ext => fileName.endsWith(ext))) {

diff --git a/vue-language-tools/vue-language-service/src/documentService.ts b/vue-language-tools/vue-language-service/src/documentService.ts
@@ -10,7 +10,6 @@ import useAutoWrapParenthesesPlugin from './plugins/vue-autoinsert-parentheses';
 import useAutoAddSpacePlugin from './plugins/vue-autoinsert-space';
 import * as embeddedLS from '@volar/language-service';
 import * as vue from '@volar/vue-language-core';
-import * as shared from '@volar/shared';
 
 import type * as _1 from 'vscode-languageserver-protocol';
 import type * as _2 from 'vscode-languageserver-textdocument';
@@ -57,7 +56,6 @@ export function createDocumentService(
 
 	const vueLanguageModules = vue.createLanguageModules(
 		ts,
-		shared.getPathOfUri(env.rootUri.toString()),
 		{},
 		{},
 	);

diff --git a/vue-language-tools/vue-language-service/src/languageService.ts b/vue-language-tools/vue-language-service/src/languageService.ts
@@ -239,7 +239,6 @@ export function createLanguageService(
 
 	const vueLanguageModules = vue.createLanguageModules(
 		host.getTypeScriptModule(),
-		host.getCurrentDirectory(),
 		host.getCompilationSettings(),
 		host.getVueCompilationSettings(),
 	);

diff --git a/vue-language-tools/vue-typescript/src/index.ts b/vue-language-tools/vue-typescript/src/index.ts
@@ -4,7 +4,6 @@ import * as vue from '@volar/vue-language-core';
 export function createLanguageService(host: vue.LanguageServiceHost) {
 	return base.createLanguageService(host, vue.createLanguageModules(
 		host.getTypeScriptModule(),
-		host.getCurrentDirectory(),
 		host.getCompilationSettings(),
 		host.getVueCompilationSettings(),
 	));