typescript-language-server 5.0.1 → 5.1.0

package/lib/cli.mjs

@@ -1,21 +1,11 @@
 #!/usr/bin/env node
 import fs$2, { promises, statSync, existsSync, readFileSync } from 'node:fs';
 
-import require$$0 from 'node:events';
-
-import require$$1 from 'node:child_process';
-
-import * as path from 'node:path';
-
-import path__default, { extname, resolve } from 'node:path';
-
-import process$1 from 'node:process';
-
-import require$$0$4, { promisify as promisify$1 } from 'node:util';
+import { createRequire } from 'node:module';
 
-import require$$0$1, { promisify } from 'util';
+import require$$0, { promisify } from 'util';
 
-import require$$1$1 from 'path';
+import require$$1 from 'path';
 
 import require$$2 from 'os';
 
@@ -23,15 +13,19 @@ import crypto from 'crypto';
 
 import require$$4 from 'net';
 
-import require$$0$2 from 'url';
+import require$$0$1 from 'url';
 
-import require$$0$3 from 'fs';
+import require$$0$2 from 'fs';
 
 import require$$3 from 'child_process';
 
-import require$$0$5 from 'constants';
+import * as path from 'node:path';
+
+import path__default, { extname, resolve } from 'node:path';
+
+import require$$0$3 from 'constants';
 
-import require$$0$6 from 'stream';
+import require$$0$4 from 'stream';
 
 import require$$5 from 'assert';
 
@@ -41,9 +35,13 @@ import 'node:fs/promises';
 
 import stream from 'node:stream';
 
-import { createRequire } from 'node:module';
+import { promisify as promisify$1 } from 'node:util';
 
-import require$$1$2 from 'fs/promises';
+import ChildProcess from 'node:child_process';
+
+import require$$1$1 from 'fs/promises';
+
+import process$1 from 'node:process';
 
 import { fileURLToPath } from 'node:url';
 
