Skip to content

Commit 6f28ddf

Browse files
erik-krogherik-krogh
committed
proper support for this inside a JSX-name
1 parent 3469ad7 commit 6f28ddf

File tree

14 files changed

+138
-7
lines changed

14 files changed

+138
-7
lines changed

‎javascript/extractor/src/com/semmle/jcorn/jsx/JSXParser.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.semmle.js.ast.jsx.JSXNamespacedName;
3636
import com.semmle.js.ast.jsx.JSXOpeningElement;
3737
import com.semmle.js.ast.jsx.JSXSpreadAttribute;
38+
import com.semmle.js.ast.jsx.JSXThisExpr;
3839
import com.semmle.util.data.Either;
3940
import java.util.ArrayList;
4041
import java.util.List;
@@ -225,22 +226,26 @@ private String getQualifiedJSXName(Object object) {
225226
}
226227

227228
/** Parse next token as JSX identifier */
228-
private JSXIdentifier jsx_parseIdentifier() {
229+
private IJSXName jsx_parseIdentifier(boolean expectThisExpr) {
229230
SourceLocation loc = new SourceLocation(this.startLoc);
230231
String name = null;
231232
if (this.type == jsxName) name = String.valueOf(this.value);
232233
else if (this.type.keyword != null) name = this.type.keyword;
233234
else this.unexpected();
234235
this.next();
235-
return this.finishNode(new JSXIdentifier(loc, name));
236+
if (expectThisExpr && name.equals("this")) {
237+
return this.finishNode(new JSXThisExpr(loc));
238+
} else {
239+
return this.finishNode(new JSXIdentifier(loc, name));
240+
}
236241
}
237242

238243
/** Parse namespaced identifier. */
239244
private IJSXName jsx_parseNamespacedName() {
240245
SourceLocation loc = new SourceLocation(this.startLoc);
241-
JSXIdentifier namespace = this.jsx_parseIdentifier();
242-
if (!((JSXOptions) options).allowNamespaces || !this.eat(colon)) return namespace;
243-
return this.finishNode(new JSXNamespacedName(loc, namespace, this.jsx_parseIdentifier()));
246+
IJSXName namespace = this.jsx_parseIdentifier(true);
247+
if (namespace instanceof JSXThisExpr || (!((JSXOptions) options).allowNamespaces || !this.eat(colon))) return namespace;
248+
return this.finishNode(new JSXNamespacedName(loc, (JSXIdentifier)namespace, (JSXIdentifier)this.jsx_parseIdentifier(false)));
244249
}
245250

246251
/**
@@ -258,7 +263,7 @@ private IJSXName jsx_parseElementName() {
258263
}
259264
while (this.eat(dot)) {
260265
SourceLocation loc = new SourceLocation(startPos);
261-
node = this.finishNode(new JSXMemberExpression(loc, node, this.jsx_parseIdentifier()));
266+
node = this.finishNode(new JSXMemberExpression(loc, node, (JSXIdentifier)this.jsx_parseIdentifier(false)));
262267
}
263268
return node;
264269
}

‎javascript/extractor/src/com/semmle/js/ast/AST2JSON.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.semmle.js.ast.jsx.JSXNamespacedName;
1616
import com.semmle.js.ast.jsx.JSXOpeningElement;
1717
import com.semmle.js.ast.jsx.JSXSpreadAttribute;
18+
import com.semmle.js.ast.jsx.JSXThisExpr;
1819
import com.semmle.ts.ast.ExportWholeDeclaration;
1920
import com.semmle.ts.ast.ExternalModuleReference;
2021
import com.semmle.ts.ast.ImportWholeDeclaration;
@@ -635,6 +636,11 @@ public JsonElement visit(JSXIdentifier nd, Void c) {
635636
return result;
636637
}
637638

639+
@Override
640+
public JsonElement visit(JSXThisExpr nd, Void c) {
641+
return this.mkNode(nd, "JSXThisExpr");
642+
}
643+
638644
@Override
639645
public JsonElement visit(JSXMemberExpression nd, Void c) {
640646
JsonObject result = this.mkNode(nd);

‎javascript/extractor/src/com/semmle/js/ast/DefaultVisitor.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.semmle.js.ast.jsx.JSXNamespacedName;
1515
import com.semmle.js.ast.jsx.JSXOpeningElement;
1616
import com.semmle.js.ast.jsx.JSXSpreadAttribute;
17+
import com.semmle.js.ast.jsx.JSXThisExpr;
1718
import com.semmle.ts.ast.ArrayTypeExpr;
1819
import com.semmle.ts.ast.ConditionalTypeExpr;
1920
import com.semmle.ts.ast.DecoratorList;
@@ -498,6 +499,11 @@ public R visit(JSXIdentifier nd, C c) {
498499
return visit((IJSXName) nd, c);
499500
}
500501

502+
@Override
503+
public R visit(JSXThisExpr nd, C c) {
504+
return visit((IJSXName) nd, c);
505+
}
506+
501507
@Override
502508
public R visit(JSXMemberExpression nd, C c) {
503509
return visit((IJSXName) nd, c);

‎javascript/extractor/src/com/semmle/js/ast/NodeCopier.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.semmle.js.ast.jsx.JSXNamespacedName;
1111
import com.semmle.js.ast.jsx.JSXOpeningElement;
1212
import com.semmle.js.ast.jsx.JSXSpreadAttribute;
13+
import com.semmle.js.ast.jsx.JSXThisExpr;
1314
import com.semmle.ts.ast.ArrayTypeExpr;
1415
import com.semmle.ts.ast.ConditionalTypeExpr;
1516
import com.semmle.ts.ast.DecoratorList;
@@ -567,6 +568,11 @@ public INode visit(JSXIdentifier nd, Void c) {
567568
return new JSXIdentifier(visit(nd.getLoc()), nd.getName());
568569
}
569570

571+
@Override
572+
public INode visit(JSXThisExpr nd, Void c) {
573+
return new JSXThisExpr(visit(nd.getLoc()));
574+
}
575+
570576
@Override
571577
public INode visit(JSXMemberExpression nd, Void c) {
572578
return new JSXMemberExpression(visit(nd.getLoc()), copy(nd.getObject()), copy(nd.getName()));

‎javascript/extractor/src/com/semmle/js/ast/Visitor.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.semmle.js.ast.jsx.JSXNamespacedName;
1111
import com.semmle.js.ast.jsx.JSXOpeningElement;
1212
import com.semmle.js.ast.jsx.JSXSpreadAttribute;
13+
import com.semmle.js.ast.jsx.JSXThisExpr;
1314
import com.semmle.ts.ast.ArrayTypeExpr;
1415
import com.semmle.ts.ast.ConditionalTypeExpr;
1516
import com.semmle.ts.ast.DecoratorList;
@@ -200,6 +201,8 @@ public interface Visitor<C, R> {
200201

201202
public R visit(JSXIdentifier nd, C c);
202203

204+
public R visit(JSXThisExpr nd, C c);
205+
203206
public R visit(JSXMemberExpression nd, C c);
204207

205208
public R visit(JSXNamespacedName nd, C c);

‎javascript/extractor/src/com/semmle/js/ast/jsx/JSXThisExpr.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.semmle.js.ast.jsx;
2+
3+
import com.semmle.js.ast.ThisExpression;
4+
import com.semmle.js.ast.SourceLocation;
5+
import com.semmle.js.ast.Visitor;
6+
7+
public class JSXThisExpr extends ThisExpression implements IJSXName {
8+
public JSXThisExpr(SourceLocation loc) {
9+
super(loc);
10+
}
11+
12+
@Override
13+
public <C, R> R accept(Visitor<C, R> v, C c) {
14+
return v.visit(this, c);
15+
}
16+
17+
@Override
18+
public String getQualifiedName() {
19+
return "this";
20+
}
21+
}

‎javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
import com.semmle.js.ast.TaggedTemplateExpression;
8383
import com.semmle.js.ast.TemplateElement;
8484
import com.semmle.js.ast.TemplateLiteral;
85+
import com.semmle.js.ast.ThisExpression;
8586
import com.semmle.js.ast.ThrowStatement;
8687
import com.semmle.js.ast.TryStatement;
8788
import com.semmle.js.ast.UnaryExpression;
@@ -105,6 +106,7 @@
105106
import com.semmle.js.ast.jsx.JSXNamespacedName;
106107
import com.semmle.js.ast.jsx.JSXOpeningElement;
107108
import com.semmle.js.ast.jsx.JSXSpreadAttribute;
109+
import com.semmle.js.ast.jsx.JSXThisExpr;
108110
import com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase;
109111
import com.semmle.js.extractor.ExtractorConfig.Platform;
110112
import com.semmle.js.extractor.ExtractorConfig.SourceType;
@@ -1641,6 +1643,11 @@ public Label visit(JSXIdentifier nd, Context c) {
16411643
return visit((Identifier) nd, c);
16421644
}
16431645

1646+
@Override
1647+
public Label visit(JSXThisExpr nd, Context c) {
1648+
return visit((ThisExpression) nd, c);
1649+
}
1650+
16441651
@Override
16451652
public Label visit(JSXMemberExpression nd, Context c) {
16461653
Label key = super.visit(nd, c);

‎javascript/extractor/src/com/semmle/js/extractor/ExprKinds.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.semmle.js.ast.LogicalExpression;
1919
import com.semmle.js.ast.MemberExpression;
2020
import com.semmle.js.ast.MetaProperty;
21+
import com.semmle.js.ast.ThisExpression;
2122
import com.semmle.js.ast.UnaryExpression;
2223
import com.semmle.js.ast.UpdateExpression;
2324
import com.semmle.js.ast.XMLAnyName;
@@ -28,6 +29,7 @@
2829
import com.semmle.js.ast.jsx.JSXIdentifier;
2930
import com.semmle.js.ast.jsx.JSXMemberExpression;
3031
import com.semmle.js.ast.jsx.JSXSpreadAttribute;
32+
import com.semmle.js.ast.jsx.JSXThisExpr;
3133
import com.semmle.js.extractor.ASTExtractor.IdContext;
3234
import com.semmle.ts.ast.DecoratorList;
3335
import com.semmle.ts.ast.ExpressionWithTypeArguments;
@@ -191,6 +193,11 @@ public Integer visit(JSXIdentifier nd, Void c) {
191193
return visit((Identifier) nd, c);
192194
}
193195

196+
@Override
197+
public Integer visit(JSXThisExpr nd, Void c) {
198+
return visit((ThisExpression) nd, c);
199+
}
200+
194201
@Override
195202
public Integer visit(LogicalExpression nd, Void q) {
196203
return binOpKinds.get(nd.getOperator());

‎javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
import com.semmle.js.ast.jsx.JSXMemberExpression;
111111
import com.semmle.js.ast.jsx.JSXOpeningElement;
112112
import com.semmle.js.ast.jsx.JSXSpreadAttribute;
113+
import com.semmle.js.ast.jsx.JSXThisExpr;
113114
import com.semmle.js.parser.JSParser.Result;
114115
import com.semmle.ts.ast.ArrayTypeExpr;
115116
import com.semmle.ts.ast.ConditionalTypeExpr;
@@ -2356,7 +2357,7 @@ private IJSXName convertJSXName(Expression e) {
23562357
convertJSXName(me.getObject()),
23572358
(JSXIdentifier) convertJSXName(me.getProperty()));
23582359
}
2359-
if (e instanceof ThisExpression) return new JSXIdentifier(e.getLoc(), "this");
2360+
if (e instanceof ThisExpression) return new JSXThisExpr(e.getLoc());
23602361
return (IJSXName) e;
23612362
}
23622363

‎javascript/ql/src/semmle/javascript/JSX.qll‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ class JSXQualifiedName extends Expr, @jsxqualifiedname {
181181
class JSXName extends Expr {
182182
JSXName() {
183183
this instanceof Identifier or
184+
this instanceof ThisExpr or
184185
this.(DotExpr).getBase() instanceof JSXName or
185186
this instanceof JSXQualifiedName
186187
}
@@ -198,6 +199,9 @@ class JSXName extends Expr {
198199
exists(JSXQualifiedName qual | qual = this |
199200
result = qual.getNamespace().getName() + ":" + qual.getName().getName()
200201
)
202+
or
203+
this instanceof ThisExpr and
204+
result = "this"
201205
}
202206
}
203207

0 commit comments

Comments
 (0)