Merge branch 'master' into resolveJsonModule

src/compiler/diagnosticMessages.json

@@ -4927,7 +4927,7 @@
         "category": "Message",
         "code": 95074
     },
-    "Convert to named parameters": {
+    "Convert parameters to destructured object": {
         "category": "Message",
         "code": 95075
     }

src/compiler/tsbuild.ts

@@ -347,13 +347,13 @@ namespace ts {
         return host;
     }
 
-    export function createSolutionBuilderHost<T extends BuilderProgram = BuilderProgram>(system = sys, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportErrorSummary?: ReportEmitErrorSummary) {
+    export function createSolutionBuilderHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system = sys, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportErrorSummary?: ReportEmitErrorSummary) {
         const host = createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) as SolutionBuilderHost<T>;
         host.reportErrorSummary = reportErrorSummary;
         return host;
     }
 
-    export function createSolutionBuilderWithWatchHost<T extends BuilderProgram = SemanticDiagnosticsBuilderProgram>(system = sys, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter) {
+    export function createSolutionBuilderWithWatchHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system = sys, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter) {
         const host = createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) as SolutionBuilderWithWatchHost<T>;
         const watchHost = createWatchHost(system, reportWatchStatus);
         copyProperties(host, watchHost);

src/compiler/watch.ts

