diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll index 516da05d31e..9a778be9242 100644 --- a/javascript/ql/src/semmle/javascript/TypeScript.qll +++ b/javascript/ql/src/semmle/javascript/TypeScript.qll @@ -671,7 +671,7 @@ class TypeAccess extends @typeaccess, TypeExpr, TypeRef { } /** An identifier that is used as part of a type, such as `Date`. */ -class LocalTypeAccess extends @localtypeaccess, TypeAccess, Identifier, LexicalAccess { +class LocalTypeAccess extends @local_type_access, TypeAccess, Identifier, LexicalAccess { override predicate isStringy() { getName() = "String" } override predicate isNumbery() { getName() = "Number" } diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme index f7713fdefd6..0047e9cfaf4 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme +++ b/javascript/ql/src/semmlecode.javascript.dbscheme @@ -398,7 +398,7 @@ case @expr.kind of @classorinterface = @classdefinition | @interfacedefinition; @lexical_decl = @vardecl | @typedecl; -@lexical_access = @varaccess | @localtypeaccess | @localvartypeaccess | @localnamespaceaccess; +@lexical_access = @varaccess | @local_type_access | @localvartypeaccess | @localnamespaceaccess; @lexical_ref = @lexical_decl | @lexical_access; @e4x_xml_attribute_selector = @e4x_xml_static_attribute_selector | @e4x_xml_dynamic_attribute_selector; @@ -470,7 +470,7 @@ bind (unique int id: @bind_id ref, decl (unique int id: @vardecl ref, int decl: @variable ref); -@typebind_id = @localtypeaccess | @export_varaccess; +@typebind_id = @local_type_access | @export_varaccess; typebind (unique int id: @typebind_id ref, int decl: @local_type_name ref); @@ -547,7 +547,7 @@ typeexprs ( ); case @typeexpr.kind of - 0 = @localtypeaccess + 0 = @local_type_access | 1 = @typedecl | 2 = @keywordtypeexpr | 3 = @stringliteraltypeexpr @@ -587,10 +587,10 @@ case @typeexpr.kind of ; @typeref = @typeaccess | @typedecl; -@typeidentifier = @typedecl | @localtypeaccess | @typelabel | @localvartypeaccess | @localnamespaceaccess; +@typeidentifier = @typedecl | @local_type_access | @typelabel | @localvartypeaccess | @localnamespaceaccess; @typeexpr_parent = @expr | @stmt | @property | @typeexpr; @literaltypeexpr = @stringliteraltypeexpr | @numberliteraltypeexpr | @booleanliteraltypeexpr | @bigintliteraltypeexpr; -@typeaccess = @localtypeaccess | @qualifiedtypeaccess | @importtypeaccess; +@typeaccess = @local_type_access | @qualifiedtypeaccess | @importtypeaccess; @vartypeaccess = @localvartypeaccess | @qualifiedvartypeaccess | @thisvartypeaccess | @importvartypeaccess; @namespaceaccess = @localnamespaceaccess | @qualifiednamespaceaccess | @importnamespaceaccess; @importtypeexpr = @importtypeaccess | @importnamespaceaccess | @importvartypeaccess; diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats index 7b0782d0265..1ef9a620817 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats +++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats @@ -754,7 +754,7 @@ 2693 -@localtypeaccess +@local_type_access 25491