renamed "hasAssertsKeyword" to "has_asserts_keyword"

erik-krogh · erik-krogh · commit b5d6cbd5b3d7 · 2020-09-04T11:52:03.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -1866,7 +1866,7 @@ public Label visit(PredicateTypeExpr nd, Context c) {
       visit(nd.getExpression(), key, 0, IdContext.varInTypeBind);
       visit(nd.getTypeExpr(), key, 1, IdContext.typeBind);
       if (nd.hasAssertsKeyword()) {
-        trapwriter.addTuple("hasAssertsKeyword", key);
+        trapwriter.addTuple("has_asserts_keyword", key);
       }
       return key;
     }
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -210,3 +210,8 @@ deprecated predicate hasDefiniteAssignmentAssertion(ASTNode id) { has_definite_a
  * Use `Parameter#isDeclaredOptional()` instead.
  */ 
 deprecated predicate isOptionalParameterDeclaration(Parameter parameter) { is_optional_parameter_declaration(parameter) }
+/**
+ * Alias for the predicate `has_asserts_keyword` defined in the .dbscheme.
+ * Use `PredicateTypeExpr#hasAssertsKeyword() instead.
+ */ 
+deprecated predicate hasAssertsKeyword(PredicateTypeExpr node) { has_asserts_keyword(node) }
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -940,7 +940,7 @@ class PredicateTypeExpr extends @predicatetypeexpr, TypeExpr {
   /**
    * Holds if this is a type of form `asserts E is T` or `asserts E`.
    */
-  predicate hasAssertsKeyword() { hasAssertsKeyword(this) }
+  predicate hasAssertsKeyword() { has_asserts_keyword(this) }
 }
 
 /**
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -645,7 +645,7 @@ case @type.kind of
 @unionorintersectiontype = @uniontype | @intersectiontype;
 @typevariabletype = @canonicaltypevariabletype | @lexicaltypevariabletype;
 
-hasAssertsKeyword(int node: @predicatetypeexpr ref);
+has_asserts_keyword(int node: @predicatetypeexpr ref);
 
 @typed_ast_node = @expr | @typeexpr | @function;
 ast_node_type(
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -7930,7 +7930,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>hasAssertsKeyword</name>
+<name>has_asserts_keyword</name>
 <cardinality>66</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -58,3 +58,5 @@ has_definite_assignment_assertion.rel: reorder hasDefiniteAssignmentAssertion.re
 hasDefiniteAssignmentAssertion.rel: delete
 is_optional_parameter_declaration.rel: reorder isOptionalParameterDeclaration.rel(int parameter) parameter
 isOptionalParameterDeclaration.rel: delete
+has_asserts_keyword.rel: reorder hasAssertsKeyword.rel(int node) node
+hasAssertsKeyword.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -1866,7 +1866,7 @@ public Label visit(PredicateTypeExpr nd, Context c) {`
`1866`	`1866`	`visit(nd.getExpression(), key, 0, IdContext.varInTypeBind);`
`1867`	`1867`	`visit(nd.getTypeExpr(), key, 1, IdContext.typeBind);`
`1868`	`1868`	`if (nd.hasAssertsKeyword()) {`
`1869`		`- trapwriter.addTuple("hasAssertsKeyword", key);`
	`1869`	`+ trapwriter.addTuple("has_asserts_keyword", key);`
`1870`	`1870`	`}`
`1871`	`1871`	`return key;`
`1872`	`1872`	`}`
Original file line number	Diff line number	Diff line change
`@@ -940,7 +940,7 @@ class PredicateTypeExpr extends @predicatetypeexpr, TypeExpr {`
`940`	`940`	`/**`
`941`	`941`	* Holds if this is a type of form `asserts E is T` or `asserts E`.
`942`	`942`	`*/`
`943`		`- predicate hasAssertsKeyword() { hasAssertsKeyword(this) }`
	`943`	`+ predicate hasAssertsKeyword() { has_asserts_keyword(this) }`
`944`	`944`	`}`
`945`	`945`
`946`	`946`	`/**`