@@ -290,7 +290,7 @@ namespace ts {
     /**
      * Creates the watch compiler host that can be extended with config file or root file names and options host
      */
-    export function createProgramHost<T extends BuilderProgram>(system: System, createProgram: CreateProgram<T> | undefined): ProgramHost<T> {
+    export function createProgramHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system: System, createProgram: CreateProgram<T> | undefined): ProgramHost<T> {
         const getDefaultLibLocation = memoize(() => getDirectoryPath(normalizePath(system.getExecutingFilePath())));
         let host: DirectoryStructureHost = system;
         host; // tslint:disable-line no-unused-expression (TODO: `host` is unused!)

src/harness/fakes.ts

@@ -476,7 +476,9 @@ namespace fakes {
         assertDiagnosticMessages(...expectedDiagnostics: ExpectedDiagnostic[]) {
             const actual = this.diagnostics.slice().map(d => d.messageText as string);
             const expected = expectedDiagnostics.map(expectedDiagnosticToText);
-            assert.deepEqual(actual, expected, "Diagnostic arrays did not match");
+            assert.deepEqual(actual, expected, `Diagnostic arrays did not match:
+Actual: ${JSON.stringify(actual, /*replacer*/ undefined, " ")}
+Expected: ${JSON.stringify(expected, /*replacer*/ undefined, " ")}`);
         }
 
         printDiagnostics(header = "== Diagnostics ==") {

src/services/completions.ts

@@ -703,6 +703,14 @@ namespace ts.Completions {
                     case SyntaxKind.PropertyAccessExpression:
                         propertyAccessToConvert = parent as PropertyAccessExpression;
                         node = propertyAccessToConvert.expression;
+                        if (node.end === contextToken.pos &&
+                            isCallExpression(node) &&
+                            node.getChildCount(sourceFile) &&
+                            last(node.getChildren(sourceFile)).kind !== SyntaxKind.CloseParenToken) {
+                            // This is likely dot from incorrectly parsed call expression and user is starting to write spread
+                            // eg: Math.min(./**/)
+                            return undefined;
+                        }
                         break;
                     case SyntaxKind.QualifiedName:
                         node = (parent as QualifiedName).left;

src/services/findAllReferences.ts

@@ -1196,7 +1196,9 @@ namespace ts.FindAllReferences.Core {
 
         // For `export { foo as bar }`, rename `foo`, but not `bar`.
         if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) {
-            const exportKind = referenceLocation.originalKeywordKind === SyntaxKind.DefaultKeyword ? ExportKind.Default : ExportKind.Named;
+            const isDefaultExport = referenceLocation.originalKeywordKind === SyntaxKind.DefaultKeyword
+                || exportSpecifier.name.originalKeywordKind === SyntaxKind.DefaultKeyword;
+            const exportKind = isDefaultExport ? ExportKind.Default : ExportKind.Named;
             const exportSymbol = Debug.assertDefined(exportSpecifier.symbol);
             const exportInfo = Debug.assertDefined(getExportInfo(exportSymbol, exportKind, state.checker));
             searchForImportsOfExport(referenceLocation, exportSymbol, exportInfo, state);

src/services/importTracker.ts

@@ -269,7 +269,7 @@ namespace ts.FindAllReferences {
         }
 
         /**
-         * `import x = require("./x") or `import * as x from "./x"`.
+         * `import x = require("./x")` or `import * as x from "./x"`.
          * An `export =` may be imported by this syntax, so it may be a direct import.
          * If it's not a direct import, it will be in `indirectUsers`, so we don't have to do anything here.
          */

src/services/refactors/convertParamsToDestructuredObject.ts

@@ -1,6 +1,6 @@
 /* @internal */
-namespace ts.refactor.convertToNamedParameters {
-    const refactorName = "Convert to named parameters";
+namespace ts.refactor.convertParamsToDestructuredObject {
+    const refactorName = "Convert parameters to destructured object";
     const minimumParameterLength = 2;
     registerRefactor(refactorName, { getEditsForAction, getAvailableActions });
 
@@ -12,7 +12,7 @@ namespace ts.refactor.convertToNamedParameters {
         const functionDeclaration = getFunctionDeclarationAtPosition(file, startPosition, context.program.getTypeChecker());
         if (!functionDeclaration) return emptyArray;
 
-        const description = getLocaleSpecificMessage(Diagnostics.Convert_to_named_parameters);
+        const description = getLocaleSpecificMessage(Diagnostics.Convert_parameters_to_destructured_object);
         return [{
             name: refactorName,
             description,

src/services/tsconfig.json

@@ -84,7 +84,7 @@
         "refactors/generateGetAccessorAndSetAccessor.ts",
         "refactors/moveToNewFile.ts",
         "refactors/addOrRemoveBracesToArrowFunction.ts",
-        "refactors/convertToNamedParameters.ts",
+        "refactors/convertParamsToDestructuredObject.ts",
         "services.ts",
         "breakpoints.ts",
         "transform.ts",

src/testRunner/unittests/tsbuild/resolveJsonModule.ts

@@ -1,9 +1,10 @@
 namespace ts {
     describe("unittests:: tsbuild:: with resolveJsonModule option on project resolveJsonModuleAndComposite", () => {
         let projFs: vfs.FileSystem;
+        const { time, tick } = getTime();
         const allExpectedOutputs = ["/src/dist/src/index.js", "/src/dist/src/index.d.ts", "/src/dist/src/hello.json"];
         before(() => {
-            projFs = loadProjectFromDisk("tests/projects/resolveJsonModuleAndComposite");
+            projFs = loadProjectFromDisk("tests/projects/resolveJsonModuleAndComposite", time);
         });
 
         after(() => {
@@ -75,6 +76,7 @@ export default hello.hello`);
             }
             host.clearDiagnostics();
             builder.resetBuildContext();
+            tick();
             builder.buildAllProjects();
             host.assertDiagnosticMessages(
                 getExpectedDiagnosticForProjectsInBuild(configFile),
@@ -99,6 +101,7 @@ export default hello.hello`);
             }
             host.clearDiagnostics();
             builder.resetBuildContext();
+            tick();
             builder.buildAllProjects();
             host.assertDiagnosticMessages(
                 getExpectedDiagnosticForProjectsInBuild(configFile),
@@ -108,9 +111,10 @@ export default hello.hello`);
     });
 
     describe("unittests:: tsbuild:: with resolveJsonModule option on project importJsonFromProjectReference", () => {
+        const { time, tick } = getTime();
         let projFs: vfs.FileSystem;
         before(() => {
-            projFs = loadProjectFromDisk("tests/projects/importJsonFromProjectReference");
+            projFs = loadProjectFromDisk("tests/projects/importJsonFromProjectReference", time);
         });
 
         after(() => {
@@ -136,6 +140,7 @@ export default hello.hello`);
             assert(fs.existsSync(expectedOutput), `Expect file ${expectedOutput} to exist`);
             host.clearDiagnostics();
             builder.resetBuildContext();
+            tick();
             builder.buildAllProjects();
             host.assertDiagnosticMessages(
                 getExpectedDiagnosticForProjectsInBuild(stringsConfigFile, mainConfigFile, configFile),

src/tsc/tsc.ts

@@ -207,9 +207,10 @@ namespace ts {
             reportWatchModeWithoutSysSupport();
         }
 
+        // Use default createProgram
         const buildHost = buildOptions.watch ?
-            createSolutionBuilderWithWatchHost(sys, createEmitAndSemanticDiagnosticsBuilderProgram, reportDiagnostic, createBuilderStatusReporter(sys, shouldBePretty()), createWatchStatusReporter()) :
-            createSolutionBuilderHost(sys, createAbstractBuilder, reportDiagnostic, createBuilderStatusReporter(sys, shouldBePretty()), createReportErrorSummary(buildOptions));
+            createSolutionBuilderWithWatchHost(sys, /*createProgram*/ undefined, reportDiagnostic, createBuilderStatusReporter(sys, shouldBePretty()), createWatchStatusReporter()) :
+            createSolutionBuilderHost(sys, /*createProgram*/ undefined, reportDiagnostic, createBuilderStatusReporter(sys, shouldBePretty()), createReportErrorSummary(buildOptions));
         updateCreateProgram(buildHost);
         buildHost.afterProgramEmitAndDiagnostics = (program: BuilderProgram) => reportStatistics(program.getProgram());
 

tests/cases/fourslash/completionsWritingSpreadArgument.ts

@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////
+//// const [] = [Math.min(./*marker*/)]
+////
+
+goTo.marker("marker");
+verify.completions({ exact: undefined });
+edit.insert(".");
+verify.completions({ exact: undefined });
+edit.insert(".");
+verify.completions({ exact: completion.globals });

tests/cases/fourslash/findAllRefsImportDefault.ts

@@ -0,0 +1,18 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: f.ts
+////export { [|foo|] as [|{| "isWriteAccess": true, "isDefinition": true |}default|] };
+////function /*start*/[|{| "isWriteAccess": true, "isDefinition": true |}foo|](a: number, b: number) {
+////    return a + b;
+////}
+
+// @Filename: b.ts
+////import [|{| "isWriteAccess": true, "isDefinition": true |}bar|] from "./f";
+////[|bar|](1, 2);
+
+verify.noErrors();
+const [ foo0, foo1, foo2, bar0, bar1 ] = test.ranges();
+const fooGroup = { definition: "function foo(a: number, b: number): number", ranges: [foo0, foo2] };
+const exportDefaultGroup = { definition: "(alias) function foo(a: number, b: number): number\nexport default", ranges: [foo1] };
+const barGroup = { definition: "(alias) function bar(a: number, b: number): number\nimport bar", ranges: [bar0, bar1]};
+verify.referenceGroups("start", [fooGroup, exportDefaultGroup, barGroup]);

tests/cases/fourslash/findAllRefsImportNamed.ts

@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: f.ts
+////export { [|foo|] as [|{| "isWriteAccess": true, "isDefinition": true |}foo|] }
+////function /*start*/[|{| "isWriteAccess": true, "isDefinition": true |}foo|](a: number, b: number) { }
+
+// @Filename: b.ts
+////import x = require("./f");
+////x.[|foo|](1, 2);
+
+verify.noErrors();
+const [ foo0, foo1, foo2, foo3 ] = test.ranges();
+const fooGroup = { definition: "function foo(a: number, b: number): void", ranges: [foo0, foo2] };
+const exportFooGroup = { definition: "(alias) function foo(a: number, b: number): void\nexport foo", ranges: [foo1, foo3] };
+verify.referenceGroups("start", [fooGroup, exportFooGroup]);

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_allParamsOptional.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function f({ a, b = "1" }: { a?: number; b?: string; } = {}): string {
     return b;
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_arrowFunction.ts

@@ -5,9 +5,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `const foo = ({ a, b }: { a: number; b: number; }) => { };
 foo({ a: 1, b: 2 });`
 });

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_arrowFunctionWithType.ts

@@ -4,4 +4,4 @@
 ////foo(1, 2);
 
 goTo.select("a", "b");
-verify.not.refactorAvailable("Convert to named parameters");
+verify.not.refactorAvailable("Convert parameters to destructured object");

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_callComments.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function foo({ a, b, rest = [] }: { a: number; b: number; rest?: number[]; }) {
     return a + b;
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_callComments2.ts

@@ -16,9 +16,9 @@
 goTo.select("a", "b");
 /* The expected content is currently wrong. The new argument object has the wrong formatting. */
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function foo({ a, b, rest = [] }: { a: number; b: number; rest?: number[]; }) {
     return a + b;
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_chainedCall.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function foo({ a, b }: { a: number; b: number; }) {
     return { bar: () => a + b };
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_classDeclarationAliasing.ts

@@ -9,9 +9,9 @@
 goTo.select("a", "b");
 // Refactor should not make changes
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class Foo {
     constructor(a: number, b: number) { }
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_classDeclarationGoodUsages.ts

@@ -14,9 +14,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class C {
     static a: number = 2;
     constructor({ a, b }: { a: number; b: number; }) { }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_classExpression.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `const c = class {
     constructor({ a, b = { x: 1 } }: { a: number; b?: { x: number; }; }) { }
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_classExpressionGoodUsages.ts

@@ -10,9 +10,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `const c = class C {
     static a: number = 2;
     constructor({ a, b }: { a: number; b: number; }) { }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_classExpressionHeritage.ts

@@ -12,9 +12,9 @@
 goTo.select("a", "b");
 // Refactor should not make changes
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `const foo = class Foo {
     constructor(a: number, b: number) { }
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_classTypeParameters.ts

@@ -10,9 +10,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class Foo<T> {
     bar({ t, s }: { t: T; s: T; }) {
         return s;

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_constructor.ts

@@ -12,9 +12,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class Foo {
     t: string;
     s: string;

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_defaultClass.ts

@@ -5,4 +5,4 @@
 ////}
 
 goTo.select("a", "b");
-verify.not.refactorAvailable("Convert to named parameters");
+verify.not.refactorAvailable("Convert parameters to destructured object");

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_function.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function f({ a, b }: { a: number; b: string; }): string {
     return b;
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_functionComments.ts

@@ -10,9 +10,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `foo({ a: 1, b: 2 }); /**a*/
 /**b*/ function foo(/**this1*/ this /**this2*/: /**void1*/ void /**void2*/, { a, b = /**k*/ 1 /**l*/ }: { /**c*/ a /**d*/: /**e*/ number /**f*/; /**g*/ b /**h*/?: /**i*/ number /**j*/; }) {
     // m

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_functionComments1.ts

@@ -6,9 +6,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function foo({ a, b }: { a: number /** a */; b: number /** b */; }) {
     return a + b;
 }`

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_functionComments2.ts

@@ -11,9 +11,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function foo(// comment
 { a, b }: {
     // a comment

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_functionExpression.ts

@@ -5,9 +5,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `const foo = function({ a, b }: { a: number; b: number; }) { };
 foo({ a: 1, b: 2 });`
 });

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_functionTypeParameters.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function foo<T, S>({ t, s }: { t: T; s: S; }) {
     return s;
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_inheritedConstructor.ts

@@ -12,9 +12,9 @@ goTo.select("a", "b");
     `new Bar("a", "b")` should be modified by the refactor to be `new Bar({ t: "a", s: "b" })`
 */
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class Foo {
     constructor({ t, s }: { t: string; s: string; }) { }
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_inheritedMethod.ts

@@ -11,9 +11,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class Foo {
     bar({ t, s }: { t: string; s: string; }): string {
         return s + t;

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_initializer.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function f({ a, b = "1" }: { a: number; b?: string; }): string {
     return b;
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_initializerInference.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function f({ a, b = { x: 1, z: { s: true } } }: { a: number; b?: { x: number; z: { s: boolean; }; }; }) {
     return b;
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_method.ts

@@ -10,9 +10,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class Foo {
     bar({ t, s }: { t: string; s: string; }): string {
         return s + t;

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_methodCallUnion.ts

@@ -14,9 +14,9 @@
 goTo.select("a", "b");
 // Refactor should not make changes
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class A {
     foo(a: number, b: number) { return a + b; }
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_methodCalls.ts

@@ -11,9 +11,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class Foo {
     bar({ t, s }: { t: string; s: string; }): string {
         return s + t;

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_methodOverrides.ts

@@ -13,9 +13,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class A {
     foo(a: number, b: number) { }
 }
@@ -29,9 +29,9 @@ b.foo(5, 6);`
 });
 goTo.select("c", "d");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class A {
     foo(a: number, b: number) { }
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_overloads.ts

@@ -7,4 +7,4 @@
 ////f(2);
 
 goTo.select("a", "b");
-verify.not.refactorAvailable("Convert to named parameters");
+verify.not.refactorAvailable("Convert parameters to destructured object");

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_paramDecorator.ts

@@ -8,4 +8,4 @@
 ////}
 
 goTo.select("a", "b");
-verify.not.refactorAvailable("Convert to named parameters");
+verify.not.refactorAvailable("Convert parameters to destructured object");

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_recursiveFunction.ts

@@ -9,9 +9,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `const f = function foo({ a, b }: { a: number; b: number; }) {
     foo({ a: 1, b: 2 });
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_restParamInference.ts

@@ -6,9 +6,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function log({ a, b, args = [] }: { a: number; b: number; args?: any[]; }) { }
 let l = log({ a: -1, b: -2, args: [3, 4, 5] });
 let k = log({ a: 1, b: 2 });`

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_staticMethod.ts

@@ -9,9 +9,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class Foo {
     static bar({ t, s }: { t: string; s: string; }): string {
         return s + t;

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_superCall.ts

@@ -11,9 +11,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `class A { 
     constructor({ a, b }: { a: string; b: string; }) { }
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_thisParam.ts

@@ -7,9 +7,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function foo(this: void, { t, s }: { t: string; s: string; }) {
     return s;
 }

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_typedRestParam.ts

@@ -6,9 +6,9 @@
 
 goTo.select("a", "b");
 edit.applyRefactor({
-    refactorName: "Convert to named parameters",
-    actionName: "Convert to named parameters",
-    actionDescription: "Convert to named parameters",
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
     newContent: `function buildName({ firstName, middleName, restOfName = [] }: { firstName: string; middleName?: string; restOfName?: string[]; }) { }
 let employeeName = buildName({ firstName: "Joseph", middleName: "Samuel", restOfName: ["Lucas", "MacKinzie"] });
 let myName = buildName({ firstName: "Joseph" });`

tests/cases/fourslash/refactorConvertParamsToDestructuredObject_varArrowFunction.ts

@@ -4,4 +4,4 @@
 ////foo(1, 2);
 
 goTo.select("a", "b");
-verify.not.refactorAvailable("Convert to named parameters");
+verify.not.refactorAvailable("Convert parameters to destructured object");