Don't inferFromIndexTypes() twice

microsoft · Nov 23, 2019 · c75f2c8 · c75f2c8
1 parent b968922
commit c75f2c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17924,7 +17924,6 @@ namespace ts {
                     inferFromProperties(source, target);
                     inferFromSignatures(source, target, SignatureKind.Call);
                     inferFromSignatures(source, target, SignatureKind.Construct);
-                    inferFromIndexTypes(source, target);
                 }
             }
 
@@ -17962,6 +17961,7 @@ namespace ts {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
                     }
                 }
+                inferFromIndexTypes(source, target);
             }
 
             function inferFromSignatures(source: Type, target: Type, kind: SignatureKind) {

diff --git a/tests/baselines/reference/restTupleElements1.types b/tests/baselines/reference/restTupleElements1.types
@@ -173,7 +173,7 @@ f0([]);  // Error
 >[] : never[]
 
 f0([1]);
->f0([1]) : [number, number]
+>f0([1]) : [number, unknown]
 >f0 : <T, U>(x: [T, ...U[]]) => [T, U]
 >[1] : [number]
 >1 : 1

diff --git a/tests/baselines/reference/user/create-react-app.log b/tests/baselines/reference/user/create-react-app.log
@@ -1,6 +1,6 @@
 Exit Code: 1
 Standard output:
-test/fixtures/issue-5176-flow-class-properties/src/App.js(5,8): error TS8010: 'types' can only be used in a .ts file.
+test/fixtures/issue-5176-flow-class-properties/src/App.js(5,8): error TS8010: Type annotations can only be used in TypeScript files.
 test/fixtures/issue-5176-flow-class-properties/src/App.js(5,13): error TS1005: ';' expected.
 test/fixtures/webpack-message-formatting/src/AppBabel.js(6,8): error TS17008: JSX element 'div' has no corresponding closing tag.
 test/fixtures/webpack-message-formatting/src/AppBabel.js(8,7): error TS17002: Expected corresponding JSX closing tag for 'span'.