Kotlin: Extract an ErrorType if we fail to correctly extract a type

This commit is contained in:
Ian Lynagh
2022-06-30 15:34:45 +01:00
parent 780f5abc67
commit 1730ec22d9
4 changed files with 35 additions and 5 deletions

View File

@@ -332,6 +332,14 @@ modifiers(
string nodeName: string ref
);
/**
* An errortype is used when the extractor is unable to extract a type
* correctly for some reason.
*/
error_type(
unique int id: @errortype
);
classes(
unique int id: @class,
string nodeName: string ref,
@@ -1012,13 +1020,13 @@ javadocText(
@classorinterfaceorpackage = @classorinterface | @package;
@classorinterfaceorcallable = @classorinterface | @callable;
@boundedtype = @typevariable | @wildcard;
@reftype = @classorinterface | @array | @boundedtype;
@reftype = @classorinterface | @array | @boundedtype | @errortype;
@classorarray = @class | @array;
@type = @primitive | @reftype;
@callable = @method | @constructor;
/** A program element that has a name. */
@element = @package | @modifier | @annotation |
@element = @package | @modifier | @annotation | @errortype |
@locatableElement;
@locatableElement = @file | @primitive | @class | @interface | @method | @constructor | @param | @exception | @field |

View File

@@ -47,6 +47,8 @@ predicate hasName(Element e, string name) {
kt_type_alias(e, name, _)
or
ktProperties(e, name)
or
e instanceof ErrorType and name = "<CodeQL error type>"
}
/**

View File

@@ -666,6 +666,14 @@ class RefType extends Type, Annotatable, Modifiable, @reftype {
}
}
/**
* An `ErrorType` is generated when CodeQL is unable to correctly
* extract a type.
*/
class ErrorType extends RefType, @errortype {
override string getAPrimaryQlClass() { result = "ErrorType" }
}
/** A type that is the same as its source declaration. */
class SrcRefType extends RefType {
SrcRefType() { this.isSourceDeclaration() }