wip: Config.plugins -> Config.services

volarjs · Apr 25, 2023 · bf22f74 · bf22f74
1 parent 2c8a783
commit bf22f74
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/packages/language-server/src/common/server.ts b/packages/language-server/src/common/server.ts
@@ -67,7 +67,7 @@ export function startCommonLanguageServer(connection: vscode.Connection, getCtx:
 
  configurationHost = initParams.capabilities.workspace?.configuration ? createConfigurationHost(initParams, connection) : undefined;
 
- let lsPlugins: Config['plugins'] = {};
+ let services: Config['services'] = {};
  for (const root of roots) {
  if (root.scheme === 'file') {
  let config = loadConfig(root.path, options.configFilePath) ?? {};
@@ -76,10 +76,10 @@ export function startCommonLanguageServer(connection: vscode.Connection, getCtx:
  config = plugin.resolveConfig(config, undefined);
  }
  }
- if (config.plugins) {
- lsPlugins = {
- ...lsPlugins,
- ...config.plugins,
+ if (config.services) {
+ services = {
+ ...services,
+ ...config.services,
  };
  }
  }
@@ -90,7 +90,7 @@ export function startCommonLanguageServer(connection: vscode.Connection, getCtx:
  options,
  plugins,
  getSemanticTokensLegend(),
- lsPlugins,
+ services,
  );
 
  await createLanguageServiceHost();

diff --git a/packages/language-server/src/common/utils/registerFeatures.ts b/packages/language-server/src/common/utils/registerFeatures.ts
@@ -7,10 +7,10 @@ export function setupCapabilities(
  initOptions: LanguageServerInitializationOptions,
  plugins: ReturnType<LanguageServerPlugin>[],
  semanticTokensLegend: vscode.SemanticTokensLegend,
- lsPlugins: NonNullable<Config['plugins']>,
+ services: NonNullable<Config['services']>,
 ) {
 
- const lsPluginInstances = Object.values(lsPlugins)
+ const lsPluginInstances = Object.values(services)
  .map(plugin => typeof plugin === 'function' ? plugin() : plugin)
  .filter((plugin): plugin is NonNullable<typeof plugin> => !!plugin);
  const serverMode = initOptions.serverMode ?? ServerMode.Semantic;

diff --git a/packages/language-service/src/baseLanguageService.ts b/packages/language-service/src/baseLanguageService.ts
@@ -171,14 +171,10 @@ function createLanguageServicePluginContext(
  getTextDocument,
  };
 
- for (const pluginId in ctx.config.plugins ?? {}) {
- const plugin = ctx.config.plugins?.[pluginId];
- if (plugin instanceof Function) {
- const _plugin = plugin(context);
- context.plugins[pluginId] = _plugin;
- }
- else if (plugin) {
- context.plugins[pluginId] = plugin;
+ for (const serviceId in ctx.config.services ?? {}) {
+ const service = ctx.config.services?.[serviceId];
+ if (service) {
+ context.plugins[serviceId] = service(context);
  }
  }
 

diff --git a/packages/language-service/src/types.ts b/packages/language-service/src/types.ts
@@ -206,7 +206,7 @@ export interface RuleFix {
 
 export interface Config {
  languages?: { [id: string]: LanguageModule | undefined; };
- plugins?: { [id: string]: LanguageServicePlugin | LanguageServicePluginInstance | undefined; };
+ services?: { [id: string]: LanguageServicePlugin | undefined; };
  lint?: {
  rules?: { [id: string]: Rule | undefined; };
  severities?: { [id: string]: vscode.DiagnosticSeverity; };