diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java index 34e6dda3c64..859977395c0 100644 --- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java +++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java @@ -590,7 +590,7 @@ public class ASTExtractor { trapwriter.addTuple("literals", valueString, source, key); Position start = nd.getLoc().getStart(); com.semmle.util.locations.Position startPos = new com.semmle.util.locations.Position(start.getLine(), start.getColumn() + 1 /* Convert from 0-based to 1-based. */, start.getOffset()); - + if (nd.isRegExp()) { OffsetTranslation offsets = new OffsetTranslation(); offsets.set(0, 1); // skip the initial '/' @@ -622,7 +622,7 @@ public class ASTExtractor { /** * Constant-folds simple string concatenations in `exp` while keeping an offset translation * that tracks back to the original source. - */ + */ private Pair getStringConcatResult(Expression exp) { if (exp instanceof BinaryExpression) { BinaryExpression be = (BinaryExpression) exp; @@ -636,7 +636,7 @@ public class ASTExtractor { if (str.length() > 1000) { return null; } - + int delta = be.getRight().getLoc().getStart().getOffset() - be.getLeft().getLoc().getStart().getOffset(); int offset = left.fst().length(); return Pair.make(str, left.snd().append(right.snd(), offset, delta)); @@ -848,14 +848,14 @@ public class ASTExtractor { public Label visit(BinaryExpression nd, Context c) { Label key = super.visit(nd, c); if (nd.getOperator().equals("in") && nd.getLeft() instanceof Identifier && ((Identifier)nd.getLeft()).getName().startsWith("#")) { - // this happens with Ergonomic brand checks for Private Fields (see https://github.com/tc39/proposal-private-fields-in-in). + // this happens with Ergonomic brand checks for Private Fields (see https://github.com/tc39/proposal-private-fields-in-in). // it's the only case where private field identifiers are used not as a field. visit(nd.getLeft(), key, 0, IdContext.LABEL, true); } else { visit(nd.getLeft(), key, 0, true); } visit(nd.getRight(), key, 1, true); - + extractRegxpFromBinop(nd, c); return key; } @@ -1815,7 +1815,7 @@ public class ASTExtractor { visit(nd.getLocal(), lbl, 1, nd.hasTypeKeyword() ? IdContext.TYPE_ONLY_IMPORT : c.idcontext); if (nd.hasTypeKeyword()) { trapwriter.addTuple("has_type_keyword", lbl); - } + } return lbl; }