wip: LanguageServerInitializationOptions -> InitializationOptions

packages/language-server/src/browser/fileSystems.ts

@@ -3,7 +3,7 @@ import { FileType } from 'vscode-html-languageservice';
 import * as vscode from 'vscode-languageserver';
 import { URI } from 'vscode-uri';
 import { FsReadDirectoryRequest, FsReadFileRequest } from '../protocol';
-import { FileSystem, FileSystemHost, LanguageServerInitializationOptions, RuntimeEnvironment } from '../types';
+import { FileSystem, FileSystemHost, InitializationOptions, RuntimeEnvironment } from '../types';
 import { matchFiles } from './typescript/utilities';
 import { createUriMap } from '../common/utils/uriMap';
 
@@ -24,7 +24,7 @@ export function createWebFileSystemHost(
  _0: any,
  _1: any,
  env: RuntimeEnvironment,
- initOptions: LanguageServerInitializationOptions,
+ initOptions: InitializationOptions,
 ): FileSystemHost {
 
  const instances = createUriMap<FileSystem>(env.fileNameToUri);

packages/language-server/src/common/features/languageFeatures.ts

@@ -3,14 +3,14 @@ import * as vscode from 'vscode-languageserver';
 import { AutoInsertRequest, FindFileReferenceRequest } from '../../protocol';
 import { CancellationTokenHost } from '../cancellationPipe';
 import type { Workspaces } from '../workspaces';
-import { RuntimeEnvironment, LanguageServerInitializationOptions, ServerMode } from '../../types';
+import { RuntimeEnvironment, InitializationOptions, ServerMode } from '../../types';
 import { createDocuments } from '../documents';
 
 export function register(
  connection: vscode.Connection,
  projects: Workspaces,
  initParams: vscode.InitializeParams,
- initOptions: LanguageServerInitializationOptions,
+ initOptions: InitializationOptions,
  cancelHost: CancellationTokenHost,
  semanticTokensLegend: vscode.SemanticTokensLegend,
  runtime: RuntimeEnvironment,

packages/language-server/src/common/server.ts

@@ -2,7 +2,7 @@ import { Config, standardSemanticTokensLegend } from '@volar/language-service';
 import * as l10n from '@vscode/l10n';
 import * as vscode from 'vscode-languageserver';
 import { URI } from 'vscode-uri';
-import { FileSystemHost, LanguageServerInitializationOptions, LanguageServerPlugin, RuntimeEnvironment, ServerMode } from '../types';
+import { FileSystemHost, InitializationOptions, LanguageServerPlugin, RuntimeEnvironment, ServerMode } from '../types';
 import { createCancellationTokenHost } from './cancellationPipe';
 import { createConfigurationHost } from './configurationHost';
 import { createDocuments } from './documents';
@@ -16,10 +16,10 @@ export interface ServerContext {
  plugins: LanguageServerPlugin[],
 }
 
-export function startCommonLanguageServer(connection: vscode.Connection, getCtx: (initOptions: LanguageServerInitializationOptions) => ServerContext) {
+export function startCommonLanguageServer(connection: vscode.Connection, getCtx: (initOptions: InitializationOptions) => ServerContext) {
 
  let initParams: vscode.InitializeParams;
- let options: LanguageServerInitializationOptions;
+ let options: InitializationOptions;
  let roots: URI[] = [];
  let fsHost: FileSystemHost | undefined;
  let projects: ReturnType<typeof createWorkspaces> | undefined;

packages/language-server/src/common/utils/registerFeatures.ts

@@ -1,10 +1,10 @@
-import { DiagnosticModel, LanguageServerPlugin, LanguageServerInitializationOptions, ServerMode } from '../../types';
+import { DiagnosticModel, LanguageServerPlugin, InitializationOptions, ServerMode } from '../../types';
 import * as vscode from 'vscode-languageserver';
 import { Config } from '@volar/language-service';
 
 export function setupCapabilities(
  server: vscode.ServerCapabilities,
- initOptions: LanguageServerInitializationOptions,
+ initOptions: InitializationOptions,
  plugins: ReturnType<LanguageServerPlugin>[],
  semanticTokensLegend: vscode.SemanticTokensLegend,
  services: NonNullable<Config['services']>,

packages/language-server/src/common/workspaces.ts

@@ -2,7 +2,7 @@ import { ServiceContext } from '@volar/language-service';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import * as vscode from 'vscode-languageserver';
 import { URI } from 'vscode-uri';
-import { DiagnosticModel, FileSystemHost, LanguageServerInitializationOptions, LanguageServerPlugin, ServerMode } from '../types';
+import { DiagnosticModel, FileSystemHost, InitializationOptions, LanguageServerPlugin, ServerMode } from '../types';
 import { CancellationTokenHost } from './cancellationPipe';
 import { createDocuments } from './documents';
 import { ServerContext } from './server';
@@ -13,7 +13,7 @@ import * as path from 'typesafe-path';
 export interface WorkspacesContext {
  server: ServerContext;
  initParams: vscode.InitializeParams,
- initOptions: LanguageServerInitializationOptions,
+ initOptions: InitializationOptions,
  plugins: ReturnType<LanguageServerPlugin>[],
  ts: typeof import('typescript/lib/tsserverlibrary') | undefined,
  tsLocalized: ts.MapLike<string> | undefined,

packages/language-server/src/node/fileSystem.ts

@@ -2,15 +2,15 @@ import type * as ts from 'typescript/lib/tsserverlibrary';
 import * as vscode from 'vscode-languageserver';
 import { URI } from 'vscode-uri';
 import { createUriMap } from '../common/utils/uriMap';
-import { FileSystem, FileSystemHost, LanguageServerInitializationOptions, RuntimeEnvironment } from '../types';
+import { FileSystem, FileSystemHost, InitializationOptions, RuntimeEnvironment } from '../types';
 
 let currentCwd = '';
 
 export function createNodeFileSystemHost(
  ts: typeof import('typescript/lib/tsserverlibrary'),
  capabilities: vscode.ClientCapabilities,
  env: RuntimeEnvironment,
- _initOptions: LanguageServerInitializationOptions,
+ _initOptions: InitializationOptions,
 ): FileSystemHost {
 
  const instances = createUriMap<[FileSystem, Map<string, any>[]]>(env.fileNameToUri);

packages/language-server/src/types.ts

@@ -37,7 +37,7 @@ export interface RuntimeEnvironment {
  ts: typeof import('typescript/lib/tsserverlibrary'),
  capabilities: vscode.ClientCapabilities,
  env: RuntimeEnvironment,
- initOptions: LanguageServerInitializationOptions,
+ initOptions: InitializationOptions,
  ) => FileSystemHost,
  // https://github.com/microsoft/vscode/blob/7927075f89db213bc6e2182fa684d514d69e2359/extensions/html-language-features/server/src/htmlServer.ts#L53-L56
  readonly timer: {
@@ -48,7 +48,7 @@ export interface RuntimeEnvironment {
 }
 
 export interface LanguageServerPlugin {
- (initOptions: LanguageServerInitializationOptions, modules: { typescript?: typeof import('typescript/lib/tsserverlibrary'); }): {
+ (initOptions: InitializationOptions, modules: { typescript?: typeof import('typescript/lib/tsserverlibrary'); }): {
  extraFileExtensions?: ts.FileExtensionInfo[];
  watchFileExtensions?: string[];
  resolveConfig?(
@@ -76,7 +76,7 @@ export enum DiagnosticModel {
  Pull = 2,
 }
 
-export interface LanguageServerInitializationOptions {
+export interface InitializationOptions {
  typescript?: {
  /**
  * Absolute path to node_modules/typescript/lib

packages/vscode/src/features/tsVersion.ts

@@ -2,7 +2,7 @@ import * as path from 'typesafe-path';
 import * as vscode from 'vscode';
 import { BaseLanguageClient } from 'vscode-languageclient';
 import { quickPick } from '../common';
-import { LanguageServerInitializationOptions } from '@volar/language-server';
+import { InitializationOptions } from '@volar/language-server';
 
 const defaultTsdkPath = 'node_modules/typescript/lib' as path.PosixPath;
 
@@ -101,7 +101,7 @@ export async function activate(
 
  async function reloadServers() {
  const tsPaths = await getTsdk(context);
- const newInitOptions: LanguageServerInitializationOptions = {
+ const newInitOptions: InitializationOptions = {
  ...client.clientOptions.initializationOptions,
  typescript: tsPaths,
  };