Merge pull request #596 from microsoft/main

GulajavaMinistudio · web-flow · commit 18a4c5bb33a9 · 2024-10-08T16:30:35.000+07:00
Create a new pull request by comparing changes across two branches
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -7058,7 +7058,7 @@
         "category": "Error",
         "code": 9023
     },
-    "Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.": {
+    "Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.": {
         "category": "Error",
         "code": 9025
     },
diff --git a/src/compiler/transformers/declarations/diagnostics.ts b/src/compiler/transformers/declarations/diagnostics.ts
@@ -772,7 +772,7 @@ export function createGetIsolatedDeclarationErrors(resolver: EmitResolver): (nod
             return createExpressionError(node.initializer);
         }
         const message = addUndefined ?
-            Diagnostics.Declaration_emit_for_this_parameter_requires_implicitly_adding_undefined_to_it_s_type_This_is_not_supported_with_isolatedDeclarations :
+            Diagnostics.Declaration_emit_for_this_parameter_requires_implicitly_adding_undefined_to_its_type_This_is_not_supported_with_isolatedDeclarations :
             errorByDeclarationKind[node.kind];
         const diag = createDiagnosticForNode(node, message);
         const targetStr = getTextOfNode(node.name, /*includeTrivia*/ false);
diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts
@@ -3069,7 +3069,7 @@ export class TestState {
     private verifyFileContent(fileName: string, text: string) {
         const actual = this.getFileContent(fileName);
         if (actual !== text) {
-            throw new Error(`verifyFileContent failed:\n${showTextDiff(text, actual)}`);
+            throw new Error(`verifyFileContent in file '${fileName}' failed:\n${showTextDiff(text, actual)}`);
         }
     }
 
@@ -3404,10 +3404,11 @@ export class TestState {
         return ts.first(ranges);
     }
 
-    private verifyTextMatches(actualText: string, includeWhitespace: boolean, expectedText: string) {
+    private verifyTextMatches(actualText: string, includeWhitespace: boolean, expectedText: string, fileName?: string) {
         const removeWhitespace = (s: string): string => includeWhitespace ? s : this.removeWhitespace(s);
         if (removeWhitespace(actualText) !== removeWhitespace(expectedText)) {
-            this.raiseError(`Actual range text doesn't match expected text.\n${showTextDiff(expectedText, actualText)}`);
+            const addFileName = fileName ? ` in file '${fileName}'` : "";
+            this.raiseError(`Actual range text${addFileName} doesn't match expected text.\n${showTextDiff(expectedText, actualText)}`);
         }
     }
 
@@ -3485,7 +3486,7 @@ export class TestState {
             const newText = ts.textChanges.applyChanges(this.getFileContent(this.activeFile.fileName), change.textChanges);
             const newRange = updateTextRangeForTextChanges(this.getOnlyRange(this.activeFile.fileName), change.textChanges);
             const actualText = newText.slice(newRange.pos, newRange.end);
-            this.verifyTextMatches(actualText, /*includeWhitespace*/ true, newRangeContent);
+            this.verifyTextMatches(actualText, /*includeWhitespace*/ true, newRangeContent, change.fileName);
         }
         else {
             if (newFileContent === undefined) throw ts.Debug.fail();
@@ -3497,7 +3498,7 @@ export class TestState {
                 }
                 const oldText = this.tryGetFileContent(change.fileName);
                 const newContent = change.isNewFile ? ts.first(change.textChanges).newText : ts.textChanges.applyChanges(oldText!, change.textChanges);
-                this.verifyTextMatches(newContent, /*includeWhitespace*/ true, expectedNewContent);
+                this.verifyTextMatches(newContent, /*includeWhitespace*/ true, expectedNewContent, change.fileName);
             }
             for (const newFileName in newFileContent) {
                 ts.Debug.assert(changes.some(c => c.fileName === newFileName), "No change in file", () => newFileName);
diff --git a/src/lib/es2024.sharedmemory.d.ts b/src/lib/es2024.sharedmemory.d.ts
@@ -28,7 +28,7 @@ interface SharedArrayBuffer {
      *
      * [MDN](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer/growable)
      */
-    get growable(): number;
+    get growable(): boolean;
 
     /**
      * If this SharedArrayBuffer is growable, returns the maximum byte length given during construction; returns the byte length if not.
diff --git a/src/services/codefixes/fixMissingTypeAnnotationOnExports.ts b/src/services/codefixes/fixMissingTypeAnnotationOnExports.ts
@@ -135,7 +135,7 @@ const errorCodes = [
     Diagnostics.Default_exports_can_t_be_inferred_with_isolatedDeclarations.code,
     Diagnostics.Only_const_arrays_can_be_inferred_with_isolatedDeclarations.code,
     Diagnostics.Assigning_properties_to_functions_without_declaring_them_is_not_supported_with_isolatedDeclarations_Add_an_explicit_declaration_for_the_properties_assigned_to_this_function.code,
-    Diagnostics.Declaration_emit_for_this_parameter_requires_implicitly_adding_undefined_to_it_s_type_This_is_not_supported_with_isolatedDeclarations.code,
+    Diagnostics.Declaration_emit_for_this_parameter_requires_implicitly_adding_undefined_to_its_type_This_is_not_supported_with_isolatedDeclarations.code,
     Diagnostics.Type_containing_private_name_0_can_t_be_used_with_isolatedDeclarations.code,
     Diagnostics.Add_satisfies_and_a_type_assertion_to_this_expression_satisfies_T_as_T_to_make_the_type_explicit.code,
 ];
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
@@ -760,6 +760,7 @@ function isSynthesized(node: Node) {
 // We want to merge own children like `I` in in `module A { interface I {} } module A { interface I {} }`
 // We don't want to merge unrelated children like `m` in `const o = { a: { m() {} }, b: { m() {} } };`
 function isOwnChild(n: Node, parent: NavigationBarNode): boolean {
+    if (n.parent === undefined) return false;
     const par = isModuleBlock(n.parent) ? n.parent.parent : n.parent;
     return par === parent.node || contains(parent.additionalNodes, par);
 }
diff --git a/src/typingsInstaller/nodeTypingsInstaller.ts b/src/typingsInstaller/nodeTypingsInstaller.ts
@@ -1,4 +1,4 @@
-import { execFileSync } from "child_process";
+import { execSync } from "child_process";
 import * as fs from "fs";
 import * as path from "path";
 
@@ -172,7 +172,7 @@ class NodeTypingsInstaller extends ts.server.typingsInstaller.TypingsInstaller {
             this.log.writeLine(`Exec: ${command}`);
         }
         try {
-            const stdout = execFileSync(command, { ...options, encoding: "utf-8" });
+            const stdout = execSync(command, { ...options, encoding: "utf-8" });
             if (this.log.isEnabled()) {
                 this.log.writeLine(`    Succeeded. stdout:${indent(sys.newLine, stdout)}`);
             }
diff --git a/tests/baselines/reference/transpile/declarationFunctionDeclarations.d.ts b/tests/baselines/reference/transpile/declarationFunctionDeclarations.d.ts
@@ -125,15 +125,15 @@ export {};
 
 
 //// [Diagnostics reported]
-fnDecl.ts(12,27): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
-fnDecl.ts(16,36): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
-fnDecl.ts(20,26): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
-fnDecl.ts(24,56): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
-fnDecl.ts(28,46): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
-fnDecl.ts(32,45): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
-fnDecl.ts(37,47): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
-fnDecl.ts(41,37): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
-fnDecl.ts(45,35): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(12,27): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(16,36): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(20,26): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(24,56): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(28,46): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(32,45): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(37,47): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(41,37): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
+fnDecl.ts(45,35): error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 
 
 ==== fnDecl.ts (9 errors) ====
@@ -150,64 +150,64 @@ fnDecl.ts(45,35): error TS9025: Declaration emit for this parameter requires imp
     export function fnDeclHasUndefined(p: T | undefined = [], rParam: string): void { };
     export function fnDeclBad(p: T = [], rParam: string): void { };
                               ~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:12:27: Add a type annotation to the parameter p.
     
     export const fnExprOk1 = function (array: number[] = [], rParam: string): void { };
     export const fnExprOk2 = function (array: T | undefined = [], rParam: string): void { };
     export const fnExprBad = function (array: T = [], rParam: string): void { };
                                        ~~~~~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:16:36: Add a type annotation to the parameter array.
     
     export const arrowOk1 = (array: number[] = [], rParam: string): void => { };
     export const arrowOk2 = (array: T | undefined = [], rParam: string): void => { };
     export const arrowBad = (array: T = [], rParam: string): void => { };
                              ~~~~~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:20:26: Add a type annotation to the parameter array.
     
     export const inObjectLiteralFnExprOk1 = { o: function (array: number[] = [], rParam: string): void { } };
     export const inObjectLiteralFnExprOk2 = { o: function (array: T | undefined = [], rParam: string): void { } };
     export const inObjectLiteralFnExprBad = { o: function (array: T = [], rParam: string): void { } };
                                                            ~~~~~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:24:56: Add a type annotation to the parameter array.
     
     export const inObjectLiteralArrowOk1 = { o: (array: number[] = [], rParam: string): void => { } };
     export const inObjectLiteralArrowOk2 = { o: (array: T | undefined = [], rParam: string): void => { } };
     export const inObjectLiteralArrowBad = { o: (array: T = [], rParam: string): void => { } };
                                                  ~~~~~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:28:46: Add a type annotation to the parameter array.
     
     export const inObjectLiteralMethodOk1 = { o(array: number[] = [], rParam: string): void { } };
     export const inObjectLiteralMethodOk2 = { o(array: T | undefined = [], rParam: string): void { } };
     export const inObjectLiteralMethodBad = { o(array: T = [], rParam: string): void { } };
                                                 ~~~~~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:32:45: Add a type annotation to the parameter array.
     
     
     export class InClassFnExprOk1 { o = function (array: number[] = [], rParam: string): void { } };
     export class InClassFnExprOk2 { o = function (array: T | undefined = [], rParam: string): void { } };
     export class InClassFnExprBad { o = function (array: T = [], rParam: string): void { } };
                                                   ~~~~~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:37:47: Add a type annotation to the parameter array.
     
     export class InClassArrowOk1 { o = (array: number[] = [], rParam: string): void => { } };
     export class InClassArrowOk2 { o = (array: T | undefined = [], rParam: string): void => { } };
     export class InClassArrowBad { o = (array: T = [], rParam: string): void => { } };
                                         ~~~~~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:41:37: Add a type annotation to the parameter array.
     
     export class InClassMethodOk1 { o(array: number[] = [], rParam: string): void { } };
     export class InClassMethodOk2 { o(array: T | undefined = [], rParam: string): void { } };
     export class InClassMethodBad { o(array: T = [], rParam: string): void { } };
                                       ~~~~~~~~~~~~~
-!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to it's type. This is not supported with --isolatedDeclarations.
+!!! error TS9025: Declaration emit for this parameter requires implicitly adding undefined to its type. This is not supported with --isolatedDeclarations.
 !!! related TS9028 fnDecl.ts:45:35: Add a type annotation to the parameter array.
     
     
diff --git a/tests/cases/fourslash/navigationBarItemsClass6.ts b/tests/cases/fourslash/navigationBarItemsClass6.ts
@@ -0,0 +1,31 @@
+/// <reference path="fourslash.ts"/>
+
+////function Z() { }
+////
+////Z.foo = 42
+////
+////class Z { }
+
+verify.navigationTree({
+  text: "<global>",
+  kind: "script",
+  childItems: [
+    {
+      text: "Z",
+      kind: "class",
+      childItems: [
+        {
+          text: "constructor",
+          kind: "constructor"
+        },
+        {
+          text: "foo"
+        }
+      ]
+    },
+    {
+      text: "Z",
+      kind: "class"
+    }
+  ]
+});

Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ export function createGetIsolatedDeclarationErrors(resolver: EmitResolver): (nod`
`772`	`772`	`return createExpressionError(node.initializer);`
`773`	`773`	`}`
`774`	`774`	`const message = addUndefined ?`
`775`		`- Diagnostics.Declaration_emit_for_this_parameter_requires_implicitly_adding_undefined_to_it_s_type_This_is_not_supported_with_isolatedDeclarations :`
	`775`	`+ Diagnostics.Declaration_emit_for_this_parameter_requires_implicitly_adding_undefined_to_its_type_This_is_not_supported_with_isolatedDeclarations :`
`776`	`776`	`errorByDeclarationKind[node.kind];`
`777`	`777`	`const diag = createDiagnosticForNode(node, message);`
`778`	`778`	`const targetStr = getTextOfNode(node.name, /includeTrivia/ false);`
Original file line number	Diff line number	Diff line change
`@@ -3069,7 +3069,7 @@ export class TestState {`
`3069`	`3069`	`private verifyFileContent(fileName: string, text: string) {`
`3070`	`3070`	`const actual = this.getFileContent(fileName);`
`3071`	`3071`	`if (actual !== text) {`
`3072`		- throw new Error(`verifyFileContent failed:\n${showTextDiff(text, actual)}`);
	`3072`	+ throw new Error(`verifyFileContent in file '${fileName}' failed:\n${showTextDiff(text, actual)}`);
`3073`	`3073`	`}`
`3074`	`3074`	`}`
`3075`	`3075`
`@@ -3404,10 +3404,11 @@ export class TestState {`
`3404`	`3404`	`return ts.first(ranges);`
`3405`	`3405`	`}`
`3406`	`3406`
`3407`		`- private verifyTextMatches(actualText: string, includeWhitespace: boolean, expectedText: string) {`
	`3407`	`+ private verifyTextMatches(actualText: string, includeWhitespace: boolean, expectedText: string, fileName?: string) {`
`3408`	`3408`	`const removeWhitespace = (s: string): string => includeWhitespace ? s : this.removeWhitespace(s);`
`3409`	`3409`	`if (removeWhitespace(actualText) !== removeWhitespace(expectedText)) {`
`3410`		- this.raiseError(`Actual range text doesn't match expected text.\n${showTextDiff(expectedText, actualText)}`);
	`3410`	+ const addFileName = fileName ? ` in file '${fileName}'` : "";
	`3411`	+ this.raiseError(`Actual range text${addFileName} doesn't match expected text.\n${showTextDiff(expectedText, actualText)}`);
`3411`	`3412`	`}`
`3412`	`3413`	`}`
`3413`	`3414`
`@@ -3485,7 +3486,7 @@ export class TestState {`
`3485`	`3486`	`const newText = ts.textChanges.applyChanges(this.getFileContent(this.activeFile.fileName), change.textChanges);`
`3486`	`3487`	`const newRange = updateTextRangeForTextChanges(this.getOnlyRange(this.activeFile.fileName), change.textChanges);`
`3487`	`3488`	`const actualText = newText.slice(newRange.pos, newRange.end);`
`3488`		`- this.verifyTextMatches(actualText, /includeWhitespace/ true, newRangeContent);`
	`3489`	`+ this.verifyTextMatches(actualText, /includeWhitespace/ true, newRangeContent, change.fileName);`
`3489`	`3490`	`}`
`3490`	`3491`	`else {`
`3491`	`3492`	`if (newFileContent === undefined) throw ts.Debug.fail();`
`@@ -3497,7 +3498,7 @@ export class TestState {`
`3497`	`3498`	`}`
`3498`	`3499`	`const oldText = this.tryGetFileContent(change.fileName);`
`3499`	`3500`	`const newContent = change.isNewFile ? ts.first(change.textChanges).newText : ts.textChanges.applyChanges(oldText!, change.textChanges);`
`3500`		`- this.verifyTextMatches(newContent, /includeWhitespace/ true, expectedNewContent);`
	`3501`	`+ this.verifyTextMatches(newContent, /includeWhitespace/ true, expectedNewContent, change.fileName);`
`3501`	`3502`	`}`
`3502`	`3503`	`for (const newFileName in newFileContent) {`
`3503`	`3504`	`ts.Debug.assert(changes.some(c => c.fileName === newFileName), "No change in file", () => newFileName);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ interface SharedArrayBuffer {`
`28`	`28`	`*`
`29`	`29`	`* [MDN](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer/growable)`
`30`	`30`	`*/`
`31`		`- get growable(): number;`
	`31`	`+ get growable(): boolean;`
`32`	`32`
`33`	`33`	`/**`
`34`	`34`	`* If this SharedArrayBuffer is growable, returns the maximum byte length given during construction; returns the byte length if not.`
Original file line number	Diff line number	Diff line change
`@@ -760,6 +760,7 @@ function isSynthesized(node: Node) {`
`760`	`760`	// We want to merge own children like `I` in in `module A { interface I {} } module A { interface I {} }`
`761`	`761`	// We don't want to merge unrelated children like `m` in `const o = { a: { m() {} }, b: { m() {} } };`
`762`	`762`	`function isOwnChild(n: Node, parent: NavigationBarNode): boolean {`
	`763`	`+ if (n.parent === undefined) return false;`
`763`	`764`	`const par = isModuleBlock(n.parent) ? n.parent.parent : n.parent;`
`764`	`765`	`return par === parent.node \|\| contains(parent.additionalNodes, par);`
`765`	`766`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { execFileSync } from "child_process";`
	`1`	`+import { execSync } from "child_process";`
`2`	`2`	`import * as fs from "fs";`
`3`	`3`	`import * as path from "path";`
`4`	`4`
`@@ -172,7 +172,7 @@ class NodeTypingsInstaller extends ts.server.typingsInstaller.TypingsInstaller {`
`172`	`172`	this.log.writeLine(`Exec: ${command}`);
`173`	`173`	`}`
`174`	`174`	`try {`
`175`		`- const stdout = execFileSync(command, { ...options, encoding: "utf-8" });`
	`175`	`+ const stdout = execSync(command, { ...options, encoding: "utf-8" });`
`176`	`176`	`if (this.log.isEnabled()) {`
`177`	`177`	this.log.writeLine(` Succeeded. stdout:${indent(sys.newLine, stdout)}`);
`178`	`178`	`}`