Skip to content

Commit af1a00a

Browse files
committed
JS: Fix some uses of deprecated predicates
1 parent 6f5ea86 commit af1a00a

8 files changed

Lines changed: 11 additions & 17 deletions

File tree

javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
WARNING: predicate 'hasQualifiedName' has been deprecated and may be removed in future (test.ql:3,68-84)
21
| bar.js:5:14:5:14 | x | ns.very.long.namespace |
32
| bar.js:5:14:5:18 | x.Foo | ns.very.long.namespace.Foo |
43
| bar.js:12:14:12:17 | iife | IIFE |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import javascript
22

3-
query string test_hasQualifiedName(JSDocNamedTypeExpr expr) { expr.hasQualifiedName(result) }
3+
query string test_hasUnderlyingType(JSDocNamedTypeExpr expr) { expr.hasUnderlyingType(result) }

javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
WARNING: predicate 'hasQualifiedName' has been deprecated and may be removed in future (JSDocTypeAnnotations.ql:7,63-79)
21
test_isString
32
| tst.js:2:12:2:17 | string |
43
test_isNumber
54
| tst.js:3:12:3:17 | number |
6-
test_QualifiedName
5+
test_hasUnderlyingType
76
| VarType | tst.js:9:13:9:19 | VarType |
87
| boolean | tst.js:5:14:5:20 | boolean |
98
| foo | tst.js:4:12:4:14 | foo |

javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ query TypeAnnotation test_isString() { result.isString() }
44

55
query TypeAnnotation test_isNumber() { result.isNumber() }
66

7-
query TypeAnnotation test_QualifiedName(string name) { result.hasQualifiedName(name) }
7+
query TypeAnnotation test_hasUnderlyingType(string name) { result.hasUnderlyingType(name) }
88

99
query TypeAnnotation test_ParameterType(Parameter p) { result = p.getTypeAnnotation() }
1010

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
WARNING: predicate 'hasQualifiedName' has been deprecated and may be removed in future (QualifiedNames.ql:4,12-28)
21
| tst.ts:4:8:4:21 | UnresolvedType | unresolved | UnresolvedType |
32
| tst.ts:5:8:5:19 | ResolvedType | resolved | ResolvedType |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import javascript
22

33
from TypeAnnotation type, string mod, string name
4-
where type.hasQualifiedName(mod, name)
4+
where type.hasUnderlyingType(mod, name)
55
select type, mod, name

javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
WARNING: predicate 'hasQualifiedName' has been deprecated and may be removed in future (Test.ql:4,10-26)
2-
WARNING: predicate 'hasQualifiedName' has been deprecated and may be removed in future (Test.ql:8,10-26)
3-
WARNING: predicate 'hasQualifiedName' has been deprecated and may be removed in future (Test.ql:12,30-46)
4-
hasQualifiedNameModule
1+
hasUnderlyingTypeModule
52
| default-import | | tst.ts:11:9:11:21 | DefaultImport |
63
| global | UnresolvedName | tst.ts:12:9:12:22 | UnresolvedName |
74
| import-assign | | tst.ts:10:9:10:11 | asn |
@@ -12,7 +9,7 @@ hasQualifiedNameModule
129
| named-import | Name2 | tst.ts:8:9:8:13 | Name2 |
1310
| namespace-import | | tst.ts:9:9:9:17 | namespace |
1411
| namespace-import | Foo | tst.ts:9:9:9:21 | namespace.Foo |
15-
hasQualifiedNameGlobal
12+
hasUnderlyingTypeGlobal
1613
| UnresolvedName | tst.ts:12:9:12:22 | UnresolvedName |
1714
paramExample
1815
| tst.ts:7:5:7:6 | x1 |
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import javascript
22

3-
query TypeAnnotation hasQualifiedNameModule(string moduleName, string member) {
4-
result.hasQualifiedName(moduleName, member)
3+
query TypeAnnotation hasUnderlyingTypeModule(string moduleName, string member) {
4+
result.hasUnderlyingType(moduleName, member)
55
}
66

7-
query TypeAnnotation hasQualifiedNameGlobal(string globalName) {
8-
result.hasQualifiedName(globalName)
7+
query TypeAnnotation hasUnderlyingTypeGlobal(string globalName) {
8+
result.hasUnderlyingType(globalName)
99
}
1010

1111
query Parameter paramExample() {
12-
result.getTypeAnnotation().hasQualifiedName("named-import", "Name1")
12+
result.getTypeAnnotation().hasUnderlyingType("named-import", "Name1")
1313
}

0 commit comments

Comments
 (0)