Skip to content

Commit 6e54cf4

Browse files
committed
autoformat
1 parent 5a159ab commit 6e54cf4

File tree

3 files changed

+133
-64
lines changed

3 files changed

+133
-64
lines changed

javascript/ql/src/semmle/javascript/Aliases.qll

Lines changed: 127 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -66,232 +66,300 @@ class VariableAccess = VarAccess;
6666
class XorBitwiseExpr = XOrExpr;
6767

6868
// Aliases for deprecated predicates from the dbscheme
69-
7069
/**
7170
* Alias for the predicate `is_externs` defined in the .dbscheme.
7271
* Use `TopLevel#isExterns()` instead.
73-
*/
72+
*/
7473
deprecated predicate isExterns(TopLevel toplevel) { is_externs(toplevel) }
74+
7575
/**
7676
* Alias for the predicate `is_module` defined in the .dbscheme.
7777
* Use the `Module` class in `Module.qll` instead.
78-
*/
78+
*/
7979
deprecated predicate isModule(TopLevel toplevel) { is_module(toplevel) }
80+
8081
/**
8182
* Alias for the predicate `is_nodejs` defined in the .dbscheme.
8283
* Use `NodeModule` from `NodeJS.qll` instead.
83-
*/
84+
*/
8485
deprecated predicate isNodejs(TopLevel toplevel) { is_nodejs(toplevel) }
86+
8587
/**
8688
* Alias for the predicate `is_es2015_module` defined in the .dbscheme.
8789
* Use `ES2015Module` from `ES2015Modules.qll` instead.
88-
*/
90+
*/
8991
deprecated predicate isES2015Module(TopLevel toplevel) { is_es2015_module(toplevel) }
92+
9093
/**
9194
* Alias for the predicate `is_closure_module` defined in the .dbscheme.
92-
*/
95+
*/
9396
deprecated predicate isClosureModule(TopLevel toplevel) { is_closure_module(toplevel) }
97+
9498
/**
9599
* Alias for the predicate `stmt_containers` defined in the .dbscheme.
96100
* Use `ASTNode#getContainer()` instead.
97-
*/
98-
deprecated predicate stmtContainers(Stmt stmt, StmtContainer container) { stmt_containers(stmt, container) }
101+
*/
102+
deprecated predicate stmtContainers(Stmt stmt, StmtContainer container) {
103+
stmt_containers(stmt, container)
104+
}
105+
99106
/**
100107
* Alias for the predicate `jump_targets` defined in the .dbscheme.
101108
* Use `JumpStmt#getTarget()` instead.
102-
*/
109+
*/
103110
deprecated predicate jumpTargets(Stmt jump, Stmt target) { jump_targets(jump, target) }
111+
104112
/**
105113
* Alias for the predicate `is_instantiated` defined in the .dbscheme.
106114
* Use `NamespaceDeclaration#isInstantiated() instead.`
107-
*/
115+
*/
108116
deprecated predicate isInstantiated(NamespaceDeclaration decl) { is_instantiated(decl) }
117+
109118
/**
110119
* Alias for the predicate `has_declare_keyword` defined in the .dbscheme.
111-
*/
120+
*/
112121
deprecated predicate hasDeclareKeyword(ASTNode stmt) { has_declare_keyword(stmt) }
122+
113123
/**
114124
* Alias for the predicate `is_for_await_of` defined in the .dbscheme.
115125
* Use `ForOfStmt#isAwait()` instead.
116-
*/
126+
*/
117127
deprecated predicate isForAwaitOf(ForOfStmt forof) { is_for_await_of(forof) }
128+
118129
/**
119130
* Alias for the predicate `enclosing_stmt` defined in the .dbscheme.
120131
* Use `ExprOrType#getEnclosingStmt` instead.
121-
*/
132+
*/
122133
deprecated predicate enclosingStmt(ExprOrType expr, Stmt stmt) { enclosing_stmt(expr, stmt) }
134+
123135
/**
124136
* Alias for the predicate `expr_containers` defined in the .dbscheme.
125137
* Use `ASTNode#getContainer()` instead.
126-
*/
127-
deprecated predicate exprContainers(ExprOrType expr, StmtContainer container) { expr_containers(expr, container) }
138+
*/
139+
deprecated predicate exprContainers(ExprOrType expr, StmtContainer container) {
140+
expr_containers(expr, container)
141+
}
142+
128143
/**
129144
* Alias for the predicate `array_size` defined in the .dbscheme.
130145
* Use `ArrayExpr#getSize()` instead.
131-
*/
146+
*/
132147
deprecated predicate arraySize(Expr ae, int sz) { array_size(ae, sz) }
148+
133149
/**
134150
* Alias for the predicate `is_delegating` defined in the .dbscheme.
135151
* Use `YieldExpr#isDelegating()` instead.
136-
*/
152+
*/
137153
deprecated predicate isDelegating(YieldExpr yield) { is_delegating(yield) }
154+
138155
/**
139156
* Alias for the predicate `is_arguments_object` defined in the .dbscheme.
140157
* Use the `ArgumentsVariable` class instead.
141-
*/
158+
*/
142159
deprecated predicate isArgumentsObject(Variable id) { is_arguments_object(id) }
160+
143161
/**
144162
* Alias for the predicate `is_computed` defined in the .dbscheme.
145163
* Use the `isComputed()` method on the `MemberDeclaration`/`Property`/`PropertyPattern` class instead.
146-
*/
164+
*/
147165
deprecated predicate isComputed(Property prop) { is_computed(prop) }
166+
148167
/**
149168
* Alias for the predicate `is_method` defined in the .dbscheme.
150169
* Use the `isMethod()` method on the `MemberDeclaration`/`Property` class instead.
151-
*/
170+
*/
152171
deprecated predicate isMethod(Property prop) { is_method(prop) }
172+
153173
/**
154174
* Alias for the predicate `is_static` defined in the .dbscheme.
155175
* Use `MemberDeclaration#isStatic()` instead.
156-
*/
176+
*/
157177
deprecated predicate isStatic(Property prop) { is_static(prop) }
178+
158179
/**
159180
* Alias for the predicate `is_abstract_member` defined in the .dbscheme.
160181
* Use `MemberDeclaration#isAbstract()` instead.
161-
*/
182+
*/
162183
deprecated predicate isAbstractMember(Property prop) { is_abstract_member(prop) }
184+
163185
/**
164186
* Alias for the predicate `is_const_enum` defined in the .dbscheme.
165187
* Use `EnumDeclaration#isConst()` instead.
166-
*/
188+
*/
167189
deprecated predicate isConstEnum(EnumDeclaration id) { is_const_enum(id) }
190+
168191
/**
169192
* Alias for the predicate `is_abstract_class` defined in the .dbscheme.
170193
* Use `ClassDefinition#isAbstract()` instead.
171-
*/
194+
*/
172195
deprecated predicate isAbstractClass(ClassDeclStmt id) { is_abstract_class(id) }
196+
173197
/**
174198
* Alias for the predicate `has_public_keyword` defined in the .dbscheme.
175199
* Use `MemberDeclaration#hasPublicKeyword() instead.
176-
*/
200+
*/
177201
deprecated predicate hasPublicKeyword(Property prop) { has_public_keyword(prop) }
202+
178203
/**
179204
* Alias for the predicate `has_private_keyword` defined in the .dbscheme.
180205
* Use `MemberDeclaration#isPrivate() instead.
181-
*/
206+
*/
182207
deprecated predicate hasPrivateKeyword(Property prop) { has_private_keyword(prop) }
208+
183209
/**
184210
* Alias for the predicate `has_protected_keyword` defined in the .dbscheme.
185211
* Use `MemberDeclaration#isProtected() instead.
186-
*/
212+
*/
187213
deprecated predicate hasProtectedKeyword(Property prop) { has_protected_keyword(prop) }
214+
188215
/**
189216
* Alias for the predicate `has_readonly_keyword` defined in the .dbscheme.
190217
* Use `FieldDeclaration#isReadonly()` instead.
191-
*/
218+
*/
192219
deprecated predicate hasReadonlyKeyword(Property prop) { has_readonly_keyword(prop) }
220+
193221
/**
194222
* Alias for the predicate `has_type_keyword` defined in the .dbscheme.
195223
* Use the `isTypeOnly` method on the `ImportDeclaration`/`ExportDeclaration` classes instead.
196-
*/
224+
*/
197225
deprecated predicate hasTypeKeyword(ASTNode id) { has_type_keyword(id) }
226+
198227
/**
199228
* Alias for the predicate `is_optional_member` defined in the .dbscheme.
200229
* Use `FieldDeclaration#isOptional()` instead.
201-
*/
230+
*/
202231
deprecated predicate isOptionalMember(Property id) { is_optional_member(id) }
232+
203233
/**
204234
* Alias for the predicate `has_definite_assignment_assertion` defined in the .dbscheme.
205235
* Use the `hasDefiniteAssignmentAssertion` method on the `FieldDeclaration`/`VariableDeclarator` classes instead.
206-
*/
207-
deprecated predicate hasDefiniteAssignmentAssertion(ASTNode id) { has_definite_assignment_assertion(id) }
236+
*/
237+
deprecated predicate hasDefiniteAssignmentAssertion(ASTNode id) {
238+
has_definite_assignment_assertion(id)
239+
}
240+
208241
/**
209242
* Alias for the predicate `is_optional_parameter_declaration` defined in the .dbscheme.
210243
* Use `Parameter#isDeclaredOptional()` instead.
211-
*/
212-
deprecated predicate isOptionalParameterDeclaration(Parameter parameter) { is_optional_parameter_declaration(parameter) }
244+
*/
245+
deprecated predicate isOptionalParameterDeclaration(Parameter parameter) {
246+
is_optional_parameter_declaration(parameter)
247+
}
248+
213249
/**
214250
* Alias for the predicate `has_asserts_keyword` defined in the .dbscheme.
215251
* Use `PredicateTypeExpr#hasAssertsKeyword() instead.
216-
*/
252+
*/
217253
deprecated predicate hasAssertsKeyword(PredicateTypeExpr node) { has_asserts_keyword(node) }
254+
218255
/**
219256
* Alias for the predicate `js_parse_errors` defined in the .dbscheme.
220257
* Use the `JSParseError` class instead.
221-
*/
222-
deprecated predicate jsParseErrors(JSParseError id, TopLevel toplevel, string message, string line) { js_parse_errors(id, toplevel, message, line) }
258+
*/
259+
deprecated predicate jsParseErrors(JSParseError id, TopLevel toplevel, string message, string line) {
260+
js_parse_errors(id, toplevel, message, line)
261+
}
262+
223263
/**
224264
* Alias for the predicate `regexp_parse_errors` defined in the .dbscheme.
225265
* Use the `RegExpParseError` class instead.
226-
*/
227-
deprecated predicate regexpParseErrors(RegExpParseError id, RegExpTerm regexp, string message) { regexp_parse_errors(id, regexp, message) }
266+
*/
267+
deprecated predicate regexpParseErrors(RegExpParseError id, RegExpTerm regexp, string message) {
268+
regexp_parse_errors(id, regexp, message)
269+
}
270+
228271
/**
229272
* Alias for the predicate `is_greedy` defined in the .dbscheme.
230273
* Use `RegExpQuantifier#isGreedy` instead.
231-
*/
274+
*/
232275
deprecated predicate isGreedy(RegExpQuantifier id) { is_greedy(id) }
276+
233277
/**
234278
* Alias for the predicate `range_quantifier_lower_bound` defined in the .dbscheme.
235279
* Use `RegExpRange#getLowerBound()` instead.
236-
*/
237-
deprecated predicate rangeQuantifierLowerBound(RegExpRange id, int lo) { range_quantifier_lower_bound(id, lo) }
280+
*/
281+
deprecated predicate rangeQuantifierLowerBound(RegExpRange id, int lo) {
282+
range_quantifier_lower_bound(id, lo)
283+
}
284+
238285
/**
239286
* Alias for the predicate `range_quantifier_upper_bound` defined in the .dbscheme.
240287
* Use `RegExpRange#getUpperBound() instead.
241-
*/
242-
deprecated predicate rangeQuantifierUpperBound(RegExpRange id, int hi) { range_quantifier_upper_bound(id, hi) }
288+
*/
289+
deprecated predicate rangeQuantifierUpperBound(RegExpRange id, int hi) {
290+
range_quantifier_upper_bound(id, hi)
291+
}
292+
243293
/**
244294
* Alias for the predicate `is_capture` defined in the .dbscheme.
245295
* Use `RegExpGroup#isCapture()` instead.
246-
*/
296+
*/
247297
deprecated predicate isCapture(RegExpGroup id, int number) { is_capture(id, number) }
298+
248299
/**
249300
* Alias for the predicate `is_named_capture` defined in the .dbscheme.
250301
* Use `RegExpGroup#isNamed()` instead.
251-
*/
302+
*/
252303
deprecated predicate isNamedCapture(RegExpGroup id, string name) { is_named_capture(id, name) }
304+
253305
/**
254306
* Alias for the predicate `is_inverted` defined in the .dbscheme.
255307
* Use `RegExpCharacterClass#isInverted()` instead.
256-
*/
308+
*/
257309
deprecated predicate isInverted(RegExpCharacterClass id) { is_inverted(id) }
310+
258311
/**
259312
* Alias for the predicate `regexp_const_value` defined in the .dbscheme.
260313
* Use `RegExpConstant#getValue()` instead.
261-
*/
262-
deprecated predicate regexpConstValue(RegExpConstant id, string value) { regexp_const_value(id, value) }
314+
*/
315+
deprecated predicate regexpConstValue(RegExpConstant id, string value) {
316+
regexp_const_value(id, value)
317+
}
318+
263319
/**
264320
* Alias for the predicate `char_class_escape` defined in the .dbscheme.
265321
* Use `RegExpCharacterClassEscape#getValue()` instead.
266-
*/
267-
deprecated predicate charClassEscape(RegExpCharacterClassEscape id, string value) { char_class_escape(id, value) }
322+
*/
323+
deprecated predicate charClassEscape(RegExpCharacterClassEscape id, string value) {
324+
char_class_escape(id, value)
325+
}
326+
268327
/**
269328
* Alias for the predicate `named_backref` defined in the .dbscheme.
270329
* Use `RegExpBackRef#getName()` instead.
271-
*/
330+
*/
272331
deprecated predicate namedBackref(RegExpBackRef id, string name) { named_backref(id, name) }
332+
273333
/**
274334
* Alias for the predicate `unicode_property_escapename` defined in the .dbscheme.
275335
* Use `RegExpUnicodePropertyEscape#getName()` instead.
276-
*/
277-
deprecated predicate unicodePropertyEscapeName(RegExpUnicodePropertyEscape id, string name) { unicode_property_escapename(id, name) }
336+
*/
337+
deprecated predicate unicodePropertyEscapeName(RegExpUnicodePropertyEscape id, string name) {
338+
unicode_property_escapename(id, name)
339+
}
340+
278341
/**
279342
* Alias for the predicate `unicode_property_escapevalue` defined in the .dbscheme.
280343
* Use `RegExpUnicodePropertyEscape#getValue()` instead.
281-
*/
282-
deprecated predicate unicodePropertyEscapeValue(RegExpUnicodePropertyEscape id, string value) { unicode_property_escapevalue(id, value) }
344+
*/
345+
deprecated predicate unicodePropertyEscapeValue(RegExpUnicodePropertyEscape id, string value) {
346+
unicode_property_escapevalue(id, value)
347+
}
348+
283349
/**
284350
* Alias for the predicate `is_generator` defined in the .dbscheme.
285351
* Use `Function#isGenerator()` instead.
286-
*/
352+
*/
287353
deprecated predicate isGenerator(Function fun) { is_generator(fun) }
354+
288355
/**
289356
* Alias for the predicate `has_rest_parameter` defined in the .dbscheme.
290357
* Use `Function#hasRestParameter()` instead.
291-
*/
358+
*/
292359
deprecated predicate hasRestParameter(Function fun) { has_rest_parameter(fun) }
360+
293361
/**
294362
* Alias for the predicate `is_async` defined in the .dbscheme.
295363
* Use `Function#isAsync()` instead.
296-
*/
364+
*/
297365
deprecated predicate isAsync(Function fun) { is_async(fun) }

