hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

JS: Fix extraction of negative number literal types

Browse Source
This commit is contained in:
Asger Feldthaus
2020-04-20 16:17:15 +01:00
parent 243dea706e
commit 883846dfb6
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java
View File

@@ -1588,7 +1588,16 @@ public class TypeScriptASTConverter {
}
private Node convertLiteralType(JsonObject node, SourceLocation loc) throws ParseError {
return convertChild(node, "literal");
Node literal = convertChild(node, "literal");
// Convert a negated literal to a negative number
if (literal instanceof UnaryExpression) {
UnaryExpression unary = (UnaryExpression) literal;
if (unary.getOperator().equals("-") && unary.getArgument() instanceof Literal) {
Literal arg = (Literal) unary.getArgument();
literal = new Literal(loc, arg.getTokenType(), "-" + arg.getValue());
}
}
return literal;
}
private Node convertMappedType(JsonObject node, SourceLocation loc) throws ParseError {

1
javascript/ql/test/library-tests/TypeScript/RegressionTests/NegativeNumberType/test.expected Normal file
View File

@@ -0,0 +1 @@
| tst.ts:1:25:1:26 | -1 | -1 | -1 |

4
javascript/ql/test/library-tests/TypeScript/RegressionTests/NegativeNumberType/test.ql Normal file
View File

@@ -0,0 +1,4 @@
import javascript
from NumberLiteralTypeExpr t
select t, t.getValue(), t.getIntValue()

3
javascript/ql/test/library-tests/TypeScript/RegressionTests/NegativeNumberType/tsconfig.json Normal file
View File

@@ -0,0 +1,3 @@
{
"include": ["."]
}

1
javascript/ql/test/library-tests/TypeScript/RegressionTests/NegativeNumberType/tst.ts Normal file
View File

@@ -0,0 +1 @@
type Foo<T> = T extends -1 ? true : false;