mirror of
https://github.com/github/codeql.git
synced 2025-12-17 01:03:14 +01:00
Rename validation methods for type expressions and added recursive call for type validation.
Co-authored-by: Asgerf <asgerf@github.com>
This commit is contained in:
@@ -71,7 +71,7 @@ public class MemberExpression extends Expression
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isValidExpression() {
|
public boolean isValidTypeExpression() {
|
||||||
return object instanceof ITypeExpression || object instanceof DynamicImport;
|
return object instanceof ITypeExpression && ((ITypeExpression)object).isValidTypeExpression() || object instanceof DynamicImport;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,5 +11,5 @@ import com.semmle.js.ast.Literal;
|
|||||||
* TypeScript AST does not distinguish <code>null</code> literals from the <code>null</code> type.
|
* TypeScript AST does not distinguish <code>null</code> literals from the <code>null</code> type.
|
||||||
*/
|
*/
|
||||||
public interface ITypeExpression extends INode, ITypedAstNode {
|
public interface ITypeExpression extends INode, ITypedAstNode {
|
||||||
public default boolean isValidExpression() { return true; }
|
public default boolean isValidTypeExpression() { return true; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1907,7 +1907,7 @@ public class TypeScriptASTConverter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private ITypeExpression asType(Node node) {
|
private ITypeExpression asType(Node node) {
|
||||||
return node instanceof ITypeExpression && ((ITypeExpression)node).isValidExpression() ? (ITypeExpression) node : null;
|
return node instanceof ITypeExpression && ((ITypeExpression)node).isValidTypeExpression() ? (ITypeExpression) node : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<ITypeExpression> convertChildrenAsTypes(JsonObject node, String child)
|
private List<ITypeExpression> convertChildrenAsTypes(JsonObject node, String child)
|
||||||
|
|||||||
Reference in New Issue
Block a user