Merge branch 'master' of https://github.com/Microsoft/TypeScript into feature/36048

Author: a-tarasyuk

src/compiler/checker.ts

@@ -24886,7 +24886,7 @@ namespace ts {
                 }
             }
 
-            return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
+            return getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
 
             function chooseOverload(candidates: Signature[], relation: Map<RelationComparisonResult>, signatureHelpTrailingComma = false) {
                 candidatesForArgumentError = undefined;

src/compiler/parser.ts

@@ -7017,10 +7017,12 @@ namespace ts {
                         comments.push(text);
                         indent += text.length;
                     }
-                    if (initialMargin) {
+                    if (initialMargin !== undefined) {
                         // jump straight to saving comments if there is some initial indentation
-                        pushComment(initialMargin);
-                        state = JSDocState.SavingComments;
+                        if (initialMargin !== "") {
+                            pushComment(initialMargin);
+                        }
+                        state = JSDocState.SawAsterisk;
                     }
                     let tok = token() as JSDocSyntaxKind;
                     loop: while (true) {
@@ -7558,7 +7560,7 @@ namespace ts {
                         const typeParameter = <TypeParameterDeclaration>createNode(SyntaxKind.TypeParameter);
                         typeParameter.name = parseJSDocIdentifierName(Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
                         finishNode(typeParameter);
-                        skipWhitespace();
+                        skipWhitespaceOrAsterisk();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(SyntaxKind.CommaToken));
 

src/testRunner/externalCompileRunner.ts

@@ -58,9 +58,11 @@ namespace Harness {
                         if (!fs.existsSync(submoduleDir)) {
                             exec("git", ["clone", config.cloneUrl, directoryName], { cwd });
                         }
-                        exec("git", ["reset", "HEAD", "--hard"], { cwd: submoduleDir });
-                        exec("git", ["clean", "-f"], { cwd: submoduleDir });
-                        exec("git", ["pull", "-f"], { cwd: submoduleDir });
+                        else {
+                            exec("git", ["reset", "HEAD", "--hard"], { cwd: submoduleDir });
+                            exec("git", ["clean", "-f"], { cwd: submoduleDir });
+                            exec("git", ["pull", "-f"], { cwd: submoduleDir });
+                        }
 
                         types = config.types;
 
@@ -337,4 +339,4 @@ ${stderr.replace(/\r\n/g, "\n")}`;
         }
         return result;
     }
-}
+}

tests/baselines/reference/argumentExpressionContextualTyping.types

@@ -122,7 +122,7 @@ baz(array);                          // Error
 baz(["string", 1, true, ...array]);  // Error
 >baz(["string", 1, true, ...array]) : void
 >baz : (x: [string, number, boolean]) => void
->["string", 1, true, ...array] : (string | number | boolean)[]
+>["string", 1, true, ...array] : [string, number, true, ...(string | number | boolean)[]]
 >"string" : "string"
 >1 : 1
 >true : true

tests/baselines/reference/arrayAssignmentTest3.types

@@ -17,8 +17,8 @@ class a {
 
 
 var xx = new a(null, 7, new B());
->xx : any
->new a(null, 7, new B()) : any
+>xx : a
+>new a(null, 7, new B()) : a
 >a : typeof a
 >null : null
 >7 : 7

tests/baselines/reference/baseCheck.errors.txt

@@ -1,15 +1,13 @@
 tests/cases/compiler/baseCheck.ts(9,18): error TS2552: Cannot find name 'loc'. Did you mean 'ELoc'?
 tests/cases/compiler/baseCheck.ts(17,53): error TS2554: Expected 2 arguments, but got 1.
-tests/cases/compiler/baseCheck.ts(17,59): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/baseCheck.ts(18,62): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/baseCheck.ts(19,59): error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
-tests/cases/compiler/baseCheck.ts(19,68): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 tests/cases/compiler/baseCheck.ts(22,9): error TS2304: Cannot find name 'x'.
 tests/cases/compiler/baseCheck.ts(23,7): error TS2304: Cannot find name 'x'.
 tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'.
 
 
-==== tests/cases/compiler/baseCheck.ts (9 errors) ====
+==== tests/cases/compiler/baseCheck.ts (7 errors) ====
     class C { constructor(x: number, y: number) { } }
     class ELoc extends C {
         constructor(x: number) {
@@ -33,16 +31,12 @@ tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'.
                                                         ~~~~~~~~~~~~~
 !!! error TS2554: Expected 2 arguments, but got 1.
 !!! related TS6210 tests/cases/compiler/baseCheck.ts:1:34: An argument for 'y' was not provided.
-                                                              ~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
     class E extends C { constructor(public z: number) { super(0, this.z) } }
                                                                  ~~~~
 !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
     class F extends C { constructor(public z: number) { super("hello", this.z) } } // first param type
                                                               ~~~~~~~
 !!! error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
-                                                                       ~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
 
     function f() {
         if (x<10) {

tests/baselines/reference/bigintWithLib.types

@@ -94,9 +94,9 @@ bigIntArray = new BigInt64Array([1n, 2n, 3n]);
 >3n : 3n
 
 bigIntArray = new BigInt64Array([1, 2, 3]); // should error
->bigIntArray = new BigInt64Array([1, 2, 3]) : any
+>bigIntArray = new BigInt64Array([1, 2, 3]) : BigInt64Array
 >bigIntArray : BigInt64Array
->new BigInt64Array([1, 2, 3]) : any
+>new BigInt64Array([1, 2, 3]) : BigInt64Array
 >BigInt64Array : BigInt64ArrayConstructor
 >[1, 2, 3] : number[]
 >1 : 1
@@ -174,9 +174,9 @@ bigUintArray = new BigUint64Array([1n, 2n, 3n]);
 >3n : 3n
 
 bigUintArray = new BigUint64Array([1, 2, 3]); // should error
->bigUintArray = new BigUint64Array([1, 2, 3]) : any
+>bigUintArray = new BigUint64Array([1, 2, 3]) : BigUint64Array
 >bigUintArray : BigUint64Array
->new BigUint64Array([1, 2, 3]) : any
+>new BigUint64Array([1, 2, 3]) : BigUint64Array
 >BigUint64Array : BigUint64ArrayConstructor
 >[1, 2, 3] : number[]
 >1 : 1

tests/baselines/reference/bigintWithoutLib.types

@@ -56,7 +56,7 @@ let stringVal: string = bigintVal.toString(); // should not error - bigintVal in
 >toString : () => string
 
 stringVal = bigintVal.toString(2); // should error - bigintVal inferred as {}
->stringVal = bigintVal.toString(2) : any
+>stringVal = bigintVal.toString(2) : string
 >stringVal : string
 >bigintVal.toString(2) : string
 >bigintVal.toString : () => string

tests/baselines/reference/blockScopedSameNameFunctionDeclarationES5.types

@@ -16,7 +16,7 @@ function foo(a: number) {
 >foo : { (): void; (): void; }
 
         foo(10); // not ok
->foo(10) : any
+>foo(10) : void
 >foo : { (): void; (): void; }
 >10 : 10
     }
@@ -29,12 +29,12 @@ function foo(a: number) {
 >foo : { (): void; (): void; }
 
         foo(10); // not ok
->foo(10) : any
+>foo(10) : void
 >foo : { (): void; (): void; }
 >10 : 10
     }
     foo(10); // not ok
->foo(10) : any
+>foo(10) : void
 >foo : { (): void; (): void; }
 >10 : 10
 

tests/baselines/reference/blockScopedSameNameFunctionDeclarationES6.types

@@ -16,7 +16,7 @@ function foo(a: number) {
 >foo : { (): void; (): void; }
 
         foo(10); // not ok
->foo(10) : any
+>foo(10) : void
 >foo : { (): void; (): void; }
 >10 : 10
     }
@@ -29,12 +29,12 @@ function foo(a: number) {
 >foo : { (): void; (): void; }
 
         foo(10);// not ok
->foo(10) : any
+>foo(10) : void
 >foo : { (): void; (): void; }
 >10 : 10
     }
     foo(10); // not ok
->foo(10) : any
+>foo(10) : void
 >foo : { (): void; (): void; }
 >10 : 10