Use proper type parameter hosts in JS files #61013
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| //// [tests/cases/compiler/inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts] //// | ||
|
|
||
| === inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts === | ||
| class S<T> { | ||
| >S : Symbol(S, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 0)) | ||
| >T : Symbol(T, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 8)) | ||
|
|
||
| set: Set<T>; | ||
| >set : Symbol(S.set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 12)) | ||
| >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.esnext.collection.d.ts, --, --)) | ||
| >T : Symbol(T, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 8)) | ||
|
|
||
| constructor(set: Set<T>) { | ||
| >set : Symbol(set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 3, 14)) | ||
| >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.esnext.collection.d.ts, --, --)) | ||
| >T : Symbol(T, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 8)) | ||
|
|
||
| this.set = set; | ||
| >this.set : Symbol(S.set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 12)) | ||
| >this : Symbol(S, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 0)) | ||
| >set : Symbol(S.set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 12)) | ||
| >set : Symbol(set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 3, 14)) | ||
| } | ||
|
|
||
| array() { | ||
| >array : Symbol(S.array, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 5, 3)) | ||
|
|
||
| return new S(new Set([...this.set].map((item) => [item]))); | ||
| >S : Symbol(S, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 0)) | ||
| >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.esnext.collection.d.ts, --, --)) | ||
| >[...this.set].map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) | ||
| >this.set : Symbol(S.set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 12)) | ||
| >this : Symbol(S, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 0)) | ||
| >set : Symbol(S.set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 12)) | ||
| >map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) | ||
| >item : Symbol(item, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 8, 44)) | ||
| >item : Symbol(item, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 8, 44)) | ||
| } | ||
| } | ||
|
|
||
| function sArray<T>(set: Set<T>) { | ||
| >sArray : Symbol(sArray, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 10, 1)) | ||
| >T : Symbol(T, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 12, 16)) | ||
| >set : Symbol(set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 12, 19)) | ||
| >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.esnext.collection.d.ts, --, --)) | ||
| >T : Symbol(T, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 12, 16)) | ||
|
|
||
| return new S(new Set([...set].map((item) => [item]))); | ||
| >S : Symbol(S, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 0, 0)) | ||
| >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.esnext.collection.d.ts, --, --)) | ||
| >[...set].map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) | ||
| >set : Symbol(set, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 12, 19)) | ||
| >map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) | ||
| >item : Symbol(item, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 13, 37)) | ||
| >item : Symbol(item, Decl(inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts, 13, 37)) | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| //// [tests/cases/compiler/inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts] //// | ||
|
|
||
| === Performance Stats === | ||
| Type Count: 1,000 | ||
| Instantiation count: 2,500 | ||
|
|
||
| === inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResult2.ts === | ||
| class S<T> { | ||
| >S : S<T> | ||
| > : ^^^^ | ||
|
|
||
| set: Set<T>; | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
|
|
||
| constructor(set: Set<T>) { | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
|
|
||
| this.set = set; | ||
| >this.set = set : Set<T> | ||
| > : ^^^^^^ | ||
| >this.set : Set<T> | ||
| > : ^^^^^^ | ||
| >this : this | ||
| > : ^^^^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
| } | ||
|
|
||
| array() { | ||
| >array : () => S<T[]> | ||
| > : ^^^^^^^^^^^^ | ||
|
|
||
| return new S(new Set([...this.set].map((item) => [item]))); | ||
| >new S(new Set([...this.set].map((item) => [item]))) : S<T[]> | ||
| > : ^^^^^^ | ||
| >S : typeof S | ||
| > : ^^^^^^^^ | ||
| >new Set([...this.set].map((item) => [item])) : Set<T[]> | ||
| > : ^^^^^^^^ | ||
| >Set : SetConstructor | ||
| > : ^^^^^^^^^^^^^^ | ||
| >[...this.set].map((item) => [item]) : T[][] | ||
| > : ^^^^^ | ||
| >[...this.set].map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[] | ||
| > : ^ ^^ ^^^ ^^^^^ ^^ ^^ ^^^^^^^^^^^^^ ^^^ ^^^^^^^^ | ||
| >[...this.set] : T[] | ||
| > : ^^^ | ||
| >...this.set : T | ||
| > : ^ | ||
| >this.set : Set<T> | ||
| > : ^^^^^^ | ||
| >this : this | ||
| > : ^^^^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
| >map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[] | ||
| > : ^ ^^ ^^^ ^^^^^ ^^ ^^ ^^^^^^^^^^^^^ ^^^ ^^^^^^^^ | ||
| >(item) => [item] : (item: T) => T[] | ||
| > : ^ ^^^^^^^^^^^ | ||
| >item : T | ||
| > : ^ | ||
| >[item] : T[] | ||
| > : ^^^ | ||
| >item : T | ||
| > : ^ | ||
| } | ||
| } | ||
|
|
||
| function sArray<T>(set: Set<T>) { | ||
| >sArray : <T>(set: Set<T>) => S<T[]> | ||
| > : ^ ^^ ^^ ^^^^^^^^^^^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
|
|
||
| return new S(new Set([...set].map((item) => [item]))); | ||
| >new S(new Set([...set].map((item) => [item]))) : S<T[]> | ||
| > : ^^^^^^ | ||
| >S : typeof S | ||
| > : ^^^^^^^^ | ||
| >new Set([...set].map((item) => [item])) : Set<T[]> | ||
| > : ^^^^^^^^ | ||
| >Set : SetConstructor | ||
| > : ^^^^^^^^^^^^^^ | ||
| >[...set].map((item) => [item]) : T[][] | ||
| > : ^^^^^ | ||
| >[...set].map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[] | ||
| > : ^ ^^ ^^^ ^^^^^ ^^ ^^ ^^^^^^^^^^^^^ ^^^ ^^^^^^^^ | ||
| >[...set] : T[] | ||
| > : ^^^ | ||
| >...set : T | ||
| > : ^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
| >map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[] | ||
| > : ^ ^^ ^^^ ^^^^^ ^^ ^^ ^^^^^^^^^^^^^ ^^^ ^^^^^^^^ | ||
| >(item) => [item] : (item: T) => T[] | ||
| > : ^ ^^^^^^^^^^^ | ||
| >item : T | ||
| > : ^ | ||
| >[item] : T[] | ||
| > : ^^^ | ||
| >item : T | ||
| > : ^ | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| //// [tests/cases/compiler/inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResultJsDoc1.ts] //// | ||
|
|
||
| === index.js === | ||
| // https://github.com/microsoft/TypeScript/issues/60988 | ||
|
|
||
| /** | ||
| * @template [T = any] | ||
| */ | ||
| class S { | ||
| >S : Symbol(S, Decl(index.js, 0, 0)) | ||
|
|
||
| /** | ||
| * @type {Set<T>} | ||
| */ | ||
| set; | ||
| >set : Symbol(S.set, Decl(index.js, 5, 9)) | ||
|
|
||
| /** | ||
| * @param {Set<T>} set | ||
| */ | ||
| constructor(set) { | ||
| >set : Symbol(set, Decl(index.js, 15, 13)) | ||
|
|
||
| this.set = set; | ||
| >this.set : Symbol(S.set, Decl(index.js, 5, 9)) | ||
| >this : Symbol(S, Decl(index.js, 0, 0)) | ||
| >set : Symbol(S.set, Decl(index.js, 5, 9)) | ||
| >set : Symbol(set, Decl(index.js, 15, 13)) | ||
| } | ||
|
|
||
| array() { | ||
| >array : Symbol(S.array, Decl(index.js, 17, 2)) | ||
|
|
||
| return new S(new Set([...this.set].map(item => [item]))); | ||
| >S : Symbol(S, Decl(index.js, 0, 0)) | ||
| >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.esnext.collection.d.ts, --, --)) | ||
| >[...this.set].map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) | ||
| >this.set : Symbol(S.set, Decl(index.js, 5, 9)) | ||
| >this : Symbol(S, Decl(index.js, 0, 0)) | ||
| >set : Symbol(S.set, Decl(index.js, 5, 9)) | ||
| >map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) | ||
| >item : Symbol(item, Decl(index.js, 20, 41)) | ||
| >item : Symbol(item, Decl(index.js, 20, 41)) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @template [T = any] | ||
| * @param {Set<T>} set | ||
| */ | ||
| const sArray = (set) => { | ||
| >sArray : Symbol(sArray, Decl(index.js, 28, 5)) | ||
| >set : Symbol(set, Decl(index.js, 28, 16)) | ||
|
|
||
| return new S(new Set([...set].map(item => [item]))); | ||
| >S : Symbol(S, Decl(index.js, 0, 0)) | ||
| >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.esnext.collection.d.ts, --, --)) | ||
| >[...set].map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) | ||
| >set : Symbol(set, Decl(index.js, 28, 16)) | ||
| >map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) | ||
| >item : Symbol(item, Decl(index.js, 29, 35)) | ||
| >item : Symbol(item, Decl(index.js, 29, 35)) | ||
|
|
||
| }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| //// [tests/cases/compiler/inferenceOuterResultNotIncorrectlyInstantiatedWithInnerResultJsDoc1.ts] //// | ||
|
|
||
| === Performance Stats === | ||
| Type Count: 1,000 | ||
| Instantiation count: 2,500 | ||
|
|
||
| === index.js === | ||
| // https://github.com/microsoft/TypeScript/issues/60988 | ||
|
|
||
| /** | ||
| * @template [T = any] | ||
| */ | ||
| class S { | ||
| >S : S<T> | ||
| > : ^^^^ | ||
|
|
||
| /** | ||
| * @type {Set<T>} | ||
| */ | ||
| set; | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
|
|
||
| /** | ||
| * @param {Set<T>} set | ||
| */ | ||
| constructor(set) { | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
|
|
||
| this.set = set; | ||
| >this.set = set : Set<T> | ||
| > : ^^^^^^ | ||
| >this.set : Set<T> | ||
| > : ^^^^^^ | ||
| >this : this | ||
| > : ^^^^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
| } | ||
|
|
||
| array() { | ||
| >array : () => S<T[]> | ||
| > : ^^^^^^^^^^^^ | ||
|
|
||
| return new S(new Set([...this.set].map(item => [item]))); | ||
| >new S(new Set([...this.set].map(item => [item]))) : S<T[]> | ||
| > : ^^^^^^ | ||
| >S : typeof S | ||
| > : ^^^^^^^^ | ||
| >new Set([...this.set].map(item => [item])) : Set<T[]> | ||
| > : ^^^^^^^^ | ||
| >Set : SetConstructor | ||
| > : ^^^^^^^^^^^^^^ | ||
| >[...this.set].map(item => [item]) : T[][] | ||
| > : ^^^^^ | ||
| >[...this.set].map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[] | ||
| > : ^ ^^ ^^^ ^^^^^ ^^ ^^ ^^^^^^^^^^^^^ ^^^ ^^^^^^^^ | ||
| >[...this.set] : T[] | ||
| > : ^^^ | ||
| >...this.set : T | ||
| > : ^ | ||
| >this.set : Set<T> | ||
| > : ^^^^^^ | ||
| >this : this | ||
| > : ^^^^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
| >map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[] | ||
| > : ^ ^^ ^^^ ^^^^^ ^^ ^^ ^^^^^^^^^^^^^ ^^^ ^^^^^^^^ | ||
| >item => [item] : (item: T) => T[] | ||
| > : ^ ^^^^^^^^^^^ | ||
| >item : T | ||
| > : ^ | ||
| >[item] : T[] | ||
| > : ^^^ | ||
| >item : T | ||
| > : ^ | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @template [T = any] | ||
| * @param {Set<T>} set | ||
| */ | ||
| const sArray = (set) => { | ||
| >sArray : <T = any>(set: Set<T>) => S<T[]> | ||
| > : ^ ^^^^^^^^ ^^ ^^^^^^^^^^^ | ||
| >(set) => { return new S(new Set([...set].map(item => [item])));} : <T = any>(set: Set<T>) => S<T[]> | ||
| > : ^ ^^^^^^^^ ^^ ^^^^^^^^^^^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
|
|
||
| return new S(new Set([...set].map(item => [item]))); | ||
| >new S(new Set([...set].map(item => [item]))) : S<T[]> | ||
| > : ^^^^^^ | ||
| >S : typeof S | ||
| > : ^^^^^^^^ | ||
| >new Set([...set].map(item => [item])) : Set<T[]> | ||
| > : ^^^^^^^^ | ||
| >Set : SetConstructor | ||
| > : ^^^^^^^^^^^^^^ | ||
| >[...set].map(item => [item]) : T[][] | ||
| > : ^^^^^ | ||
| >[...set].map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[] | ||
| > : ^ ^^ ^^^ ^^^^^ ^^ ^^ ^^^^^^^^^^^^^ ^^^ ^^^^^^^^ | ||
| >[...set] : T[] | ||
| > : ^^^ | ||
| >...set : T | ||
| > : ^ | ||
| >set : Set<T> | ||
| > : ^^^^^^ | ||
| >map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[] | ||
| > : ^ ^^ ^^^ ^^^^^ ^^ ^^ ^^^^^^^^^^^^^ ^^^ ^^^^^^^^ | ||
| >item => [item] : (item: T) => T[] | ||
| > : ^ ^^^^^^^^^^^ | ||
| >item : T | ||
| > : ^ | ||
| >[item] : T[] | ||
| > : ^^^ | ||
| >item : T | ||
| > : ^ | ||
|
|
||
| }; | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This sort of makes me wonder when we really should be using
getEffectiveJSDocHostwhere we are currently usinggetEffectiveContainerForJSDocTemplateTag...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, but to be fair - I had to use
getEffectiveJSDocHostto fix this issue at hand and it didn't look to me like this older function would have to stick to the other one. There is a chance that it should not use this - but there is also a chance that this change fixed some other issue ;pIn the ideal world, I'd go through all of the callers to both and assess their needs but I just don't have time to do that right now 😢