renamed "isStatic" to "is_static"

erik-krogh · erik-krogh · commit 2c3b3e7173e6 · 2020-09-04T11:51:54.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java b/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java
@@ -39,7 +39,7 @@ public class DeclarationFlags {
       Arrays.asList(
           "is_computed",
           "isAbstractMember",
-          "isStatic",
+          "is_static",
           "hasReadonlyKeyword",
           "hasPublicKeyword",
           "hasPrivateKeyword",
diff --git a/javascript/extractor/tests/cfg/output/trap/fields.js.trap b/javascript/extractor/tests/cfg/output/trap/fields.js.trap
@@ -470,7 +470,7 @@ hasLocation(#20161,#20065)
 enclosing_stmt(#20161,#20139)
 expr_containers(#20161,#20001)
 literals("y","y",#20161)
-isStatic(#20159)
+is_static(#20159)
 #20162=*
 properties(#20162,#20139,5,0,"f() {}")
 #20163=@"loc,{#10000},7,3,7,8"
@@ -535,7 +535,7 @@ locations_default(#20179,#10000,8,14,8,15)
 hasLocation(#20178,#20179)
 stmt_containers(#20178,#20174)
 is_method(#20171)
-isStatic(#20171)
+is_static(#20171)
 #20180=*
 stmts(#20180,26,#20001,1,"class B ... \n  z;\n}")
 #20181=@"loc,{#10000},11,1,18,1"
diff --git a/javascript/extractor/tests/es2015/output/trap/class_static.js.trap b/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
@@ -184,7 +184,7 @@ locations_default(#20058,#10000,3,13,3,13)
 hasLocation(#20057,#20058)
 regexpConstValue(#20057,"A")
 is_method(#20045)
-isStatic(#20045)
+is_static(#20045)
 #20059=*
 properties(#20059,#20042,3,0,"constructor() {}")
 #20060=@"loc,{#10000},1,9,1,8"
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -150,3 +150,8 @@ deprecated predicate isComputed(Property prop) { is_computed(prop) }
  * Use the `isMethod()` method on the `MemberDeclaration`/`Property` class instead.
  */ 
 deprecated predicate isMethod(Property prop) { is_method(prop) }
+/**
+ * Alias for the predicate `is_static` defined in the .dbscheme.
+ * Use `MemberDeclaration#isStatic()` instead.
+ */ 
+deprecated predicate isStatic(Property prop) { is_static(prop) }
diff --git a/javascript/ql/src/semmle/javascript/Classes.qll b/javascript/ql/src/semmle/javascript/Classes.qll
@@ -472,7 +472,7 @@ class MemberDeclaration extends @property, Documentable {
   /**
    * Holds if this member is static.
    */
-  predicate isStatic() { isStatic(this) }
+  predicate isStatic() { is_static(this) }
 
   /**
    * Holds if this member is abstract.
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -515,7 +515,7 @@ case @property.kind of
 
 is_computed (int id: @property ref);
 is_method   (int id: @property ref);
-isStatic   (int id: @property ref);
+is_static   (int id: @property ref);
 isAbstractMember (int id: @property ref);
 isConstEnum (int id: @enumdeclaration ref);
 isAbstractClass (int id: @classdeclstmt ref);
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -13539,7 +13539,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>isStatic</name>
+<name>is_static</name>
 <cardinality>36</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -34,3 +34,5 @@ is_computed.rel: reorder isComputed.rel(int prop) prop
 isComputed.rel: delete
 is_method.rel: reorder isMethod.rel(int prop) prop
 isMethod.rel: delete
+is_static.rel: reorder isStatic.rel(int prop) prop
+isStatic.rel: delete