@@ -173,6 +171,36 @@ function requireArgument() {
 
 var command = {};
 
+const require$5 = createRequire(import.meta.url);
+
+function __require$5() {
+  return require$5('node:events');
+}
+
+const require$4 = createRequire(import.meta.url);
+
+function __require$4() {
+  return require$4('node:child_process');
+}
+
+const require$3 = createRequire(import.meta.url);
+
+function __require$3() {
+  return require$3('node:path');
+}
+
+const require$2 = createRequire(import.meta.url);
+
+function __require$2() {
+  return require$2('node:fs');
+}
+
+const require$1 = createRequire(import.meta.url);
+
+function __require$1() {
+  return require$1('node:process');
+}
+
 var help = {};
 
 var hasRequiredHelp;
@@ -751,11 +779,11 @@ var hasRequiredCommand;
 function requireCommand() {
   if (hasRequiredCommand) return command;
   hasRequiredCommand = 1;
-  const EventEmitter = require$$0.EventEmitter;
-  const childProcess = require$$1;
-  const path = path__default;
-  const fs = fs$2;
-  const process = process$1;
+  const EventEmitter = __require$5().EventEmitter;
+  const childProcess = __require$4();
+  const path = __require$3();
+  const fs = __require$2();
+  const process = __require$1();
   const {Argument: Argument, humanReadableArgName: humanReadableArgName} = requireArgument();
   const {CommanderError: CommanderError} = requireError();
   const {Help: Help, stripColor: stripColor} = requireHelp();
@@ -1605,7 +1633,7 @@ function requireCommand() {
         return arg.length > 1 && arg[0] === '-';
       }
       const negativeNumberArg = arg => {
-        if (!/^-\d*\.?\d+(e[+-]?\d+)?$/.test(arg)) return false;
+        if (!/^-(\d+|\d*\.\d+)(e[+-]?\d+)?$/.test(arg)) return false;
         return !this._getCommandAndAncestors().some(cmd => cmd.options.map(opt => opt.short).some(short => /^-\d$/.test(short)));
       };
       let activeVariadicOption = null;
@@ -2127,6 +2155,12 @@ const {program: program$1, createCommand: createCommand, createArgument: createA
 
 var main$3 = {};
 
+const require = createRequire(import.meta.url);
+
+function __require() {
+  return require('node:util');
+}
+
 var is$2 = {};
 
 var hasRequiredIs$2;
@@ -5334,7 +5368,7 @@ function requireRil() {
   Object.defineProperty(ril, '__esModule', {
     value: true
   });
-  const util_1 = require$$0$1;
+  const util_1 = require$$0;
   const api_1 = requireApi$2();
   class MessageBuffer extends api_1.AbstractMessageBuffer {
     constructor(encoding = 'utf-8') {
@@ -5522,7 +5556,7 @@ function requireMain$3() {
     exports.createMessageConnection = exports.createServerSocketTransport = exports.createClientSocketTransport = exports.createServerPipeTransport = exports.createClientPipeTransport = exports.generateRandomPipeName = exports.StreamMessageWriter = exports.StreamMessageReader = exports.SocketMessageWriter = exports.SocketMessageReader = exports.PortMessageWriter = exports.PortMessageReader = exports.IPCMessageWriter = exports.IPCMessageReader = void 0;
     const ril_1 = requireRil();
     ril_1.default.install();
-    const path = require$$1$1;
+    const path = require$$1;
     const os = require$$2;
     const crypto_1 = crypto;
     const net_1 = require$$4;
@@ -11133,9 +11167,9 @@ function requireFiles() {
     value: true
   });
   files.resolveModulePath = files.FileSystem = files.resolveGlobalYarnPath = files.resolveGlobalNodePath = files.resolve = files.uriToFilePath = void 0;
-  const url = require$$0$2;
-  const path = require$$1$1;
-  const fs = require$$0$3;
+  const url = require$$0$1;
+  const path = require$$1;
+  const fs = require$$0$2;
   const child_process_1 = require$$3;
   function uriToFilePath(uri) {
     let parsed = url.parse(uri);
@@ -11468,7 +11502,7 @@ function requireMain() {
       value: true
     });
     exports.createConnection = exports.Files = void 0;
-    const node_util_1 = require$$0$4;
+    const node_util_1 = __require();
     const Is = requireIs$2();
     const server_1 = requireServer();
     const fm = requireFiles();
@@ -11902,7 +11936,7 @@ var hasRequiredPolyfills;
 function requirePolyfills() {
   if (hasRequiredPolyfills) return polyfills;
   hasRequiredPolyfills = 1;
-  var constants = require$$0$5;
+  var constants = require$$0$3;
   var origCwd = process.cwd;
   var cwd = null;
   var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform;
@@ -12174,7 +12208,7 @@ var hasRequiredLegacyStreams;
 function requireLegacyStreams() {
   if (hasRequiredLegacyStreams) return legacyStreams;
   hasRequiredLegacyStreams = 1;
-  var Stream = require$$0$6.Stream;
+  var Stream = require$$0$4.Stream;
   legacyStreams = legacy;
   function legacy(fs) {
     return {
@@ -12298,11 +12332,11 @@ var hasRequiredGracefulFs;
 function requireGracefulFs() {
   if (hasRequiredGracefulFs) return gracefulFs;
   hasRequiredGracefulFs = 1;
-  var fs = require$$0$3;
+  var fs = require$$0$2;
   var polyfills = requirePolyfills();
   var legacy = requireLegacyStreams();
   var clone = requireClone();
-  var util = require$$0$1;
+  var util = require$$0;
   var gracefulQueue;
   var previousSymbol;
   if (typeof Symbol === 'function' && typeof Symbol.for === 'function') {
@@ -12701,7 +12735,7 @@ var hasRequiredUtils$1;
 function requireUtils$1() {
   if (hasRequiredUtils$1) return utils$1;
   hasRequiredUtils$1 = 1;
-  const path = require$$1$1;
+  const path = require$$1;
   utils$1.checkPath = function checkPath(pth) {
     if (process.platform === 'win32') {
       const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path.parse(pth).root, ''));
@@ -12834,7 +12868,7 @@ function requireStat() {
   if (hasRequiredStat) return stat;
   hasRequiredStat = 1;
   const fs = requireFs();
-  const path = require$$1$1;
+  const path = require$$1;
   const u = requireUniversalify().fromPromise;
   function getStats(src, dest, opts) {
     const statFunc = opts.dereference ? file => fs.stat(file, {
@@ -13020,7 +13054,7 @@ function requireCopy$1() {
   if (hasRequiredCopy$1) return copy_1;
   hasRequiredCopy$1 = 1;
   const fs = requireFs();
-  const path = require$$1$1;
+  const path = require$$1;
   const {mkdirs: mkdirs} = requireMkdirs();
   const {pathExists: pathExists} = requirePathExists();
   const {utimesMillis: utimesMillis} = requireUtimes();
@@ -13145,7 +13179,7 @@ function requireCopySync() {
   if (hasRequiredCopySync) return copySync_1;
   hasRequiredCopySync = 1;
   const fs = requireGracefulFs();
-  const path = require$$1$1;
+  const path = require$$1;
   const mkdirsSync = requireMkdirs().mkdirsSync;
   const utimesMillisSync = requireUtimes().utimesMillisSync;
   const stat = requireStat();
@@ -13322,7 +13356,7 @@ function requireEmpty() {
   hasRequiredEmpty = 1;
   const u = requireUniversalify().fromPromise;
   const fs = requireFs();
-  const path = require$$1$1;
+  const path = require$$1;
   const mkdir = requireMkdirs();
   const remove = requireRemove();
   const emptyDir = u(async function emptyDir(dir) {
@@ -13363,7 +13397,7 @@ function requireFile() {
   if (hasRequiredFile) return file$1;
   hasRequiredFile = 1;
   const u = requireUniversalify().fromPromise;
-  const path = require$$1$1;
+  const path = require$$1;
   const fs = requireFs();
   const mkdir = requireMkdirs();
   async function createFile(file) {
@@ -13422,7 +13456,7 @@ function requireLink() {
   if (hasRequiredLink) return link;
   hasRequiredLink = 1;
   const u = requireUniversalify().fromPromise;
-  const path = require$$1$1;
+  const path = require$$1;
   const fs = requireFs();
   const mkdir = requireMkdirs();
   const {pathExists: pathExists} = requirePathExists();
@@ -13479,7 +13513,7 @@ var hasRequiredSymlinkPaths;
 function requireSymlinkPaths() {
   if (hasRequiredSymlinkPaths) return symlinkPaths_1;
   hasRequiredSymlinkPaths = 1;
-  const path = require$$1$1;
+  const path = require$$1;
   const fs = requireFs();
   const {pathExists: pathExists} = requirePathExists();
   const u = requireUniversalify().fromPromise;
@@ -13592,7 +13626,7 @@ function requireSymlink() {
   if (hasRequiredSymlink) return symlink;
   hasRequiredSymlink = 1;
   const u = requireUniversalify().fromPromise;
-  const path = require$$1$1;
+  const path = require$$1;
   const fs = requireFs();
   const {mkdirs: mkdirs, mkdirsSync: mkdirsSync} = requireMkdirs();
   const {symlinkPaths: symlinkPaths, symlinkPathsSync: symlinkPathsSync} = requireSymlinkPaths();
@@ -13704,7 +13738,7 @@ function requireJsonfile$1() {
   try {
     _fs = requireGracefulFs();
   } catch (_) {
-    _fs = require$$0$3;
+    _fs = require$$0$2;
   }
   const universalify = requireUniversalify();
   const {stringify: stringify, stripBom: stripBom} = requireUtils();
@@ -13799,7 +13833,7 @@ function requireOutputFile() {
   hasRequiredOutputFile = 1;
   const u = requireUniversalify().fromPromise;
   const fs = requireFs();
-  const path = require$$1$1;
+  const path = require$$1;
   const mkdir = requireMkdirs();
   const pathExists = requirePathExists().pathExists;
   async function outputFile(file, data, encoding = 'utf-8') {
@@ -13886,7 +13920,7 @@ function requireMove$1() {
   if (hasRequiredMove$1) return move_1;
   hasRequiredMove$1 = 1;
   const fs = requireFs();
-  const path = require$$1$1;
+  const path = require$$1;
   const {copy: copy} = requireCopy();
   const {remove: remove} = requireRemove();
   const {mkdirp: mkdirp} = requireMkdirs();
@@ -13941,7 +13975,7 @@ function requireMoveSync() {
   if (hasRequiredMoveSync) return moveSync_1;
   hasRequiredMoveSync = 1;
   const fs = requireGracefulFs();
-  const path = require$$1$1;
+  const path = require$$1;
   const copySync = requireCopy().copySync;
   const removeSync = requireRemove().removeSync;
   const mkdirpSync = requireMkdirs().mkdirpSync;
@@ -15226,6 +15260,9 @@ function requireIdentifiers() {
   hasRequiredIdentifiers = 1;
   const numeric = /^[0-9]+$/;
   const compareIdentifiers = (a, b) => {
+    if (typeof a === 'number' && typeof b === 'number') {
+      return a === b ? 0 : a < b ? -1 : 1;
+    }
     const anum = numeric.test(a);
     const bnum = numeric.test(b);
     if (anum && bnum) {
@@ -15333,7 +15370,25 @@ function requireSemver$1() {
       if (!(other instanceof SemVer)) {
         other = new SemVer(other, this.options);
       }
-      return compareIdentifiers(this.major, other.major) || compareIdentifiers(this.minor, other.minor) || compareIdentifiers(this.patch, other.patch);
+      if (this.major < other.major) {
+        return -1;
+      }
+      if (this.major > other.major) {
+        return 1;
+      }
+      if (this.minor < other.minor) {
+        return -1;
+      }
+      if (this.minor > other.minor) {
+        return 1;
+      }
+      if (this.patch < other.patch) {
+        return -1;
+      }
+      if (this.patch > other.patch) {
+        return 1;
+      }
+      return 0;
     }
     comparePre(other) {
       if (!(other instanceof SemVer)) {
@@ -16161,6 +16216,7 @@ function requireRange() {
     return result;
   };
   const parseComparator = (comp, options) => {
+    comp = comp.replace(re[t.BUILD], '');
     debug('comp', comp, options);
     comp = replaceCarets(comp, options);
     debug('caret', comp);
@@ -18487,7 +18543,7 @@ class NodeTsServerProcessFactory {
     if (useIpc) {
       runtimeArgs.push('--useNodeIpc');
     }
-    const childProcess = require$$1.fork(tsServerPath, runtimeArgs, {
+    const childProcess = ChildProcess.fork(tsServerPath, runtimeArgs, {
       silent: true,
       cwd: undefined,
       env: generatePatchedEnv(process.env, tsServerPath),
@@ -19397,25 +19453,23 @@ class TsClient {
   }
 }
 
-const pDebounce = (function_, wait, options = {}) => {
+const pDebounce = (functionToDebounce, wait, options = {}) => {
   if (!Number.isFinite(wait)) {
     throw new TypeError('Expected `wait` to be a finite number');
   }
   let leadingValue;
   let timeout;
-  let resolveList = [];
-  let rejectList = [];
+  let promiseHandlers = [];
   const onAbort = () => {
     clearTimeout(timeout);
-    timeout = null;
+    timeout = undefined;
     try {
       options.signal?.throwIfAborted();
     } catch (error) {
-      for (const reject of rejectList) {
+      for (const {reject: reject} of promiseHandlers) {
         reject(error);
       }
-      resolveList = [];
-      rejectList = [];
+      promiseHandlers = [];
     }
   };
   return function(...arguments_) {
@@ -19429,18 +19483,16 @@ const pDebounce = (function_, wait, options = {}) => {
       const shouldCallNow = options.before && !timeout;
       clearTimeout(timeout);
       timeout = setTimeout(async () => {
-        timeout = null;
-        const currentResolveList = resolveList;
-        const currentRejectList = rejectList;
-        resolveList = [];
-        rejectList = [];
+        timeout = undefined;
+        const currentHandlers = promiseHandlers;
+        promiseHandlers = [];
         try {
-          const result = options.before ? leadingValue : await function_.apply(this, arguments_);
-          for (const resolveFunction of currentResolveList) {
+          const result = options.before ? leadingValue : await functionToDebounce.apply(this, arguments_);
+          for (const {resolve: resolveFunction} of currentHandlers) {
             resolveFunction(result);
           }
         } catch (error) {
-          for (const rejectFunction of currentRejectList) {
+          for (const {reject: rejectFunction} of currentHandlers) {
             rejectFunction(error);
           }
         }
@@ -19450,16 +19502,18 @@ const pDebounce = (function_, wait, options = {}) => {
       if (shouldCallNow) {
         (async () => {
           try {
-            leadingValue = await function_.apply(this, arguments_);
+            leadingValue = await functionToDebounce.apply(this, arguments_);
             resolve(leadingValue);
           } catch (error) {
             reject(error);
           }
         })();
       } else {
-        resolveList.push(resolve);
-        rejectList.push(reject);
-        if (options.signal && resolveList.length === 1) {
+        promiseHandlers.push({
+          resolve: resolve,
+          reject: reject
+        });
+        if (options.signal && promiseHandlers.length === 1) {
           options.signal.addEventListener('abort', onAbort, {
             once: true
           });
@@ -19469,14 +19523,54 @@ const pDebounce = (function_, wait, options = {}) => {
   };
 };
 
-pDebounce.promise = function_ => {
+pDebounce.promise = (function_, options = {}) => {
   let currentPromise;
+  let queuedCall;
   return async function(...arguments_) {
     if (currentPromise) {
-      return currentPromise;
+      if (!options.after) {
+        return currentPromise;
+      }
+      queuedCall ??= {
+        resolvers: []
+      };
+      queuedCall.arguments = arguments_;
+      queuedCall.context = this;
+      return new Promise((resolve, reject) => {
+        queuedCall.resolvers.push({
+          resolve: resolve,
+          reject: reject
+        });
+      });
     }
+    currentPromise = (async () => {
+      let result;
+      let initialError;
+      try {
+        result = await function_.apply(this, arguments_);
+      } catch (error) {
+        initialError = error;
+      }
+      while (queuedCall) {
+        const call = queuedCall;
+        queuedCall = undefined;
+        try {
+          const queuedResult = await function_.apply(call.context, call.arguments);
+          for (const {resolve: resolve} of call.resolvers) {
+            resolve(queuedResult);
+          }
+        } catch (error) {
+          for (const {reject: reject} of call.resolvers) {
+            reject(error);
+          }
+        }
+      }
+      if (initialError) {
+        throw initialError;
+      }
+      return result;
+    })();
     try {
-      currentPromise = function_.apply(this, arguments_);
       return await currentPromise;
     } finally {
       currentPromise = undefined;
@@ -21348,8 +21442,9 @@ function areFileConfigurationsEqual(a, b) {
 }
 
 class FileConfigurationManager {
-  constructor(client, onCaseInsensitiveFileSystem) {
+  constructor(client, lspClient, onCaseInsensitiveFileSystem) {
     this.client = client;
+    this.lspClient = lspClient;
     this.tsPreferences = deepmerge({}, DEFAULT_TSSERVER_PREFERENCES);
     this.workspaceConfiguration = deepmerge({}, DEFAULT_WORKSPACE_CONFIGURATION);
     this.formatOptions = new ResourceMap(undefined, {
@@ -21394,7 +21489,15 @@ class FileConfigurationManager {
     });
   }
   async ensureConfigurationForDocument(document, token) {
-    return this.ensureConfigurationOptions(document, undefined, token);
+    const formattingOptions = await this.getFormattingOptions(document);
+    return this.ensureConfigurationOptions(document, formattingOptions, token);
+  }
+  async getFormattingOptions(document) {
+    const formatConfiguration = await this.lspClient.getWorkspaceConfiguration(document.uri.toString(), 'formattingOptions') || {};
+    return {
+      tabSize: typeof formatConfiguration.tabSize === 'number' ? formatConfiguration.tabSize : undefined,
+      insertSpaces: typeof formatConfiguration.insertSpaces === 'boolean' ? formatConfiguration.insertSpaces : undefined
+    };
   }
   async ensureConfigurationOptions(document, options, token) {
     const currentOptions = this.getFileOptions(document, options);
@@ -21875,8 +21978,8 @@ function requirePosix() {
     value: true
   });
   posix.sync = posix.isexe = void 0;
-  const fs_1 = require$$0$3;
-  const promises_1 = require$$1$2;
+  const fs_1 = require$$0$2;
+  const promises_1 = require$$1$1;
   const isexe = async (path, options = {}) => {
     const {ignoreErrors: ignoreErrors = false} = options;
     try {
@@ -21931,8 +22034,8 @@ function requireWin32() {
     value: true
   });
   win32.sync = win32.isexe = void 0;
-  const fs_1 = require$$0$3;
-  const promises_1 = require$$1$2;
+  const fs_1 = require$$0$2;
+  const promises_1 = require$$1$1;
   const isexe = async (path, options = {}) => {
     const {ignoreErrors: ignoreErrors = false} = options;
     try {
@@ -22052,7 +22155,7 @@ function requireLib() {
   if (hasRequiredLib) return lib;
   hasRequiredLib = 1;
   const {isexe: isexe, sync: isexeSync} = requireCjs();
-  const {join: join, delimiter: delimiter, sep: sep, posix: posix} = require$$1$1;
+  const {join: join, delimiter: delimiter, sep: sep, posix: posix} = require$$1;
   const isWindows = process.platform === 'win32';
   const rSlash = new RegExp(`[${posix.sep}${sep === posix.sep ? '' : sep}]`.replace(/(\\)/g, '\\$1'));
   const rRel = new RegExp(`^\\.${rSlash.source}`);
@@ -23066,7 +23169,7 @@ class LspServer {
     this.referencesCodeLensProvider = null;
     this.logger = new PrefixingLogger(options.logger, '[lspserver]');
     this.tsClient = new TsClient(onCaseInsensitiveFileSystem(), this.logger, options.lspClient);
-    this.fileConfigurationManager = new FileConfigurationManager(this.tsClient, onCaseInsensitiveFileSystem());
+    this.fileConfigurationManager = new FileConfigurationManager(this.tsClient, this.options.lspClient, onCaseInsensitiveFileSystem());
     this.commandManager = new CommandManager;
     this.diagnosticsManager = new DiagnosticsManager(diagnostics => this.options.lspClient.publishDiagnostics(diagnostics), this.tsClient, this.features, this.logger);
     this.codeActionsManager = new CodeActionManager(this.tsClient, this.fileConfigurationManager, this.commandManager, this.diagnosticsManager, this.features);
@@ -23664,14 +23767,17 @@ class LspServer {
           skipDestructiveCodeActions = documentHasErrors;
           mode = OrganizeImportsMode.SortAndCombine;
         }
-        const response = await this.tsClient.interruptGetErr(() => this.tsClient.execute(CommandTypes.OrganizeImports, {
-          scope: {
-            type: 'file',
-            args: fileRangeArgs
-          },
-          skipDestructiveCodeActions: skipDestructiveCodeActions,
-          mode: mode
-        }, token));
+        const response = await this.tsClient.interruptGetErr(async () => {
+          await this.fileConfigurationManager.ensureConfigurationForDocument(document, token);
+          return this.tsClient.execute(CommandTypes.OrganizeImports, {
+            scope: {
+              type: 'file',
+              args: fileRangeArgs
+            },
+            skipDestructiveCodeActions: skipDestructiveCodeActions,
+            mode: mode
+          }, token);
+        });
         if (response.type === 'response' && response.body) {
           actions.push(...provideOrganizeImports(command, response, this.tsClient));
         }
@@ -23738,6 +23844,7 @@ class LspServer {
       const additionalArguments = params.arguments[1] || {};
       const body = await this.tsClient.interruptGetErr(async () => {
         await this.fileConfigurationManager.ensureConfigurationForDocument(document);
+        const mode = additionalArguments.mode ?? (additionalArguments.skipDestructiveCodeActions ? OrganizeImportsMode.SortAndCombine : OrganizeImportsMode.All);
         const response = await this.tsClient.execute(CommandTypes.OrganizeImports, {
           scope: {
             type: 'file',
@@ -23746,7 +23853,7 @@ class LspServer {
             }
           },
           skipDestructiveCodeActions: additionalArguments.skipDestructiveCodeActions,
-          mode: additionalArguments.skipDestructiveCodeActions ? OrganizeImportsMode.SortAndCombine : OrganizeImportsMode.All
+          mode: mode
         }, token);
         if (response.type !== 'response') {
           return;
@@ -24096,6 +24203,12 @@ class LspClientImpl {
   logMessage(args) {
     this.connection.sendNotification(mainExports$2.LogMessageNotification.type, args);
   }
+  async getWorkspaceConfiguration(scopeUri, section) {
+    return await this.connection.workspace.getConfiguration({
+      scopeUri: scopeUri,
+      section: section
+    });
+  }
   async applyWorkspaceEdit(params) {
     return this.connection.workspace.applyEdit(params);
   }