Skip to content

Commit 13aa0cf

Browse files
committed
Don't inferFromIndexTypes() twice
1 parent d3855d6 commit 13aa0cf

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

src/compiler/checker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17924,7 +17924,6 @@ namespace ts {
1792417924
inferFromProperties(source, target);
1792517925
inferFromSignatures(source, target, SignatureKind.Call);
1792617926
inferFromSignatures(source, target, SignatureKind.Construct);
17927-
inferFromIndexTypes(source, target);
1792817927
}
1792917928
}
1793017929

@@ -17962,6 +17961,7 @@ namespace ts {
1796217961
inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
1796317962
}
1796417963
}
17964+
inferFromIndexTypes(source, target);
1796517965
}
1796617966

1796717967
function inferFromSignatures(source: Type, target: Type, kind: SignatureKind) {

tests/baselines/reference/restTupleElements1.types

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ f0([]); // Error
173173
>[] : never[]
174174

175175
f0([1]);
176-
>f0([1]) : [number, number]
176+
>f0([1]) : [number, unknown]
177177
>f0 : <T, U>(x: [T, ...U[]]) => [T, U]
178178
>[1] : [number]
179179
>1 : 1

tests/baselines/reference/user/create-react-app.log

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Exit Code: 1
22
Standard output:
3-
test/fixtures/issue-5176-flow-class-properties/src/App.js(5,8): error TS8010: 'types' can only be used in a .ts file.
3+
test/fixtures/issue-5176-flow-class-properties/src/App.js(5,8): error TS8010: Type annotations can only be used in TypeScript files.
44
test/fixtures/issue-5176-flow-class-properties/src/App.js(5,13): error TS1005: ';' expected.
55
test/fixtures/webpack-message-formatting/src/AppBabel.js(6,8): error TS17008: JSX element 'div' has no corresponding closing tag.
66
test/fixtures/webpack-message-formatting/src/AppBabel.js(8,7): error TS17002: Expected corresponding JSX closing tag for 'span'.

tests/baselines/reference/user/npm.log

+8
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,14 @@ node_modules/npm/lib/whoami.js(18,18): error TS2339: Property 'config' does not
925925
node_modules/npm/lib/whoami.js(24,18): error TS2339: Property 'registry' does not exist on type 'typeof EventEmitter'.
926926
node_modules/npm/lib/whoami.js(30,26): error TS2339: Property 'code' does not exist on type 'Error'.
927927
node_modules/npm/lib/whoami.js(45,12): error TS2339: Property 'code' does not exist on type 'Error'.
928+
node_modules/npm/scripts/index-build.js(20,13): error TS2531: Object is possibly 'null'.
929+
node_modules/npm/scripts/index-build.js(20,22): error TS2531: Object is possibly 'null'.
930+
node_modules/npm/scripts/index-build.js(21,30): error TS2531: Object is possibly 'null'.
931+
node_modules/npm/scripts/index-build.js(22,29): error TS2531: Object is possibly 'null'.
932+
node_modules/npm/scripts/index-build.js(23,15): error TS2531: Object is possibly 'null'.
933+
node_modules/npm/scripts/index-build.js(23,22): error TS2531: Object is possibly 'null'.
934+
node_modules/npm/scripts/index-build.js(24,15): error TS2531: Object is possibly 'null'.
935+
node_modules/npm/scripts/index-build.js(24,22): error TS2531: Object is possibly 'null'.
928936
node_modules/npm/scripts/publish-tag.js(2,36): error TS2732: Cannot find module '../package.json'. Consider using '--resolveJsonModule' to import module with '.json' extension
929937
node_modules/npm/test/broken-under-nyc-and-travis/lifecycle-path.js(7,20): error TS2307: Cannot find module 'tap'.
930938
node_modules/npm/test/broken-under-nyc-and-travis/lifecycle-path.js(18,23): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'.

0 commit comments

Comments
 (0)