typescript-language-server 4.4.1 → 5.0.0

package/lib/cli.mjs

@@ -116,7 +116,7 @@ function requireArgument() {
         this._name = name;
         break;
       }
-      if (this._name.length > 3 && this._name.slice(-3) === '...') {
+      if (this._name.endsWith('...')) {
         this.variadic = true;
         this._name = this._name.slice(0, -3);
       }
@@ -124,11 +124,12 @@ function requireArgument() {
     name() {
       return this._name;
     }
-    _concatValue(value, previous) {
+    _collectValue(value, previous) {
       if (previous === this.defaultValue || !Array.isArray(previous)) {
         return [ value ];
       }
-      return previous.concat(value);
+      previous.push(value);
+      return previous;
     }
     default(value, description) {
       this.defaultValue = value;
@@ -146,7 +147,7 @@ function requireArgument() {
           throw new InvalidArgumentError(`Allowed choices are ${this.argChoices.join(', ')}.`);
         }
         if (this.variadic) {
-          return this._concatValue(arg, previous);
+          return this._collectValue(arg, previous);
         }
         return arg;
       };
@@ -183,10 +184,14 @@ function requireHelp() {
   class Help {
     constructor() {
       this.helpWidth = undefined;
+      this.minWidthToWrap = 40;
       this.sortSubcommands = false;
       this.sortOptions = false;
       this.showGlobalOptions = false;
     }
+    prepareContext(contextOptions) {
+      this.helpWidth = this.helpWidth ?? contextOptions.helpWidth ?? 80;
+    }
     visibleCommands(cmd) {
       const visibleCommands = cmd.commands.filter(cmd => !cmd._hidden);
       const helpCommand = cmd._getHelpCommand();
@@ -255,16 +260,16 @@ function requireHelp() {
       return argument.name();
     }
     longestSubcommandTermLength(cmd, helper) {
-      return helper.visibleCommands(cmd).reduce((max, command) => Math.max(max, helper.subcommandTerm(command).length), 0);
+      return helper.visibleCommands(cmd).reduce((max, command) => Math.max(max, this.displayWidth(helper.styleSubcommandTerm(helper.subcommandTerm(command)))), 0);
     }
     longestOptionTermLength(cmd, helper) {
-      return helper.visibleOptions(cmd).reduce((max, option) => Math.max(max, helper.optionTerm(option).length), 0);
+      return helper.visibleOptions(cmd).reduce((max, option) => Math.max(max, this.displayWidth(helper.styleOptionTerm(helper.optionTerm(option)))), 0);
     }
     longestGlobalOptionTermLength(cmd, helper) {
-      return helper.visibleGlobalOptions(cmd).reduce((max, option) => Math.max(max, helper.optionTerm(option).length), 0);
+      return helper.visibleGlobalOptions(cmd).reduce((max, option) => Math.max(max, this.displayWidth(helper.styleOptionTerm(helper.optionTerm(option)))), 0);
     }
     longestArgumentTermLength(cmd, helper) {
-      return helper.visibleArguments(cmd).reduce((max, argument) => Math.max(max, helper.argumentTerm(argument).length), 0);
+      return helper.visibleArguments(cmd).reduce((max, argument) => Math.max(max, this.displayWidth(helper.styleArgumentTerm(helper.argumentTerm(argument)))), 0);
     }
     commandUsage(cmd) {
       let cmdName = cmd._name;
@@ -301,7 +306,11 @@ function requireHelp() {
         extraInfo.push(`env: ${option.envVar}`);
       }
       if (extraInfo.length > 0) {
-        return `${option.description} (${extraInfo.join(', ')})`;
+        const extraDescription = `(${extraInfo.join(', ')})`;
+        if (option.description) {
+          return `${option.description} ${extraDescription}`;
+        }
+        return extraDescription;
       }
       return option.description;
     }
@@ -314,77 +323,175 @@ function requireHelp() {
         extraInfo.push(`default: ${argument.defaultValueDescription || JSON.stringify(argument.defaultValue)}`);
       }
       if (extraInfo.length > 0) {
-        const extraDescripton = `(${extraInfo.join(', ')})`;
+        const extraDescription = `(${extraInfo.join(', ')})`;
         if (argument.description) {
-          return `${argument.description} ${extraDescripton}`;
+          return `${argument.description} ${extraDescription}`;
         }
-        return extraDescripton;
+        return extraDescription;
       }
       return argument.description;
     }
+    formatItemList(heading, items, helper) {
+      if (items.length === 0) return [];
+      return [ helper.styleTitle(heading), ...items, '' ];
+    }
+    groupItems(unsortedItems, visibleItems, getGroup) {
+      const result = new Map;
+      unsortedItems.forEach(item => {
+        const group = getGroup(item);
+        if (!result.has(group)) result.set(group, []);
+      });
+      visibleItems.forEach(item => {
+        const group = getGroup(item);
+        if (!result.has(group)) {
+          result.set(group, []);
+        }
+        result.get(group).push(item);
+      });
+      return result;
+    }
     formatHelp(cmd, helper) {
       const termWidth = helper.padWidth(cmd, helper);
-      const helpWidth = helper.helpWidth || 80;
-      const itemIndentWidth = 2;
-      const itemSeparatorWidth = 2;
-      function formatItem(term, description) {
-        if (description) {
-          const fullText = `${term.padEnd(termWidth + itemSeparatorWidth)}${description}`;
-          return helper.wrap(fullText, helpWidth - itemIndentWidth, termWidth + itemSeparatorWidth);
-        }
-        return term;
+      const helpWidth = helper.helpWidth ?? 80;
+      function callFormatItem(term, description) {
+        return helper.formatItem(term, termWidth, description, helper);
       }
-      function formatList(textArray) {
-        return textArray.join('\n').replace(/^/gm, ' '.repeat(itemIndentWidth));
-      }
-      let output = [ `Usage: ${helper.commandUsage(cmd)}`, '' ];
+      let output = [ `${helper.styleTitle('Usage:')} ${helper.styleUsage(helper.commandUsage(cmd))}`, '' ];
       const commandDescription = helper.commandDescription(cmd);
       if (commandDescription.length > 0) {
-        output = output.concat([ helper.wrap(commandDescription, helpWidth, 0), '' ]);
-      }
-      const argumentList = helper.visibleArguments(cmd).map(argument => formatItem(helper.argumentTerm(argument), helper.argumentDescription(argument)));
-      if (argumentList.length > 0) {
-        output = output.concat([ 'Arguments:', formatList(argumentList), '' ]);
-      }
-      const optionList = helper.visibleOptions(cmd).map(option => formatItem(helper.optionTerm(option), helper.optionDescription(option)));
-      if (optionList.length > 0) {
-        output = output.concat([ 'Options:', formatList(optionList), '' ]);
-      }
-      if (this.showGlobalOptions) {
-        const globalOptionList = helper.visibleGlobalOptions(cmd).map(option => formatItem(helper.optionTerm(option), helper.optionDescription(option)));
-        if (globalOptionList.length > 0) {
-          output = output.concat([ 'Global Options:', formatList(globalOptionList), '' ]);
-        }
-      }
-      const commandList = helper.visibleCommands(cmd).map(cmd => formatItem(helper.subcommandTerm(cmd), helper.subcommandDescription(cmd)));
-      if (commandList.length > 0) {
-        output = output.concat([ 'Commands:', formatList(commandList), '' ]);
-      }
+        output = output.concat([ helper.boxWrap(helper.styleCommandDescription(commandDescription), helpWidth), '' ]);
+      }
+      const argumentList = helper.visibleArguments(cmd).map(argument => callFormatItem(helper.styleArgumentTerm(helper.argumentTerm(argument)), helper.styleArgumentDescription(helper.argumentDescription(argument))));
+      output = output.concat(this.formatItemList('Arguments:', argumentList, helper));
+      const optionGroups = this.groupItems(cmd.options, helper.visibleOptions(cmd), option => option.helpGroupHeading ?? 'Options:');
+      optionGroups.forEach((options, group) => {
+        const optionList = options.map(option => callFormatItem(helper.styleOptionTerm(helper.optionTerm(option)), helper.styleOptionDescription(helper.optionDescription(option))));
+        output = output.concat(this.formatItemList(group, optionList, helper));
+      });
+      if (helper.showGlobalOptions) {
+        const globalOptionList = helper.visibleGlobalOptions(cmd).map(option => callFormatItem(helper.styleOptionTerm(helper.optionTerm(option)), helper.styleOptionDescription(helper.optionDescription(option))));
+        output = output.concat(this.formatItemList('Global Options:', globalOptionList, helper));
+      }
+      const commandGroups = this.groupItems(cmd.commands, helper.visibleCommands(cmd), sub => sub.helpGroup() || 'Commands:');
+      commandGroups.forEach((commands, group) => {
+        const commandList = commands.map(sub => callFormatItem(helper.styleSubcommandTerm(helper.subcommandTerm(sub)), helper.styleSubcommandDescription(helper.subcommandDescription(sub))));
+        output = output.concat(this.formatItemList(group, commandList, helper));
+      });
       return output.join('\n');
     }
+    displayWidth(str) {
+      return stripColor(str).length;
+    }
+    styleTitle(str) {
+      return str;
+    }
+    styleUsage(str) {
+      return str.split(' ').map(word => {
+        if (word === '[options]') return this.styleOptionText(word);
+        if (word === '[command]') return this.styleSubcommandText(word);
+        if (word[0] === '[' || word[0] === '<') return this.styleArgumentText(word);
+        return this.styleCommandText(word);
+      }).join(' ');
+    }
+    styleCommandDescription(str) {
+      return this.styleDescriptionText(str);
+    }
+    styleOptionDescription(str) {
+      return this.styleDescriptionText(str);
+    }
+    styleSubcommandDescription(str) {
+      return this.styleDescriptionText(str);
+    }
+    styleArgumentDescription(str) {
+      return this.styleDescriptionText(str);
+    }
+    styleDescriptionText(str) {
+      return str;
+    }
+    styleOptionTerm(str) {
+      return this.styleOptionText(str);
+    }
+    styleSubcommandTerm(str) {
+      return str.split(' ').map(word => {
+        if (word === '[options]') return this.styleOptionText(word);
+        if (word[0] === '[' || word[0] === '<') return this.styleArgumentText(word);
+        return this.styleSubcommandText(word);
+      }).join(' ');
+    }
+    styleArgumentTerm(str) {
+      return this.styleArgumentText(str);
+    }
+    styleOptionText(str) {
+      return str;
+    }
+    styleArgumentText(str) {
+      return str;
+    }
+    styleSubcommandText(str) {
+      return str;
+    }
+    styleCommandText(str) {
+      return str;
+    }
     padWidth(cmd, helper) {
       return Math.max(helper.longestOptionTermLength(cmd, helper), helper.longestGlobalOptionTermLength(cmd, helper), helper.longestSubcommandTermLength(cmd, helper), helper.longestArgumentTermLength(cmd, helper));
     }
-    wrap(str, width, indent, minColumnWidth = 40) {
-      const indents = ' \\f\\t\\v   -   　\ufeff';
-      const manualIndent = new RegExp(`[\\n][${indents}]+`);
-      if (str.match(manualIndent)) return str;
-      const columnWidth = width - indent;
-      if (columnWidth < minColumnWidth) return str;
-      const leadingStr = str.slice(0, indent);
-      const columnText = str.slice(indent).replace('\r\n', '\n');
-      const indentString = ' '.repeat(indent);
-      const zeroWidthSpace = '​';
-      const breaks = `\\s${zeroWidthSpace}`;
-      const regex = new RegExp(`\n|.{1,${columnWidth - 1}}([${breaks}]|$)|[^${breaks}]+?([${breaks}]|$)`, 'g');
-      const lines = columnText.match(regex) || [];
-      return leadingStr + lines.map((line, i) => {
-        if (line === '\n') return '';
-        return (i > 0 ? indentString : '') + line.trimEnd();
-      }).join('\n');
+    preformatted(str) {
+      return /\n[^\S\r\n]/.test(str);
+    }
+    formatItem(term, termWidth, description, helper) {
+      const itemIndent = 2;
+      const itemIndentStr = ' '.repeat(itemIndent);
+      if (!description) return itemIndentStr + term;
+      const paddedTerm = term.padEnd(termWidth + term.length - helper.displayWidth(term));
+      const spacerWidth = 2;
+      const helpWidth = this.helpWidth ?? 80;
+      const remainingWidth = helpWidth - termWidth - spacerWidth - itemIndent;
+      let formattedDescription;
+      if (remainingWidth < this.minWidthToWrap || helper.preformatted(description)) {
+        formattedDescription = description;
+      } else {
+        const wrappedDescription = helper.boxWrap(description, remainingWidth);
+        formattedDescription = wrappedDescription.replace(/\n/g, '\n' + ' '.repeat(termWidth + spacerWidth));
+      }
+      return itemIndentStr + paddedTerm + ' '.repeat(spacerWidth) + formattedDescription.replace(/\n/g, `\n${itemIndentStr}`);
+    }
+    boxWrap(str, width) {
+      if (width < this.minWidthToWrap) return str;
+      const rawLines = str.split(/\r\n|\n/);
+      const chunkPattern = /[\s]*[^\s]+/g;
+      const wrappedLines = [];
+      rawLines.forEach(line => {
+        const chunks = line.match(chunkPattern);
+        if (chunks === null) {
+          wrappedLines.push('');
+          return;
+        }
+        let sumChunks = [ chunks.shift() ];
+        let sumWidth = this.displayWidth(sumChunks[0]);
+        chunks.forEach(chunk => {
+          const visibleWidth = this.displayWidth(chunk);
+          if (sumWidth + visibleWidth <= width) {
+            sumChunks.push(chunk);
+            sumWidth += visibleWidth;
+            return;
+          }
+          wrappedLines.push(sumChunks.join(''));
+          const nextChunk = chunk.trimStart();
+          sumChunks = [ nextChunk ];
+          sumWidth = this.displayWidth(nextChunk);
+        });
+        wrappedLines.push(sumChunks.join(''));
+      });
+      return wrappedLines.join('\n');
     }
   }
+  function stripColor(str) {
+    const sgrPattern = /\x1b\[\d*(;\d*)*m/g;
+    return str.replace(sgrPattern, '');
+  }
   help.Help = Help;
+  help.stripColor = stripColor;
   return help;
 }
 
@@ -420,6 +527,7 @@ function requireOption() {
       this.argChoices = undefined;
       this.conflictsWith = [];
       this.implied = undefined;
+      this.helpGroupHeading = undefined;
     }
     default(value, description) {
       this.defaultValue = value;
@@ -460,11 +568,12 @@ function requireOption() {
       this.hidden = !!hide;
       return this;
     }
-    _concatValue(value, previous) {
+    _collectValue(value, previous) {
       if (previous === this.defaultValue || !Array.isArray(previous)) {
         return [ value ];
       }
-      return previous.concat(value);
+      previous.push(value);
+      return previous;
     }
     choices(values) {
       this.argChoices = values.slice();
@@ -473,7 +582,7 @@ function requireOption() {
           throw new InvalidArgumentError(`Allowed choices are ${this.argChoices.join(', ')}.`);
         }
         if (this.variadic) {
-          return this._concatValue(arg, previous);
+          return this._collectValue(arg, previous);
         }
         return arg;
       };
@@ -486,7 +595,14 @@ function requireOption() {
       return this.short.replace(/^-/, '');
     }
     attributeName() {
-      return camelcase(this.name().replace(/^no-/, ''));
+      if (this.negate) {
+        return camelcase(this.name().replace(/^no-/, ''));
+      }
+      return camelcase(this.name());
+    }
+    helpGroup(heading) {
+      this.helpGroupHeading = heading;
+      return this;
     }
     is(arg) {
       return this.short === arg || this.long === arg;
@@ -527,13 +643,25 @@ function requireOption() {
   function splitOptionFlags(flags) {
     let shortFlag;
     let longFlag;
-    const flagParts = flags.split(/[ |,]+/);
-    if (flagParts.length > 1 && !/^[[<]/.test(flagParts[1])) shortFlag = flagParts.shift();
-    longFlag = flagParts.shift();
-    if (!shortFlag && /^-[^-]$/.test(longFlag)) {
+    const shortFlagExp = /^-[^-]$/;
+    const longFlagExp = /^--[^-]/;
+    const flagParts = flags.split(/[ |,]+/).concat('guard');
+    if (shortFlagExp.test(flagParts[0])) shortFlag = flagParts.shift();
+    if (longFlagExp.test(flagParts[0])) longFlag = flagParts.shift();
+    if (!shortFlag && shortFlagExp.test(flagParts[0])) shortFlag = flagParts.shift();
+    if (!shortFlag && longFlagExp.test(flagParts[0])) {
       shortFlag = longFlag;
-      longFlag = undefined;
+      longFlag = flagParts.shift();
+    }
+    if (flagParts[0].startsWith('-')) {
+      const unsupportedFlag = flagParts[0];
+      const baseError = `option creation failed due to '${unsupportedFlag}' in option flags '${flags}'`;
+      if (/^-[^-][^-]/.test(unsupportedFlag)) throw new Error(`${baseError}\n- a short flag is a single dash and a single character\n  - either use a single dash and a single character (for a short flag)\n  - or use a double dash for a long option (and can have two, like '--ws, --workspace')`);
+      if (shortFlagExp.test(unsupportedFlag)) throw new Error(`${baseError}\n- too many short flags`);
+      if (longFlagExp.test(unsupportedFlag)) throw new Error(`${baseError}\n- too many long flags`);
+      throw new Error(`${baseError}\n- unrecognised flag format`);
     }
+    if (shortFlag === undefined && longFlag === undefined) throw new Error(`option creation failed due to no flags found in '${flags}'.`);
     return {
       shortFlag: shortFlag,
       longFlag: longFlag
@@ -630,7 +758,7 @@ function requireCommand() {
   const process = process$1;
   const {Argument: Argument, humanReadableArgName: humanReadableArgName} = requireArgument();
   const {CommanderError: CommanderError} = requireError();
-  const {Help: Help} = requireHelp();
+  const {Help: Help, stripColor: stripColor} = requireHelp();
   const {Option: Option, DualOptions: DualOptions} = requireOption();
   const {suggestSimilar: suggestSimilar} = requireSuggestSimilar();
   class Command extends EventEmitter {
@@ -640,7 +768,7 @@ function requireCommand() {
       this.options = [];
       this.parent = null;
       this._allowUnknownOption = false;
-      this._allowExcessArguments = true;
+      this._allowExcessArguments = false;
       this.registeredArguments = [];
       this._args = this.registeredArguments;
       this.args = [];
@@ -667,18 +795,25 @@ function requireCommand() {
       this._lifeCycleHooks = {};
       this._showHelpAfterError = false;
       this._showSuggestionAfterError = true;
+      this._savedState = null;
       this._outputConfiguration = {
         writeOut: str => process.stdout.write(str),
         writeErr: str => process.stderr.write(str),
+        outputError: (str, write) => write(str),
         getOutHelpWidth: () => process.stdout.isTTY ? process.stdout.columns : undefined,
         getErrHelpWidth: () => process.stderr.isTTY ? process.stderr.columns : undefined,
-        outputError: (str, write) => write(str)
+        getOutHasColors: () => useColor() ?? (process.stdout.isTTY && process.stdout.hasColors?.()),
+        getErrHasColors: () => useColor() ?? (process.stderr.isTTY && process.stderr.hasColors?.()),
+        stripColor: str => stripColor(str)
       };
       this._hidden = false;
       this._helpOption = undefined;
       this._addImplicitHelpCommand = undefined;
       this._helpCommand = undefined;
       this._helpConfiguration = {};
+      this._helpGroupHeading = undefined;
+      this._defaultCommandGroup = undefined;
+      this._defaultOptionGroup = undefined;
     }
     copyInheritedSettings(sourceCommand) {
       this._outputConfiguration = sourceCommand._outputConfiguration;
@@ -738,7 +873,10 @@ function requireCommand() {
     }
     configureOutput(configuration) {
       if (configuration === undefined) return this._outputConfiguration;
-      Object.assign(this._outputConfiguration, configuration);
+      this._outputConfiguration = {
+        ...this._outputConfiguration,
+        ...configuration
+      };
       return this;
     }
     showHelpAfterError(displayHelp = true) {
@@ -765,12 +903,12 @@ function requireCommand() {
     createArgument(name, description) {
       return new Argument(name, description);
     }
-    argument(name, description, fn, defaultValue) {
+    argument(name, description, parseArg, defaultValue) {
       const argument = this.createArgument(name, description);
-      if (typeof fn === 'function') {
-        argument.default(defaultValue).argParser(fn);
+      if (typeof parseArg === 'function') {
+        argument.default(defaultValue).argParser(parseArg);
       } else {
-        argument.default(fn);
+        argument.default(parseArg);
       }
       this.addArgument(argument);
       return this;
@@ -783,7 +921,7 @@ function requireCommand() {
     }
     addArgument(argument) {
       const previousArgument = this.registeredArguments.slice(-1)[0];
-      if (previousArgument && previousArgument.variadic) {
+      if (previousArgument?.variadic) {
         throw new Error(`only the last argument can be variadic '${previousArgument.name()}'`);
       }
       if (argument.required && argument.defaultValue !== undefined && argument.parseArg === undefined) {
@@ -795,10 +933,13 @@ function requireCommand() {
     helpCommand(enableOrNameAndArgs, description) {
       if (typeof enableOrNameAndArgs === 'boolean') {
         this._addImplicitHelpCommand = enableOrNameAndArgs;
+        if (enableOrNameAndArgs && this._defaultCommandGroup) {
+          this._initCommandGroup(this._getHelpCommand());
+        }
         return this;
       }
-      enableOrNameAndArgs = enableOrNameAndArgs ?? 'help [command]';
-      const [, helpName, helpArgs] = enableOrNameAndArgs.match(/([^ ]+) *(.*)/);
+      const nameAndArgs = enableOrNameAndArgs ?? 'help [command]';
+      const [, helpName, helpArgs] = nameAndArgs.match(/([^ ]+) *(.*)/);
       const helpDescription = description ?? 'display help for command';
       const helpCommand = this.createCommand(helpName);
       helpCommand.helpOption(false);
@@ -806,6 +947,7 @@ function requireCommand() {
       if (helpDescription) helpCommand.description(helpDescription);
       this._addImplicitHelpCommand = true;
       this._helpCommand = helpCommand;
+      if (enableOrNameAndArgs || description) this._initCommandGroup(helpCommand);
       return this;
     }
     addHelpCommand(helpCommand, deprecatedDescription) {
@@ -815,6 +957,7 @@ function requireCommand() {
       }
       this._addImplicitHelpCommand = true;
       this._helpCommand = helpCommand;
+      this._initCommandGroup(helpCommand);
       return this;
     }
     _getHelpCommand() {
@@ -895,6 +1038,7 @@ function requireCommand() {
         const matchingFlag = option.long && this._findOption(option.long) ? option.long : option.short;
         throw new Error(`Cannot add option '${option.flags}'${this._name && ` to command '${this._name}'`} due to conflicting flag '${matchingFlag}'\n-  already used by option '${matchingOption.flags}'`);
       }
+      this._initOptionGroup(option);
       this.options.push(option);
     }
     _registerCommand(command) {
@@ -905,6 +1049,7 @@ function requireCommand() {
         const newCmd = knownBy(command).join('|');
         throw new Error(`cannot add command '${newCmd}' as already have command '${existingCmd}'`);
       }
+      this._initCommandGroup(command);
       this.commands.push(command);
     }
     addOption(option) {
@@ -927,7 +1072,7 @@ function requireCommand() {
         if (val !== null && option.parseArg) {
           val = this._callParseArg(option, val, oldValue, invalidValueMessage);
         } else if (val !== null && option.variadic) {
-          val = option._concatValue(val, oldValue);
+          val = option._collectValue(val, oldValue);
         }
         if (val == null) {
           if (option.negate) {
@@ -1097,15 +1242,55 @@ function requireCommand() {
       return userArgs;
     }
     parse(argv, parseOptions) {
+      this._prepareForParse();
       const userArgs = this._prepareUserArgs(argv, parseOptions);
       this._parseCommand([], userArgs);
       return this;
     }
     async parseAsync(argv, parseOptions) {
+      this._prepareForParse();
       const userArgs = this._prepareUserArgs(argv, parseOptions);
       await this._parseCommand([], userArgs);
       return this;
     }
+    _prepareForParse() {
+      if (this._savedState === null) {
+        this.saveStateBeforeParse();
+      } else {
+        this.restoreStateBeforeParse();
+      }
+    }
+    saveStateBeforeParse() {
+      this._savedState = {
+        _name: this._name,
+        _optionValues: {
+          ...this._optionValues
+        },
+        _optionValueSources: {
+          ...this._optionValueSources
+        }
+      };
+    }
+    restoreStateBeforeParse() {
+      if (this._storeOptionsAsProperties) throw new Error(`Can not call parse again when storeOptionsAsProperties is true.\n- either make a new Command for each call to parse, or stop storing options as properties`);
+      this._name = this._savedState._name;
+      this._scriptPath = null;
+      this.rawArgs = [];
+      this._optionValues = {
+        ...this._savedState._optionValues
+      };
+      this._optionValueSources = {
+        ...this._savedState._optionValueSources
+      };
+      this.args = [];
+      this.processedArgs = [];
+    }
+    _checkForMissingExecutable(executableFile, executableDir, subcommandName) {
+      if (fs.existsSync(executableFile)) return;
+      const executableDirMessage = executableDir ? `searched for local subcommand relative to directory '${executableDir}'` : 'no directory for search for local subcommand, use .executableDir() to supply a custom directory';
+      const executableMissing = `'${executableFile}' does not exist\n - if '${subcommandName}' is not meant to be an executable command, remove description parameter from '.command()' and use '.description()' instead\n - if the default executable name is not suitable, use the executableFile option to supply a custom name or path\n - ${executableDirMessage}`;
+      throw new Error(executableMissing);
+    }
     _executeSubCommand(subcommand, args) {
       args = args.slice();
       let launchWithNode = false;
@@ -1126,7 +1311,7 @@ function requireCommand() {
         let resolvedScriptPath;
         try {
           resolvedScriptPath = fs.realpathSync(this._scriptPath);
-        } catch (err) {
+        } catch {
           resolvedScriptPath = this._scriptPath;
         }
         executableDir = path.resolve(path.dirname(resolvedScriptPath), executableDir);
@@ -1156,6 +1341,7 @@ function requireCommand() {
           });
         }
       } else {
+        this._checkForMissingExecutable(executableFile, executableDir, subcommand._name);
         args.unshift(executableFile);
         args = incrementNodeInspectorPort(process.execArgv).concat(args);
         proc = childProcess.spawn(process.execPath, args, {
@@ -1183,9 +1369,7 @@ function requireCommand() {
       });
       proc.on('error', err => {
         if (err.code === 'ENOENT') {
-          const executableDirMessage = executableDir ? `searched for local subcommand relative to directory '${executableDir}'` : 'no directory for search for local subcommand, use .executableDir() to supply a custom directory';
-          const executableMissing = `'${executableFile}' does not exist\n - if '${subcommand._name}' is not meant to be an executable command, remove description parameter from '.command()' and use '.description()' instead\n - if the default executable name is not suitable, use the executableFile option to supply a custom name or path\n - ${executableDirMessage}`;
-          throw new Error(executableMissing);
+          this._checkForMissingExecutable(executableFile, executableDir, subcommand._name);
         } else if (err.code === 'EACCES') {
           throw new Error(`'${executableFile}' not executable`);
         }
@@ -1204,6 +1388,7 @@ function requireCommand() {
       if (!subCommand) this.help({
         error: true
       });
+      subCommand._prepareForParse();
       let promiseChain;
       promiseChain = this._chainOrCallSubCommandHook(promiseChain, subCommand, 'preSubcommand');
       promiseChain = this._chainOrCall(promiseChain, () => {
@@ -1271,7 +1456,7 @@ function requireCommand() {
       this.processedArgs = processedArgs;
     }
     _chainOrCall(promise, fn) {
-      if (promise && promise.then && typeof promise.then === 'function') {
+      if (promise?.then && typeof promise.then === 'function') {
         return promise.then(() => fn());
       }
       return fn();
@@ -1349,7 +1534,7 @@ function requireCommand() {
         promiseChain = this._chainOrCallHooks(promiseChain, 'postAction');
         return promiseChain;
       }
-      if (this.parent && this.parent.listenerCount(commandEvent)) {
+      if (this.parent?.listenerCount(commandEvent)) {
         checkForUnknownOptions();
         this._processArguments();
         this.parent.emit(commandEvent, operands, unknown);
@@ -1412,23 +1597,29 @@ function requireCommand() {
         cmd._checkForConflictingLocalOptions();
       });
     }
-    parseOptions(argv) {
+    parseOptions(args) {
       const operands = [];
       const unknown = [];
       let dest = operands;
-      const args = argv.slice();
       function maybeOption(arg) {
         return arg.length > 1 && arg[0] === '-';
       }
+      const negativeNumberArg = arg => {
+        if (!/^-\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;
-      while (args.length) {
-        const arg = args.shift();
+      let activeGroup = null;
+      let i = 0;
+      while (i < args.length || activeGroup) {
+        const arg = activeGroup ?? args[i++];
+        activeGroup = null;
         if (arg === '--') {
           if (dest === unknown) dest.push(arg);
-          dest.push(...args);
+          dest.push(...args.slice(i));
           break;
         }
-        if (activeVariadicOption && !maybeOption(arg)) {
+        if (activeVariadicOption && (!maybeOption(arg) || negativeNumberArg(arg))) {
           this.emit(`option:${activeVariadicOption.name()}`, arg);
           continue;
         }
@@ -1437,13 +1628,13 @@ function requireCommand() {
           const option = this._findOption(arg);
           if (option) {
             if (option.required) {
-              const value = args.shift();
+              const value = args[i++];
               if (value === undefined) this.optionMissingArgument(option);
               this.emit(`option:${option.name()}`, value);
             } else if (option.optional) {
               let value = null;
-              if (args.length > 0 && !maybeOption(args[0])) {
-                value = args.shift();
+              if (i < args.length && (!maybeOption(args[i]) || negativeNumberArg(args[i]))) {
+                value = args[i++];
               }
               this.emit(`option:${option.name()}`, value);
             } else {
@@ -1460,7 +1651,7 @@ function requireCommand() {
               this.emit(`option:${option.name()}`, arg.slice(2));
             } else {
               this.emit(`option:${option.name()}`);
-              args.unshift(`-${arg.slice(2)}`);
+              activeGroup = `-${arg.slice(2)}`;
             }
             continue;
           }
@@ -1473,27 +1664,24 @@ function requireCommand() {
             continue;
           }
         }
-        if (maybeOption(arg)) {
+        if (dest === operands && maybeOption(arg) && !(this.commands.length === 0 && negativeNumberArg(arg))) {
           dest = unknown;
         }
         if ((this._enablePositionalOptions || this._passThroughOptions) && operands.length === 0 && unknown.length === 0) {
           if (this._findCommand(arg)) {
             operands.push(arg);
-            if (args.length > 0) unknown.push(...args);
+            unknown.push(...args.slice(i));
             break;
           } else if (this._getHelpCommand() && arg === this._getHelpCommand().name()) {
-            operands.push(arg);
-            if (args.length > 0) operands.push(...args);
+            operands.push(arg, ...args.slice(i));
             break;
           } else if (this._defaultCommandName) {
-            unknown.push(arg);
-            if (args.length > 0) unknown.push(...args);
+            unknown.push(arg, ...args.slice(i));
             break;
           }
         }
         if (this._passThroughOptions) {
-          dest.push(arg);
-          if (args.length > 0) dest.push(...args);
+          dest.push(arg, ...args.slice(i));
           break;
         }
         dest.push(arg);
@@ -1704,6 +1892,27 @@ function requireCommand() {
       this._name = str;
       return this;
     }
+    helpGroup(heading) {
+      if (heading === undefined) return this._helpGroupHeading ?? '';
+      this._helpGroupHeading = heading;
+      return this;
+    }
+    commandsGroup(heading) {
+      if (heading === undefined) return this._defaultCommandGroup ?? '';
+      this._defaultCommandGroup = heading;
+      return this;
+    }
+    optionsGroup(heading) {
+      if (heading === undefined) return this._defaultOptionGroup ?? '';
+      this._defaultOptionGroup = heading;
+      return this;
+    }
+    _initOptionGroup(option) {
+      if (this._defaultOptionGroup && !option.helpGroupHeading) option.helpGroup(this._defaultOptionGroup);
+    }
+    _initCommandGroup(cmd) {
+      if (this._defaultCommandGroup && !cmd.helpGroup()) cmd.helpGroup(this._defaultCommandGroup);
+    }
     nameFromFilename(filename) {
       this._name = path.basename(filename, path.extname(filename));
       return this;
@@ -1715,25 +1924,41 @@ function requireCommand() {
     }
     helpInformation(contextOptions) {
       const helper = this.createHelp();
-      if (helper.helpWidth === undefined) {
-        helper.helpWidth = contextOptions && contextOptions.error ? this._outputConfiguration.getErrHelpWidth() : this._outputConfiguration.getOutHelpWidth();
-      }
-      return helper.formatHelp(this, helper);
+      const context = this._getOutputContext(contextOptions);
+      helper.prepareContext({
+        error: context.error,
+        helpWidth: context.helpWidth,
+        outputHasColors: context.hasColors
+      });
+      const text = helper.formatHelp(this, helper);
+      if (context.hasColors) return text;
+      return this._outputConfiguration.stripColor(text);
     }
-    _getHelpContext(contextOptions) {
+    _getOutputContext(contextOptions) {
       contextOptions = contextOptions || {};
-      const context = {
-        error: !!contextOptions.error
-      };
-      let write;
-      if (context.error) {
-        write = arg => this._outputConfiguration.writeErr(arg);
+      const error = !!contextOptions.error;
+      let baseWrite;
+      let hasColors;
+      let helpWidth;
+      if (error) {
+        baseWrite = str => this._outputConfiguration.writeErr(str);
+        hasColors = this._outputConfiguration.getErrHasColors();
+        helpWidth = this._outputConfiguration.getErrHelpWidth();
       } else {
-        write = arg => this._outputConfiguration.writeOut(arg);
+        baseWrite = str => this._outputConfiguration.writeOut(str);
+        hasColors = this._outputConfiguration.getOutHasColors();
+        helpWidth = this._outputConfiguration.getOutHelpWidth();
       }
-      context.write = contextOptions.write || write;
-      context.command = this;
-      return context;
+      const write = str => {
+        if (!hasColors) str = this._outputConfiguration.stripColor(str);
+        return baseWrite(str);
+      };
+      return {
+        error: error,
+        write: write,
+        hasColors: hasColors,
+        helpWidth: helpWidth
+      };
     }
     outputHelp(contextOptions) {
       let deprecatedCallback;
@@ -1741,35 +1966,44 @@ function requireCommand() {
         deprecatedCallback = contextOptions;
         contextOptions = undefined;
       }
-      const context = this._getHelpContext(contextOptions);
-      this._getCommandAndAncestors().reverse().forEach(command => command.emit('beforeAllHelp', context));
-      this.emit('beforeHelp', context);
-      let helpInformation = this.helpInformation(context);
+      const outputContext = this._getOutputContext(contextOptions);
+      const eventContext = {
+        error: outputContext.error,
+        write: outputContext.write,
+        command: this
+      };
+      this._getCommandAndAncestors().reverse().forEach(command => command.emit('beforeAllHelp', eventContext));
+      this.emit('beforeHelp', eventContext);
+      let helpInformation = this.helpInformation({
+        error: outputContext.error
+      });
       if (deprecatedCallback) {
         helpInformation = deprecatedCallback(helpInformation);
         if (typeof helpInformation !== 'string' && !Buffer.isBuffer(helpInformation)) {
           throw new Error('outputHelp callback must return a string or a Buffer');
         }
       }
-      context.write(helpInformation);
+      outputContext.write(helpInformation);
       if (this._getHelpOption()?.long) {
         this.emit(this._getHelpOption().long);
       }
-      this.emit('afterHelp', context);
-      this._getCommandAndAncestors().forEach(command => command.emit('afterAllHelp', context));
+      this.emit('afterHelp', eventContext);
+      this._getCommandAndAncestors().forEach(command => command.emit('afterAllHelp', eventContext));
     }
     helpOption(flags, description) {
       if (typeof flags === 'boolean') {
         if (flags) {
-          this._helpOption = this._helpOption ?? undefined;
+          if (this._helpOption === null) this._helpOption = undefined;
+          if (this._defaultOptionGroup) {
+            this._initOptionGroup(this._getHelpOption());
+          }
         } else {
           this._helpOption = null;
         }
         return this;
       }
-      flags = flags ?? '-h, --help';
-      description = description ?? 'display help for command';
-      this._helpOption = this.createOption(flags, description);
+      this._helpOption = this.createOption(flags ?? '-h, --help', description ?? 'display help for command');
+      if (flags || description) this._initOptionGroup(this._helpOption);
       return this;
     }
     _getHelpOption() {
@@ -1780,11 +2014,12 @@ function requireCommand() {
     }
     addHelpOption(option) {
       this._helpOption = option;
+      this._initOptionGroup(option);
       return this;
     }
     help(contextOptions) {
       this.outputHelp(contextOptions);
-      let exitCode = process.exitCode || 0;
+      let exitCode = Number(process.exitCode ?? 0);
       if (exitCode === 0 && contextOptions && typeof contextOptions !== 'function' && contextOptions.error) {
         exitCode = 1;
       }
@@ -1850,7 +2085,13 @@ function requireCommand() {
       return arg;
     });
   }
+  function useColor() {
+    if (process.env.NO_COLOR || process.env.FORCE_COLOR === '0' || process.env.FORCE_COLOR === 'false') return false;
+    if (process.env.FORCE_COLOR || process.env.CLICOLOR_FORCE !== undefined) return true;
+    return undefined;
+  }
   command.Command = Command;
+  command.useColor = useColor;
   return command;
 }
 
@@ -12728,7 +12969,7 @@ function requireStat() {
     return checkParentPathsSync(src, srcStat, destParent, funcName);
   }
   function areIdentical(srcStat, destStat) {
-    return destStat.ino && destStat.dev && destStat.ino === srcStat.ino && destStat.dev === srcStat.dev;
+    return destStat.ino !== undefined && destStat.dev !== undefined && destStat.ino === srcStat.ino && destStat.dev === srcStat.dev;
   }
   function isSrcSubdir(src, dest) {
     const srcArr = path.resolve(src).split(path.sep).filter(i => i);
@@ -13431,12 +13672,12 @@ function requireUtils() {
   return utils;
 }
 
-var jsonfile_1;
+var jsonfile$1;
 
 var hasRequiredJsonfile$1;
 
 function requireJsonfile$1() {
-  if (hasRequiredJsonfile$1) return jsonfile_1;
+  if (hasRequiredJsonfile$1) return jsonfile$1;
   hasRequiredJsonfile$1 = 1;
   let _fs;
   try {
@@ -13502,14 +13743,13 @@ function requireJsonfile$1() {
     const str = stringify(obj, options);
     return fs.writeFileSync(file, str, options);
   }
-  const jsonfile = {
+  jsonfile$1 = {
     readFile: readFile,
     readFileSync: readFileSync,
     writeFile: writeFile,
     writeFileSync: writeFileSync
   };
-  jsonfile_1 = jsonfile;
-  return jsonfile_1;
+  return jsonfile$1;
 }
 
 var jsonfile;
@@ -16908,6 +17148,8 @@ API.v500 = API.fromSimpleString('5.0.0');
 
 API.v510 = API.fromSimpleString('5.1.0');
 
+API.v520 = API.fromSimpleString('5.2.0');
+
 API.v540 = API.fromSimpleString('5.4.0');
 
 function equals$1(a, b, itemEquals = (a, b) => a === b) {
@@ -20453,30 +20695,41 @@ function provideQuickFix(response, client) {
   }, mainExports$2.CodeActionKind.QuickFix));
 }
 
-function provideRefactors(response, args, features) {
-  if (!response?.body) {
-    return [];
-  }
+var CodeActionKind$1;
+
+(function(CodeActionKind) {
+  CodeActionKind.RefactorMove = 'refactor.move';
+})(CodeActionKind$1 || (CodeActionKind$1 = {}));
+
+function provideRefactors(refactors, args, features) {
   const actions = [];
-  for (const info of response.body) {
-    if (info.inlineable === false) {
-      actions.push(asSelectRefactoring(info, args));
+  for (const refactor of refactors) {
+    if (refactor.inlineable === false) {
+      actions.push(asSelectRefactoring(refactor, args));
     } else {
-      const relevantActions = features.codeActionDisabledSupport ? info.actions : info.actions.filter(action => !action.notApplicableReason);
+      const relevantActions = refactor.actions.filter(action => {
+        if (action.notApplicableReason && !features.codeActionDisabledSupport) {
+          return false;
+        }
+        if (action.isInteractive && (!features.moveToFileCodeActionSupport || action.name !== 'Move to file')) {
+          return false;
+        }
+        return true;
+      });
       for (const action of relevantActions) {
-        actions.push(asApplyRefactoring(action, info, args));
+        actions.push(asApplyRefactoring(action, refactor, args));
       }
     }
   }
   return actions;
 }
 
-function asSelectRefactoring(info, args) {
-  return mainExports$2.CodeAction.create(info.description, mainExports$2.Command.create(info.description, Commands.SELECT_REFACTORING, info, args), mainExports$2.CodeActionKind.Refactor);
+function asSelectRefactoring(refactor, args) {
+  return mainExports$2.CodeAction.create(refactor.description, mainExports$2.Command.create(refactor.description, Commands.SELECT_REFACTORING, refactor, args), mainExports$2.CodeActionKind.Refactor);
 }
 
-function asApplyRefactoring(action, info, args) {
-  const codeAction = mainExports$2.CodeAction.create(action.description, asKind(info));
+function asApplyRefactoring(action, refactor, args) {
+  const codeAction = mainExports$2.CodeAction.create(action.description, asKind(action));
   if (action.notApplicableReason) {
     codeAction.disabled = {
       reason: action.notApplicableReason
@@ -20484,20 +20737,46 @@ function asApplyRefactoring(action, info, args) {
   } else {
     codeAction.command = mainExports$2.Command.create(action.description, Commands.APPLY_REFACTORING, {
       ...args,
-      refactor: info.name,
+      refactor: refactor.name,
       action: action.name
     });
   }
   return codeAction;
 }
 
-function asKind(refactor) {
-  if (refactor.name.startsWith('function_')) {
+function asKind(action) {
+  if (action.kind) {
+    return action.kind;
+  }
+  if (action.name.startsWith('function_')) {
     return `${mainExports$2.CodeActionKind.RefactorExtract}.function`;
-  } else if (refactor.name.startsWith('constant_')) {
+  }
+  if (action.name.startsWith('constant_')) {
     return `${mainExports$2.CodeActionKind.RefactorExtract}.constant`;
-  } else if (refactor.name.startsWith('Move')) {
-    return `${mainExports$2.CodeActionKind.Refactor}.move`;
+  }
+  if (action.name.startsWith('Extract to type alias')) {
+    return `${mainExports$2.CodeActionKind.RefactorExtract}.type`;
+  }
+  if (action.name.startsWith('Extract to interface')) {
+    return `${mainExports$2.CodeActionKind.RefactorExtract}.interface`;
+  }
+  if (action.name.startsWith('Move to file')) {
+    return `${CodeActionKind$1.RefactorMove}.file`;
+  }
+  if (action.name.startsWith('Move to a new file')) {
+    return `${CodeActionKind$1.RefactorMove}.newFile`;
+  }
+  if (action.name.startsWith('Convert namespace import') || action.name.startsWith('Convert named imports')) {
+    return `${mainExports$2.CodeActionKind.RefactorRewrite}.import`;
+  }
+  if (action.name.startsWith('Convert default export') || action.name.startsWith('Convert named export')) {
+    return `${mainExports$2.CodeActionKind.RefactorRewrite}.export`;
+  }
+  if (action.name.startsWith('Convert parameters to destructured object')) {
+    return `${mainExports$2.CodeActionKind.RefactorRewrite}.parameters.toDestructured`;
+  }
+  if (action.name.startsWith('Generate \'get\' and \'set\' accessors')) {
+    return `${mainExports$2.CodeActionKind.RefactorRewrite}.property.generateAccessors`;
   }
   return mainExports$2.CodeActionKind.Refactor;
 }
@@ -21998,85 +22277,31 @@ var libExports = requireLib();
 
 const which = getDefaultExportFromCjs(libExports);
 
-const typeMappings = {
-  directory: 'isDirectory',
-  file: 'isFile'
-};
-
-function checkType(type) {
-  if (Object.hasOwnProperty.call(typeMappings, type)) {
-    return;
-  }
-  throw new Error(`Invalid type specified: ${type}`);
-}
-
-const matchType = (type, stat) => stat[typeMappings[type]]();
-
-const toPath$1 = urlOrPath => urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
+const toPath = urlOrPath => urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
 
-function locatePathSync(paths, {cwd: cwd = process$1.cwd(), type: type = 'file', allowSymlinks: allowSymlinks = true} = {}) {
-  checkType(type);
-  cwd = toPath$1(cwd);
-  const statFunction = allowSymlinks ? fs$2.statSync : fs$2.lstatSync;
-  for (const path_ of paths) {
+function findUpSync(name, {cwd: cwd = process$1.cwd(), type: type = 'file', stopAt: stopAt} = {}) {
+  let directory = path__default.resolve(toPath(cwd) ?? '');
+  const {root: root} = path__default.parse(directory);
+  stopAt = path__default.resolve(directory, toPath(stopAt) ?? root);
+  const isAbsoluteName = path__default.isAbsolute(name);
+  while (directory) {
+    const filePath = isAbsoluteName ? name : path__default.join(directory, name);
     try {
-      const stat = statFunction(path__default.resolve(cwd, path_), {
+      const stats = fs$2.statSync(filePath, {
         throwIfNoEntry: false
       });
-      if (!stat) {
-        continue;
-      }
-      if (matchType(type, stat)) {
-        return path_;
+      if (type === 'file' && stats?.isFile() || type === 'directory' && stats?.isDirectory()) {
+        return filePath;
       }
     } catch {}
-  }
-}
-
-const toPath = urlOrPath => urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
-
-const findUpStop = Symbol('findUpStop');
-
-function findUpMultipleSync(name, options = {}) {
-  let directory = path__default.resolve(toPath(options.cwd) || '');
-  const {root: root} = path__default.parse(directory);
-  const stopAt = options.stopAt || root;
-  const limit = options.limit || Number.POSITIVE_INFINITY;
-  const paths = [ name ].flat();
-  const runMatcher = locateOptions => {
-    {
-      return locatePathSync(paths, locateOptions);
-    }
-  };
-  const matches = [];
-  while (true) {
-    const foundPath = runMatcher({
-      ...options,
-      cwd: directory
-    });
-    if (foundPath === findUpStop) {
-      break;
-    }
-    if (foundPath) {
-      matches.push(path__default.resolve(directory, foundPath));
-    }
-    if (directory === stopAt || matches.length >= limit) {
+    if (directory === stopAt || directory === root) {
       break;
     }
     directory = path__default.dirname(directory);
   }
-  return matches;
-}
-
-function findUpSync(name, options = {}) {
-  const matches = findUpMultipleSync(name, {
-    ...options,
-    limit: 1
-  });
-  return matches[0];
 }
 
-function pkgUpSync({cwd: cwd} = {}) {
+function packageUpSync({cwd: cwd = process$1.cwd()} = {}) {
   return findUpSync('package.json', {
     cwd: cwd
   });
@@ -22203,7 +22428,7 @@ class TypeScriptVersionProvider {
       this.logger.log(`Resolved directory path from a file path: ${resolvedPath}`);
     }
     try {
-      const packageJsonPath = pkgUpSync({
+      const packageJsonPath = packageUpSync({
         cwd: resolvedPath
       });
       this.logger.log(`Resolved package.json location: "${packageJsonPath}"`);
@@ -22287,6 +22512,7 @@ class LspServer {
     }
     this.fileConfigurationManager.mergeTsPreferences(userInitializationOptions.preferences || {});
     this.features.completionDisableFilterText = userInitializationOptions.completionDisableFilterText ?? false;
+    this.features.moveToFileCodeActionSupport = userInitializationOptions.supportsMoveToFileCodeAction && typescriptVersion.version?.gte(API.v520);
     const {textDocument: textDocument} = clientCapabilities;
     if (textDocument) {
       const {codeAction: codeAction, completion: completion, definition: definition, publishDiagnostics: publishDiagnostics} = textDocument;
@@ -22826,11 +23052,11 @@ class LspServer {
     const fileRangeArgs = Range.toFileRangeRequestArgs(document.filepath, params.range);
     const actions = [];
     const kinds = params.context.only?.map(kind => new CodeActionKind(kind));
-    if (!kinds || kinds.some(kind => kind.contains(CodeActionKind.QuickFix))) {
+    if (!kinds || kinds.some(kind => CodeActionKind.QuickFix.contains(kind))) {
       actions.push(...provideQuickFix(await this.getCodeFixes(fileRangeArgs, params.context, token), this.tsClient));
     }
-    if (!kinds || kinds.some(kind => kind.contains(CodeActionKind.Refactor))) {
-      actions.push(...provideRefactors(await this.getRefactors(fileRangeArgs, params.context, token), fileRangeArgs, this.features));
+    if (!kinds || kinds.some(kind => CodeActionKind.Refactor.contains(kind))) {
+      actions.push(...provideRefactors(await this.getRefactors(fileRangeArgs, params.context, this.features, token), fileRangeArgs, this.features));
     }
     for (const kind of kinds || []) {
       for (const command of organizeImportsCommands) {
@@ -22875,14 +23101,19 @@ class LspServer {
     const response = await this.tsClient.execute(CommandTypes.GetCodeFixes, args, token);
     return response.type === 'response' ? response : undefined;
   }
-  async getRefactors(fileRangeArgs, context, token) {
-    const args = {
-      ...fileRangeArgs,
-      triggerReason: context.triggerKind === mainExports$2.CodeActionTriggerKind.Invoked ? 'invoked' : undefined,
-      kind: context.only?.length === 1 ? context.only[0] : undefined
-    };
-    const response = await this.tsClient.execute(CommandTypes.GetApplicableRefactors, args, token);
-    return response.type === 'response' ? response : undefined;
+  async getRefactors(fileRangeArgs, context, features, token) {
+    const kinds = context.only || [ undefined ];
+    const responses = await Promise.all(kinds.map(async kind => {
+      const args = {
+        ...fileRangeArgs,
+        triggerReason: context.triggerKind === mainExports$2.CodeActionTriggerKind.Invoked ? 'invoked' : undefined,
+        kind: kind,
+        includeInteractiveActions: features.moveToFileCodeActionSupport
+      };
+      const response = await this.tsClient.execute(CommandTypes.GetApplicableRefactors, args, token);
+      return response.type === 'response' && response.body ? response.body : [];
+    }));
+    return responses.flat();
   }
   async executeCommand(params, token, workDoneProgress) {
     if (params.command === Commands.APPLY_WORKSPACE_EDIT && params.arguments) {
@@ -22909,6 +23140,9 @@ class LspServer {
         return;
       }
       const {body: body} = response;
+      if (body?.notApplicableReason) {
+        throw new Error(body.notApplicableReason);
+      }
       if (!body?.edits.length) {
         return;
       }