Merge branch 'master' into resolveJsonModule

Author: sheetalkamat

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/convertToNamedParameters.ts renamed to 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),