From 6ef314ed03dce071eea0f3cf8272059ef020e4ea Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Tue, 11 Nov 2025 11:52:36 +0100 Subject: [PATCH] Javascript: fix errors from upcoming `rules_java` update --- javascript/extractor/src/com/semmle/jcorn/Parser.java | 3 ++- .../extractor/src/com/semmle/jcorn/flow/FlowParser.java | 1 + .../src/com/semmle/js/ast/AFunctionExpression.java | 4 ++-- .../extractor/src/com/semmle/js/ast/ComprehensionBlock.java | 2 +- .../src/com/semmle/js/ast/ComprehensionExpression.java | 2 +- .../extractor/src/com/semmle/js/ast/ForInStatement.java | 2 +- .../extractor/src/com/semmle/js/ast/InvokeExpression.java | 4 ++-- javascript/extractor/src/com/semmle/js/ast/Literal.java | 2 +- .../extractor/src/com/semmle/js/ast/MemberExpression.java | 6 +++--- javascript/extractor/src/com/semmle/js/ast/Property.java | 4 ++-- .../extractor/src/com/semmle/js/ast/TemplateElement.java | 2 +- .../extractor/src/com/semmle/js/ast/UnaryExpression.java | 2 +- .../extractor/src/com/semmle/js/ast/UpdateExpression.java | 2 +- .../extractor/src/com/semmle/js/ast/YieldExpression.java | 2 +- .../extractor/src/com/semmle/js/ast/jsdoc/FunctionType.java | 2 +- .../src/com/semmle/js/ast/jsdoc/UnaryTypeConstructor.java | 2 +- .../src/com/semmle/js/ast/regexp/CharacterClass.java | 2 +- .../extractor/src/com/semmle/js/ast/regexp/Quantifier.java | 2 +- 18 files changed, 24 insertions(+), 22 deletions(-) diff --git a/javascript/extractor/src/com/semmle/jcorn/Parser.java b/javascript/extractor/src/com/semmle/jcorn/Parser.java index 63f49e14891..0fb07bb5433 100644 --- a/javascript/extractor/src/com/semmle/jcorn/Parser.java +++ b/javascript/extractor/src/com/semmle/jcorn/Parser.java @@ -286,6 +286,7 @@ public class Parser { raise(pos, msg, false); } + @SuppressWarnings("ReturnValueIgnored") protected void raise(Position loc, String msg, boolean recoverable) { msg += " (" + loc.getLine() + ":" + loc.getColumn() + ")"; SyntaxError err = new SyntaxError(msg, loc, this.pos); @@ -3114,7 +3115,7 @@ public class Parser { } first = false; } - if (oldStrict == Boolean.FALSE) this.setStrict(false); + if (oldStrict.equals(Boolean.FALSE)) this.setStrict(false); return this.finishNode(new BlockStatement(new SourceLocation(startLoc), body)); } diff --git a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java index cb2dad0f978..7475994c27e 100644 --- a/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java +++ b/javascript/extractor/src/com/semmle/jcorn/flow/FlowParser.java @@ -141,6 +141,7 @@ public class FlowParser extends ESNextParser { options.onRecoverableError(this.onRecoverableError); } + @SuppressWarnings("ReturnValueIgnored") private void commit() { // commit buffered tokens options.onToken(this.onToken); diff --git a/javascript/extractor/src/com/semmle/js/ast/AFunctionExpression.java b/javascript/extractor/src/com/semmle/js/ast/AFunctionExpression.java index e097be125cf..5efe85d4bc5 100644 --- a/javascript/extractor/src/com/semmle/js/ast/AFunctionExpression.java +++ b/javascript/extractor/src/com/semmle/js/ast/AFunctionExpression.java @@ -35,8 +35,8 @@ public abstract class AFunctionExpression extends Expression implements IFunctio id, params, body, - generator == Boolean.TRUE, - async == Boolean.TRUE, + generator.equals(Boolean.TRUE), + async.equals(Boolean.TRUE), typeParameters, parameterTypes, parameterDecorators, diff --git a/javascript/extractor/src/com/semmle/js/ast/ComprehensionBlock.java b/javascript/extractor/src/com/semmle/js/ast/ComprehensionBlock.java index 4c767c5fbed..9b635098f8d 100644 --- a/javascript/extractor/src/com/semmle/js/ast/ComprehensionBlock.java +++ b/javascript/extractor/src/com/semmle/js/ast/ComprehensionBlock.java @@ -10,7 +10,7 @@ public class ComprehensionBlock extends Expression { super("ComprehensionBlock", loc); this.left = left; this.right = right; - this.of = of != Boolean.FALSE; + this.of = !of.equals(Boolean.FALSE); } @Override diff --git a/javascript/extractor/src/com/semmle/js/ast/ComprehensionExpression.java b/javascript/extractor/src/com/semmle/js/ast/ComprehensionExpression.java index b95d9ead5ff..d604d0f7454 100644 --- a/javascript/extractor/src/com/semmle/js/ast/ComprehensionExpression.java +++ b/javascript/extractor/src/com/semmle/js/ast/ComprehensionExpression.java @@ -19,7 +19,7 @@ public class ComprehensionExpression extends Expression { this.body = body; this.blocks = blocks; this.filter = filter; - this.generator = generator == Boolean.TRUE; + this.generator = generator.equals(Boolean.TRUE); } @Override diff --git a/javascript/extractor/src/com/semmle/js/ast/ForInStatement.java b/javascript/extractor/src/com/semmle/js/ast/ForInStatement.java index 579a6198fe1..30b99f53e0e 100644 --- a/javascript/extractor/src/com/semmle/js/ast/ForInStatement.java +++ b/javascript/extractor/src/com/semmle/js/ast/ForInStatement.java @@ -16,7 +16,7 @@ public class ForInStatement extends EnhancedForStatement { public ForInStatement( SourceLocation loc, Node left, Expression right, Statement body, Boolean each) { super("ForInStatement", loc, left, right, body); - this.each = each == Boolean.TRUE; + this.each = each.equals(Boolean.TRUE); } public boolean isEach() { diff --git a/javascript/extractor/src/com/semmle/js/ast/InvokeExpression.java b/javascript/extractor/src/com/semmle/js/ast/InvokeExpression.java index 534f9ffb212..02de600cbdc 100644 --- a/javascript/extractor/src/com/semmle/js/ast/InvokeExpression.java +++ b/javascript/extractor/src/com/semmle/js/ast/InvokeExpression.java @@ -27,8 +27,8 @@ public abstract class InvokeExpression extends Expression implements INodeWithSy this.callee = callee; this.typeArguments = typeArguments; this.arguments = arguments; - this.optional = optional == Boolean.TRUE; - this.onOptionalChain = onOptionalChain == Boolean.TRUE; + this.optional = optional.equals(Boolean.TRUE); + this.onOptionalChain = onOptionalChain.equals(Boolean.TRUE); } /** The callee expression of this invocation. */ diff --git a/javascript/extractor/src/com/semmle/js/ast/Literal.java b/javascript/extractor/src/com/semmle/js/ast/Literal.java index 3c53798b851..c3feb64ccfd 100644 --- a/javascript/extractor/src/com/semmle/js/ast/Literal.java +++ b/javascript/extractor/src/com/semmle/js/ast/Literal.java @@ -76,7 +76,7 @@ public class Literal extends Expression implements ITypeExpression { if (isRegExp()) return false; return value == null || value instanceof Number && ((Number) value).intValue() == 0 - || value == Boolean.FALSE + || value.equals(Boolean.FALSE) || value instanceof String && ((String) value).isEmpty(); } diff --git a/javascript/extractor/src/com/semmle/js/ast/MemberExpression.java b/javascript/extractor/src/com/semmle/js/ast/MemberExpression.java index b540decd48e..14453dabf3d 100644 --- a/javascript/extractor/src/com/semmle/js/ast/MemberExpression.java +++ b/javascript/extractor/src/com/semmle/js/ast/MemberExpression.java @@ -22,9 +22,9 @@ public class MemberExpression extends Expression super("MemberExpression", loc); this.object = object; this.property = property; - this.computed = computed == Boolean.TRUE; - this.optional = optional == Boolean.TRUE; - this.onOptionalChain = onOptionalChain == Boolean.TRUE; + this.computed = computed.equals(Boolean.TRUE); + this.optional = optional.equals(Boolean.TRUE); + this.onOptionalChain = onOptionalChain.equals(Boolean.TRUE); } @Override diff --git a/javascript/extractor/src/com/semmle/js/ast/Property.java b/javascript/extractor/src/com/semmle/js/ast/Property.java index b4da797e76d..4e2b118aedf 100644 --- a/javascript/extractor/src/com/semmle/js/ast/Property.java +++ b/javascript/extractor/src/com/semmle/js/ast/Property.java @@ -59,8 +59,8 @@ public class Property extends Node { } this.rawValue = rawValue; this.kind = Kind.valueOf(StringUtil.uc(kind)); - this.computed = computed == Boolean.TRUE; - this.method = method == Boolean.TRUE; + this.computed = computed.equals(Boolean.TRUE); + this.method = method.equals(Boolean.TRUE); this.decorators = new ArrayList(); } diff --git a/javascript/extractor/src/com/semmle/js/ast/TemplateElement.java b/javascript/extractor/src/com/semmle/js/ast/TemplateElement.java index afebf51e7ee..343596cb808 100644 --- a/javascript/extractor/src/com/semmle/js/ast/TemplateElement.java +++ b/javascript/extractor/src/com/semmle/js/ast/TemplateElement.java @@ -10,7 +10,7 @@ public class TemplateElement extends Expression { super("TemplateElement", loc); this.cooked = cooked; this.raw = raw; - this.tail = tail == Boolean.TRUE; + this.tail = tail.equals(Boolean.TRUE); } @Override diff --git a/javascript/extractor/src/com/semmle/js/ast/UnaryExpression.java b/javascript/extractor/src/com/semmle/js/ast/UnaryExpression.java index c0a77e3bc77..7dc0789a520 100644 --- a/javascript/extractor/src/com/semmle/js/ast/UnaryExpression.java +++ b/javascript/extractor/src/com/semmle/js/ast/UnaryExpression.java @@ -14,7 +14,7 @@ public class UnaryExpression extends Expression { super("UnaryExpression", loc); this.operator = operator; this.argument = argument; - this.prefix = prefix == Boolean.TRUE; + this.prefix = prefix.equals(Boolean.TRUE); } @Override diff --git a/javascript/extractor/src/com/semmle/js/ast/UpdateExpression.java b/javascript/extractor/src/com/semmle/js/ast/UpdateExpression.java index 59a3880a3ee..2178151a12f 100644 --- a/javascript/extractor/src/com/semmle/js/ast/UpdateExpression.java +++ b/javascript/extractor/src/com/semmle/js/ast/UpdateExpression.java @@ -11,7 +11,7 @@ public class UpdateExpression extends Expression { super("UpdateExpression", loc); this.operator = operator; this.argument = argument; - this.prefix = prefix == Boolean.TRUE; + this.prefix = prefix.equals(Boolean.TRUE); } @Override diff --git a/javascript/extractor/src/com/semmle/js/ast/YieldExpression.java b/javascript/extractor/src/com/semmle/js/ast/YieldExpression.java index c8c681d2493..d9f83cbc4da 100644 --- a/javascript/extractor/src/com/semmle/js/ast/YieldExpression.java +++ b/javascript/extractor/src/com/semmle/js/ast/YieldExpression.java @@ -8,7 +8,7 @@ public class YieldExpression extends Expression { public YieldExpression(SourceLocation loc, Expression argument, Boolean delegating) { super("YieldExpression", loc); this.argument = argument; - this.delegating = delegating == Boolean.TRUE; + this.delegating = delegating.equals(Boolean.TRUE); } @Override diff --git a/javascript/extractor/src/com/semmle/js/ast/jsdoc/FunctionType.java b/javascript/extractor/src/com/semmle/js/ast/jsdoc/FunctionType.java index d9298243be0..5b577713956 100644 --- a/javascript/extractor/src/com/semmle/js/ast/jsdoc/FunctionType.java +++ b/javascript/extractor/src/com/semmle/js/ast/jsdoc/FunctionType.java @@ -18,7 +18,7 @@ public class FunctionType extends JSDocTypeExpression { JSDocTypeExpression result) { super(loc, "FunctionType"); this._this = _this; - this._new = _new == Boolean.TRUE; + this._new = _new.equals(Boolean.TRUE); this.params = params; this.result = result; } diff --git a/javascript/extractor/src/com/semmle/js/ast/jsdoc/UnaryTypeConstructor.java b/javascript/extractor/src/com/semmle/js/ast/jsdoc/UnaryTypeConstructor.java index dcded09e66d..79b4d144603 100644 --- a/javascript/extractor/src/com/semmle/js/ast/jsdoc/UnaryTypeConstructor.java +++ b/javascript/extractor/src/com/semmle/js/ast/jsdoc/UnaryTypeConstructor.java @@ -19,7 +19,7 @@ public abstract class UnaryTypeConstructor extends JSDocTypeExpression { String operator) { super(loc, type); this.expression = expression; - this.prefix = prefix == Boolean.TRUE; + this.prefix = prefix.equals(Boolean.TRUE); this.operator = operator; } diff --git a/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClass.java b/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClass.java index 6a46830d851..6abf2dce9e0 100644 --- a/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClass.java +++ b/javascript/extractor/src/com/semmle/js/ast/regexp/CharacterClass.java @@ -11,7 +11,7 @@ public class CharacterClass extends RegExpTerm { public CharacterClass(SourceLocation loc, List elements, Boolean inverted) { super(loc, "CharacterClass"); this.elements = elements; - this.inverted = inverted == Boolean.TRUE; + this.inverted = inverted.equals(Boolean.TRUE); } @Override diff --git a/javascript/extractor/src/com/semmle/js/ast/regexp/Quantifier.java b/javascript/extractor/src/com/semmle/js/ast/regexp/Quantifier.java index 54fd40168d2..49cf765a37c 100644 --- a/javascript/extractor/src/com/semmle/js/ast/regexp/Quantifier.java +++ b/javascript/extractor/src/com/semmle/js/ast/regexp/Quantifier.java @@ -10,7 +10,7 @@ public abstract class Quantifier extends RegExpTerm { public Quantifier(SourceLocation loc, String type, RegExpTerm operand, Boolean greedy) { super(loc, type); this.operand = operand; - this.greedy = greedy == Boolean.TRUE; + this.greedy = greedy.equals(Boolean.TRUE); } /** The quantified term. */