diff --git a/lib/tsc.js b/lib/tsc.js index a7184cc747e..322dbf45aff 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -15316,8 +15316,9 @@ var ts; } else { source = getApparentType(source); - if (source.flags & 80896 && (target.flags & (4096 | 8192) || - (target.flags & 65536) && target.symbol && target.symbol.flags & (8192 | 2048 | 32))) { + if (source.flags & 80896 && (target.flags & 4096 && target.typeArguments || + target.flags & 8192 || + target.flags & 65536 && target.symbol && target.symbol.flags & (8192 | 2048 | 32))) { if (isInProcess(source, target)) { return; } @@ -29873,7 +29874,7 @@ var ts; ts.ioReadTime = 0; ts.ioWriteTime = 0; var emptyArray = []; - ts.version = "1.7.3"; + ts.version = "1.7.5"; function findConfigFile(searchPath) { var fileName = "tsconfig.json"; while (true) { diff --git a/lib/tsserver.js b/lib/tsserver.js index 8daef4bfd88..d744b47c9ce 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -15779,8 +15779,9 @@ var ts; } else { source = getApparentType(source); - if (source.flags & 80896 && (target.flags & (4096 | 8192) || - (target.flags & 65536) && target.symbol && target.symbol.flags & (8192 | 2048 | 32))) { + if (source.flags & 80896 && (target.flags & 4096 && target.typeArguments || + target.flags & 8192 || + target.flags & 65536 && target.symbol && target.symbol.flags & (8192 | 2048 | 32))) { if (isInProcess(source, target)) { return; } @@ -30336,7 +30337,7 @@ var ts; ts.ioReadTime = 0; ts.ioWriteTime = 0; var emptyArray = []; - ts.version = "1.7.3"; + ts.version = "1.7.5"; function findConfigFile(searchPath) { var fileName = "tsconfig.json"; while (true) { diff --git a/lib/typescript.js b/lib/typescript.js index ba0ee07bbe7..ad673013824 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -18777,9 +18777,11 @@ var ts; } else { source = getApparentType(source); - if (source.flags & 80896 /* ObjectType */ && (target.flags & (4096 /* Reference */ | 8192 /* Tuple */) || - (target.flags & 65536 /* Anonymous */) && target.symbol && target.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */))) { - // If source is an object type, and target is a type reference, a tuple type, the type of a method, or a type literal, infer from members + if (source.flags & 80896 /* ObjectType */ && (target.flags & 4096 /* Reference */ && target.typeArguments || + target.flags & 8192 /* Tuple */ || + target.flags & 65536 /* Anonymous */ && target.symbol && target.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */))) { + // If source is an object type, and target is a type reference with type arguments, a tuple type, + // the type of a method, or a type literal, infer from members if (isInProcess(source, target)) { return; } @@ -35986,7 +35988,7 @@ var ts; /* @internal */ ts.ioWriteTime = 0; /** The version of the TypeScript compiler release */ var emptyArray = []; - ts.version = "1.7.3"; + ts.version = "1.7.5"; function findConfigFile(searchPath) { var fileName = "tsconfig.json"; while (true) { diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index ba0ee07bbe7..ad673013824 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -18777,9 +18777,11 @@ var ts; } else { source = getApparentType(source); - if (source.flags & 80896 /* ObjectType */ && (target.flags & (4096 /* Reference */ | 8192 /* Tuple */) || - (target.flags & 65536 /* Anonymous */) && target.symbol && target.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */))) { - // If source is an object type, and target is a type reference, a tuple type, the type of a method, or a type literal, infer from members + if (source.flags & 80896 /* ObjectType */ && (target.flags & 4096 /* Reference */ && target.typeArguments || + target.flags & 8192 /* Tuple */ || + target.flags & 65536 /* Anonymous */ && target.symbol && target.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */))) { + // If source is an object type, and target is a type reference with type arguments, a tuple type, + // the type of a method, or a type literal, infer from members if (isInProcess(source, target)) { return; } @@ -35986,7 +35988,7 @@ var ts; /* @internal */ ts.ioWriteTime = 0; /** The version of the TypeScript compiler release */ var emptyArray = []; - ts.version = "1.7.3"; + ts.version = "1.7.5"; function findConfigFile(searchPath) { var fileName = "tsconfig.json"; while (true) { diff --git a/scripts/word2md.js b/scripts/word2md.js index e80275d5b2d..a9f4afa5ab7 100644 --- a/scripts/word2md.js +++ b/scripts/word2md.js @@ -232,4 +232,4 @@ function main(args) { app.quit(); } main(sys.args); -//# sourceMappingURL=file:///c:/ts/scripts/word2md.js.map \ No newline at end of file +//# sourceMappingURL=file:///C:/ts/scripts/word2md.js.map \ No newline at end of file