hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-06 19:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

TS: dont create JSON nodes in convertJsxSelfClosingElement

Browse Source
This commit is contained in:
Asger F
2018-11-14 17:33:48 +00:00
parent 0647743333
commit a35061ee79
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java
View File

@@ -1385,7 +1385,7 @@ public class TypeScriptASTConverter {
return new JSXClosingElement(loc, null);
}
private Node convertJsxOpeningElement(JsonObject node, SourceLocation loc) throws ParseError {
private List<IJSXAttribute> convertJsxAttributes(JsonObject node) throws ParseError {
JsonElement attributes = node.get("attributes");
List<IJSXAttribute> convertedAttributes;
if (attributes.isJsonArray()) {
@@ -1393,15 +1393,18 @@ public class TypeScriptASTConverter {
} else {
convertedAttributes = convertChildren(attributes.getAsJsonObject(), "properties");
}
return convertedAttributes;
}
private Node convertJsxOpeningElement(JsonObject node, SourceLocation loc) throws ParseError {
List<IJSXAttribute> convertedAttributes = convertJsxAttributes(node);
return new JSXOpeningElement(loc, convertJSXName(convertChild(node, "tagName")), convertedAttributes, hasChild(node, "selfClosing"));
}
private Node convertJsxSelfClosingElement(JsonObject node,
SourceLocation loc) throws ParseError {
node.remove("kind");
node.add("kind", syntaxKinds.get("JsxOpeningElement"));
node.add("selfClosing", new JsonPrimitive(true));
return new JSXElement(loc, (JSXOpeningElement) convertNode(node), new ArrayList<>(), null);
private Node convertJsxSelfClosingElement(JsonObject node, SourceLocation loc) throws ParseError {
List<IJSXAttribute> convertedAttributes = convertJsxAttributes(node);
JSXOpeningElement opening = new JSXOpeningElement(loc, convertJSXName(convertChild(node, "tagName")), convertedAttributes, true);
return new JSXElement(loc, opening, new ArrayList<>(), null);
}
private Node convertJsxSpreadAttribute(JsonObject node,