hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-29 10:45:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

TS: Stop using the deprecated TypeReference.typeArguments

Browse Source
This commit is contained in:
Asger F
2019-10-30 15:11:05 +00:00
parent 341c11523c
commit 7dfd4e0687
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
javascript/extractor/lib/typescript/src/type_table.ts
View File

@@ -597,7 +597,7 @@ export class TypeTable {
let tupleType = tupleReference.target;
let minLength = tupleType.minLength != null
? tupleType.minLength
: tupleReference.typeArguments.length;
: this.typeChecker.getTypeArguments(tupleReference).length;
let hasRestElement = tupleType.hasRestElement ? 't' : 'f';
let prefix = `tuple;${minLength};${hasRestElement}`;
return this.makeTypeStringVectorFromTypeReferenceArguments(prefix, type);
@@ -714,11 +714,12 @@ export class TypeTable {
// There can be an extra type argument at the end, denoting an explicit 'this' type argument.
// We discard the extra argument in our model.
let target = type.target;
if (type.typeArguments == null) return tag;
let typeArguments = this.typeChecker.getTypeArguments(type);
if (typeArguments == null) return tag;
if (target.typeParameters != null) {
return this.makeTypeStringVector(tag, type.typeArguments, target.typeParameters.length);
return this.makeTypeStringVector(tag, typeArguments, target.typeParameters.length);
} else {
return this.makeTypeStringVector(tag, type.typeArguments);
return this.makeTypeStringVector(tag, typeArguments);
}
}
@@ -992,7 +993,7 @@ export class TypeTable {
* `T` is the type parameter declared on the `Promise` interface.
*/
private getSelfType(type: ts.Type): ts.TypeReference {
if (isTypeReference(type) && type.typeArguments != null && type.typeArguments.length > 0) {
if (isTypeReference(type) && this.typeChecker.getTypeArguments(type).length > 0) {
return type.target;
}
return null;
@@ -1181,8 +1182,9 @@ export class TypeTable {
if (isTypeReference(type)) {
// Note that this case also handles tuple types, since a tuple type is represented as
// a reference to a synthetic generic interface.
if (type.typeArguments != null) {
type.typeArguments.forEach(callback);
let typeArguments = this.typeChecker.getTypeArguments(type);
if (typeArguments != null) {
typeArguments.forEach(callback);
}
} else if (type.flags & ts.TypeFlags.UnionOrIntersection) {
(type as ts.UnionOrIntersectionType).types.forEach(callback);