javascript/ql/src/semmle/javascript/Expr.qll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,10 +1849,10 @@ class AssignExpr extends @assign_expr, Assignment {
18491849
}
18501850

18511851
private class TCompoundAssignExpr =
1852-
@assign_add_expr or @assign_sub_expr or @assign_mul_expr or @assign_div_expr or @assign_mod_expr or
1853-
@assign_exp_expr or @assign_lshift_expr or @assign_rshift_expr or @assign_urshift_expr or
1854-
@assign_or_expr or @assign_xor_expr or @assign_and_expr or @assignlogandexpr or @assignlogorexpr or
1855-
@assignnullishcoalescingexpr;
1852+
@assign_add_expr or @assign_sub_expr or @assign_mul_expr or @assign_div_expr or
1853+
@assign_mod_expr or @assign_exp_expr or @assign_lshift_expr or @assign_rshift_expr or
1854+
@assign_urshift_expr or @assign_or_expr or @assign_xor_expr or @assign_and_expr or
1855+
@assignlogandexpr or @assignlogorexpr or @assignnullishcoalescingexpr;
18561856

18571857
/**
18581858
* A compound assign expression.

javascript/ql/src/semmle/javascript/TypeScript.qll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,8 @@ class NamespaceAccess extends TypeExpr, NamespaceRef, @namespace_access {
12811281
/**
12821282
* An identifier that refers to a namespace from inside a type annotation.
12831283
*/
1284-
class LocalNamespaceAccess extends NamespaceAccess, LexicalAccess, Identifier, @local_namespace_access {
1284+
class LocalNamespaceAccess extends NamespaceAccess, LexicalAccess, Identifier,
1285+
@local_namespace_access {
12851286
override Identifier getIdentifier() { result = this }
12861287

12871288
/** Gets the local name being accessed. */

0 commit comments

Comments
 (0)