wip: remove ServiceEnvironment.modules

volarjs · Apr 25, 2023 · 990efda · 990efda
1 parent 04b577e
commit 990efda
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/packages/kit/src/index.ts b/packages/kit/src/index.ts
@@ -39,8 +39,7 @@ export function create(
  return scriptSnapshots.get(fileName);
  },
  };
- const service = createLanguageService({
- modules: { typescript: ts },
+ const service = createLanguageService({ typescript: ts }, {
  host,
  config,
  uriToFileName,

diff --git a/packages/language-core/src/languageContext.ts b/packages/language-core/src/languageContext.ts
@@ -6,10 +6,8 @@ import { Language, LanguageServiceHost, FileKind } from './types';
 export type LanguageContext = ReturnType<typeof createLanguageContext>;
 
 export function createLanguageContext(
+ modules: { typescript?: typeof import('typescript/lib/tsserverlibrary'); },
  host: LanguageServiceHost,
- modules: {
- typescript?: typeof import('typescript/lib/tsserverlibrary'),
- },
  languages: Language[],
 ) {
 

diff --git a/packages/language-server/src/common/project.ts b/packages/language-server/src/common/project.ts
@@ -99,8 +99,7 @@ export async function createProject(context: ProjectContext) {
  });
  }
  }
- languageService = embeddedLS.createLanguageService({
- modules: { typescript: context.workspace.workspaces.ts },
+ languageService = embeddedLS.createLanguageService({ typescript: context.workspace.workspaces.ts }, {
  uriToFileName,
  fileNameToUri,
  locale: context.workspace.workspaces.initParams.locale,

diff --git a/packages/language-service/src/baseLanguageService.ts b/packages/language-service/src/baseLanguageService.ts
@@ -44,20 +44,22 @@ import { notEmpty, resolveCommonLanguageId } from './utils/common';
 export type LanguageService = ReturnType<typeof createLanguageServiceBase>;
 
 export function createLanguageService(
+ modules: { typescript?: typeof import('typescript/lib/tsserverlibrary'); },
  env: ServiceEnvironment,
  documentRegistry?: ts.DocumentRegistry,
 ) {
- const languageContext = createLanguageContext(env.host, env.modules, Object.values(env.config.languages ?? {}).filter(notEmpty));
- const context = createLanguageServicePluginContext(env, languageContext, documentRegistry);
+ const languageContext = createLanguageContext(modules, env.host, Object.values(env.config.languages ?? {}).filter(notEmpty));
+ const context = createLanguageServicePluginContext(modules, env, languageContext, documentRegistry);
  return createLanguageServiceBase(context);
 }
 
 function createLanguageServicePluginContext(
+ modules: { typescript?: typeof import('typescript/lib/tsserverlibrary'); },
  env: ServiceEnvironment,
  languageContext: ReturnType<typeof createLanguageContext>,
  documentRegistry?: ts.DocumentRegistry,
 ) {
- const ts = env.modules.typescript;
+ const ts = modules.typescript;
  let tsLs: ts.LanguageService | undefined;
 
  if (ts) {

diff --git a/packages/language-service/src/types.ts b/packages/language-service/src/types.ts
@@ -11,9 +11,6 @@ export * from 'vscode-languageserver-protocol';
 
 export interface ServiceEnvironment {
  // InitializeParams
- modules: {
- typescript?: typeof import('typescript/lib/tsserverlibrary');
- };
  locale?: string;
  rootUri: URI;
  clientCapabilities?: vscode.ClientCapabilities;

diff --git a/packages/monaco/src/worker.ts b/packages/monaco/src/worker.ts
@@ -22,8 +22,7 @@ export function createLanguageService(options: {
  const config = options.config ?? {};
  const compilerOptions = options.typescript?.compilerOptions ?? {};
  let host = createLanguageServiceHost();
- let languageService = _createLanguageService({
- modules: { typescript: ts },
+ let languageService = _createLanguageService({ typescript: ts }, {
  host,
  config,
  uriToFileName: (uri: string) => URI.parse(uri).fsPath.replace(/\\/g, '/'),
@@ -57,8 +56,7 @@ export function createLanguageService(options: {
  if (newVersion !== dtsVersion) {
  dtsVersion = newVersion;
  languageService.dispose();
- languageService = _createLanguageService({
- modules: { typescript: ts },
+ languageService = _createLanguageService({ typescript: ts }, {
  host,
  config,
  rootUri: URI.file('/'),

diff --git a/packages/typescript/src/index.ts b/packages/typescript/src/index.ts
@@ -11,7 +11,7 @@ export function createLanguageService(host: embedded.LanguageServiceHost, mods:
  };
  } & ts.LanguageService;
 
- const core = embedded.createLanguageContext(host, { typescript: ts as any }, mods);
+ const core = embedded.createLanguageContext({ typescript: ts as any }, host, mods);
 
  if (!ts) {
  throw new Error('TypeScript module not provided.');