typescript-language-server 4.2.0 → 4.3.0

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.3.0](https://github.com/typescript-language-server/typescript-language-server/compare/v4.2.0...v4.3.0) (2024-01-08)
+
+
+### Features
+
+* support specifying language IDs in plugins ([#834](https://github.com/typescript-language-server/typescript-language-server/issues/834)) ([e9c0b11](https://github.com/typescript-language-server/typescript-language-server/commit/e9c0b117a9a5e273eb517dc0d337ecdf973f3dac))
+
+
+### Bug Fixes
+
+* avoid sending window/workDoneProgress/create before init ([#846](https://github.com/typescript-language-server/typescript-language-server/issues/846)) ([625048f](https://github.com/typescript-language-server/typescript-language-server/commit/625048fac8533bccdeda82ee140d4f7792d9fb04))
+
 ## [4.2.0](https://github.com/typescript-language-server/typescript-language-server/compare/v4.1.3...v4.2.0) (2023-12-09)
 
 

package/README.md

@@ -31,8 +31,8 @@ Maintained by a [community of contributors](https://github.com/typescript-langua
     - [TypeScript Version Notification](#typescript-version-notification)
 - [Development](#development)
     - [Build](#build)
+    - [Dev](#dev)
     - [Test](#test)
-    - [Watch](#watch)
     - [Publishing](#publishing)
 
 <!-- /MarkdownTOC -->
@@ -277,22 +277,24 @@ The `$/typescriptVersion` notification params include two properties:
 ### Build
 
 ```sh
-yarn
+yarn build
 ```
 
-### Test
-
- - `yarn test` - run all tests
- - `yarn test:watch` - run all tests and enable watch mode for developing
+### Dev
 
-By default only console logs of level `warning` and higher are printed to the console. You can override the `CONSOLE_LOG_LEVEL` level in `package.json` to either `log`, `info`, `warning` or `error` to log other levels.
-
-### Watch
+Build and rebuild on change.
 
 ```sh
-yarn watch
+yarn dev
 ```
 
+### Test
+
+ - `yarn test` - run all tests in watch mode for developing
+ - `yarn test:commit` - run all tests once
+
+By default only console logs of level `warning` and higher are printed to the console. You can override the `CONSOLE_LOG_LEVEL` level in `package.json` to either `log`, `info`, `warning` or `error` to log other levels.
+
 ### Publishing
 
 The project uses https://github.com/google-github-actions/release-please-action Github action to automatically release new version on merging a release PR.

package/lib/cli.mjs

@@ -17419,17 +17419,20 @@ class LspDocuments {
   constructor(client, lspClient, onCaseInsensitiveFileSystem) {
     this._validateJavaScript = true;
     this._validateTypeScript = true;
+    this.modeIds = new Set;
     this._files = [];
     this.documents = new Map;
     this.client = client;
     this.lspClient = lspClient;
-    this.modeIds = new Set(jsTsLanguageModes);
     const pathNormalizer = path => this.client.toTsFilePath(path.toString());
     this.pendingDiagnostics = new PendingDiagnostics(pathNormalizer, {
       onCaseInsensitiveFileSystem: onCaseInsensitiveFileSystem
     });
     this.diagnosticDelayer = new Delayer(300);
   }
+  initialize(allModeIds) {
+    this.modeIds = new Set(allModeIds);
+  }
   get files() {
     return this._files;
   }
@@ -17652,6 +17655,35 @@ const vsls = 'vsls';
 
 const disabledSchemes = new Set([ git, vsls, github, azurerepos ]);
 
+var TypeScriptServerPlugin;
+
+(function(TypeScriptServerPlugin) {
+  function equals(a, b) {
+    return a.uri.toString() === b.uri.toString() && a.name === b.name && equals$1(a.languages, b.languages);
+  }
+  TypeScriptServerPlugin.equals = equals;
+})(TypeScriptServerPlugin || (TypeScriptServerPlugin = {}));
+
+class PluginManager {
+  setPlugins(plugins) {
+    this._plugins = this.readPlugins(plugins);
+  }
+  get plugins() {
+    return Array.from(this._plugins || []);
+  }
+  readPlugins(plugins) {
+    const newPlugins = [];
+    for (const plugin of plugins) {
+      newPlugins.push({
+        name: plugin.name,
+        uri: URI.file(plugin.location),
+        languages: Array.isArray(plugin.languages) ? plugin.languages : []
+      });
+    }
+    return newPlugins;
+  }
+}
+
 class TypeScriptServerError extends Error {
   static create(serverId, version, response) {
     const parsedResult = TypeScriptServerError.parseErrorText(response);
@@ -18630,7 +18662,7 @@ class TypeScriptServerSpawner {
     this._logger = _logger;
     this._tracer = _tracer;
   }
-  spawn(version, capabilities, configuration, delegate) {
+  spawn(version, capabilities, configuration, pluginManager, delegate) {
     let primaryServer;
     const serverType = this.getCompositeServerType(version, capabilities, configuration);
     switch (serverType) {
@@ -18639,21 +18671,21 @@ class TypeScriptServerSpawner {
       {
         const enableDynamicRouting = serverType === 2;
         primaryServer = new SyntaxRoutingTsServer({
-          syntax: this.spawnTsServer('syntax', version, configuration),
-          semantic: this.spawnTsServer('semantic', version, configuration)
+          syntax: this.spawnTsServer('syntax', version, configuration, pluginManager),
+          semantic: this.spawnTsServer('semantic', version, configuration, pluginManager)
         }, delegate, enableDynamicRouting);
         break;
       }
 
      case 0:
       {
-        primaryServer = this.spawnTsServer('main', version, configuration);
+        primaryServer = this.spawnTsServer('main', version, configuration, pluginManager);
         break;
       }
 
      case 3:
       {
-        primaryServer = this.spawnTsServer('syntax', version, configuration);
+        primaryServer = this.spawnTsServer('syntax', version, configuration, pluginManager);
         break;
       }
     }
@@ -18677,10 +18709,10 @@ class TypeScriptServerSpawner {
       return 0;
     }
   }
-  spawnTsServer(kind, version, configuration) {
+  spawnTsServer(kind, version, configuration, pluginManager) {
     const processFactory = new NodeTsServerProcessFactory;
     const canceller = nodeRequestCancellerFactory.create(kind, this._tracer);
-    const {args: args, tsServerLogFile: tsServerLogFile} = this.getTsServerArgs(kind, configuration, this._apiVersion, canceller.cancellationPipeName);
+    const {args: args, tsServerLogFile: tsServerLogFile} = this.getTsServerArgs(kind, configuration, this._apiVersion, pluginManager, canceller.cancellationPipeName);
     if (this.isLoggingEnabled(configuration)) {
       if (tsServerLogFile) {
         this._logger.logIgnoringVerbosity(LogLevel.Info, `<${kind}> Log file: ${tsServerLogFile}`);
@@ -18704,7 +18736,7 @@ class TypeScriptServerSpawner {
       return ServerType.Semantic;
     }
   }
-  getTsServerArgs(kind, configuration, apiVersion, cancellationPipeName) {
+  getTsServerArgs(kind, configuration, apiVersion, pluginManager, cancellationPipeName) {
     const args = [];
     let tsServerLogFile;
     let tsServerTraceDirectory;
@@ -18716,7 +18748,7 @@ class TypeScriptServerSpawner {
       }
     }
     args.push('--useInferredProjectPerProjectRoot');
-    const {disableAutomaticTypingAcquisition: disableAutomaticTypingAcquisition, globalPlugins: globalPlugins, locale: locale, npmLocation: npmLocation, pluginProbeLocations: pluginProbeLocations} = configuration;
+    const {disableAutomaticTypingAcquisition: disableAutomaticTypingAcquisition, locale: locale, npmLocation: npmLocation} = configuration;
     if (disableAutomaticTypingAcquisition || kind === 'syntax' || kind === 'diagnostics') {
       args.push('--disableAutomaticTypingAcquisition');
     }
@@ -18731,11 +18763,15 @@ class TypeScriptServerSpawner {
         args.push('--logFile', tsServerLogFile);
       }
     }
-    if (globalPlugins?.length) {
-      args.push('--globalPlugins', globalPlugins.join(','));
+    const pluginPaths = [];
+    if (pluginManager.plugins.length) {
+      args.push('--globalPlugins', pluginManager.plugins.map((x => x.name)).join(','));
+      for (const plugin of pluginManager.plugins) {
+        pluginPaths.push(plugin.uri.fsPath);
+      }
     }
-    if (pluginProbeLocations?.length) {
-      args.push('--pluginProbeLocations', pluginProbeLocations.join(','));
+    if (pluginPaths.length !== 0) {
+      args.push('--pluginProbeLocations', pluginPaths.join(','));
     }
     if (npmLocation) {
       this._logger.info(`using npm from ${npmLocation}`);
@@ -18908,6 +18944,7 @@ class TsClient {
     this.serverState = ServerState.None;
     this.workspaceFolders = [];
     this.useSyntaxServer = 2;
+    this.pluginManager = new PluginManager;
     this.documents = new LspDocuments(this, lspClient, onCaseInsensitiveFileSystem);
     this.logger = new PrefixingLogger(logger, '[tsclient]');
     this.tsserverLogger = new PrefixingLogger(this.logger, '[tsserver]');
@@ -19004,6 +19041,14 @@ class TsClient {
       }
     }
   }
+  configurePlugin(pluginName, configuration) {
+    if (this.apiVersion.gte(API.v314)) {
+      this.executeWithoutWaitingForResponse(CommandTypes.ConfigurePlugin, {
+        pluginName: pluginName,
+        configuration: configuration
+      });
+    }
+  }
   start(workspaceRoot, options) {
     this.apiVersion = options.typescriptVersion.version || API.defaultVersion;
     this.typescriptVersionSource = options.typescriptVersion.source;
@@ -19014,8 +19059,11 @@ class TsClient {
     this.useSyntaxServer = options.useSyntaxServer;
     this.onEvent = options.onEvent;
     this.onExit = options.onExit;
+    this.pluginManager.setPlugins(options.plugins);
+    const modeIds = [ ...jsTsLanguageModes, ...this.pluginManager.plugins.flatMap((x => x.languages)) ];
+    this.documents.initialize(modeIds);
     const tsServerSpawner = new TypeScriptServerSpawner(this.apiVersion, options.logDirectoryProvider, this.logger, this.tracer);
-    const tsServer = tsServerSpawner.spawn(options.typescriptVersion, this.capabilities, options, {
+    const tsServer = tsServerSpawner.spawn(options.typescriptVersion, this.capabilities, options, this.pluginManager, {
       onFatalError: (command, err) => this.fatalError(command, err)
     });
     this.serverState = new ServerState.Running(tsServer, this.apiVersion, undefined, true);
@@ -19038,9 +19086,6 @@ class TsClient {
       this.serviceExited();
     }));
     tsServer.onEvent((event => this.dispatchEvent(event)));
-    if (this.apiVersion.gte(API.v300) && this.capabilities.has(ClientCapability.Semantic)) {
-      this.loadingIndicator.startedLoadingProject('');
-    }
     return true;
   }
   serviceExited() {
@@ -22295,16 +22340,7 @@ class LspServer {
     const clientCapabilities = this.initializeParams.capabilities;
     this.workspaceRoot = this.initializeParams.rootUri ? URI.parse(this.initializeParams.rootUri).fsPath : this.initializeParams.rootPath || undefined;
     const userInitializationOptions = this.initializeParams.initializationOptions || {};
-    const {disableAutomaticTypingAcquisition: disableAutomaticTypingAcquisition, hostInfo: hostInfo, maxTsServerMemory: maxTsServerMemory, npmLocation: npmLocation, locale: locale, tsserver: tsserver} = userInitializationOptions;
-    const {plugins: plugins} = {
-      plugins: userInitializationOptions.plugins || []
-    };
-    const globalPlugins = [];
-    const pluginProbeLocations = [];
-    for (const plugin of plugins) {
-      globalPlugins.push(plugin.name);
-      pluginProbeLocations.push(plugin.location);
-    }
+    const {disableAutomaticTypingAcquisition: disableAutomaticTypingAcquisition, hostInfo: hostInfo, maxTsServerMemory: maxTsServerMemory, npmLocation: npmLocation, locale: locale, plugins: plugins, tsserver: tsserver} = userInitializationOptions;
     const typescriptVersion = this.findTypescriptVersion(tsserver?.path, tsserver?.fallbackPath);
     if (typescriptVersion) {
       this.options.lspClient.logMessage({
@@ -22351,8 +22387,7 @@ class LspServer {
       maxTsServerMemory: maxTsServerMemory,
       npmLocation: npmLocation,
       locale: locale,
-      globalPlugins: globalPlugins,
-      pluginProbeLocations: pluginProbeLocations,
+      plugins: plugins || [],
       onEvent: this.onTsEvent.bind(this),
       onExit: (exitCode, signal) => {
         this.shutdown();
@@ -22948,12 +22983,7 @@ class LspServer {
       }
     } else if (params.command === Commands.CONFIGURE_PLUGIN && params.arguments) {
       const [pluginName, configuration] = params.arguments;
-      if (this.tsClient.apiVersion.gte(API.v314)) {
-        this.tsClient.executeWithoutWaitingForResponse(CommandTypes.ConfigurePlugin, {
-          configuration: configuration,
-          pluginName: pluginName
-        });
-      }
+      this.tsClient.configurePlugin(pluginName, configuration);
     } else if (params.command === Commands.ORGANIZE_IMPORTS && params.arguments) {
       const file = params.arguments[0];
       const uri = this.tsClient.toResource(file).toString();