JS parser: fixed JsInvocation mapping
This commit is contained in:
@@ -9,6 +9,6 @@
|
|||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="module" module-name="js.dart-ast" />
|
<orderEntry type="module" module-name="js.dart-ast" />
|
||||||
<orderEntry type="library" name="kotlin-runtime" level="project" />
|
<orderEntry type="library" name="kotlin-runtime" level="project" />
|
||||||
|
<orderEntry type="library" name="intellij-core" level="project" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
||||||
@@ -19,6 +19,7 @@ import com.google.dart.compiler.backend.js.ast.*;
|
|||||||
import com.google.dart.compiler.backend.js.ast.JsLiteral.JsBooleanLiteral;
|
import com.google.dart.compiler.backend.js.ast.JsLiteral.JsBooleanLiteral;
|
||||||
import com.google.dart.compiler.common.SourceInfo;
|
import com.google.dart.compiler.common.SourceInfo;
|
||||||
import com.google.gwt.dev.js.rhino.*;
|
import com.google.gwt.dev.js.rhino.*;
|
||||||
|
import com.intellij.util.SmartList;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
@@ -385,25 +386,21 @@ public class JsParser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private JsInvocation mapCall(Node callNode) throws JsParserException {
|
private JsInvocation mapCall(Node callNode) throws JsParserException {
|
||||||
JsInvocation invocation = new JsInvocation();
|
|
||||||
|
|
||||||
// Map the target expression.
|
// Map the target expression.
|
||||||
//
|
//
|
||||||
Node from = callNode.getFirstChild();
|
Node from = callNode.getFirstChild();
|
||||||
JsExpression to = mapExpression(from);
|
JsExpression qualifier = mapExpression(from);
|
||||||
invocation.setQualifier(to);
|
|
||||||
|
|
||||||
// Iterate over and map the arguments.
|
// Iterate over and map the arguments.
|
||||||
//
|
//
|
||||||
List<JsExpression> args = invocation.getArguments();
|
List<JsExpression> arguments = new SmartList<JsExpression>();
|
||||||
from = from.getNext();
|
from = from.getNext();
|
||||||
while (from != null) {
|
while (from != null) {
|
||||||
to = mapExpression(from);
|
arguments.add(mapExpression(from));
|
||||||
args.add(to);
|
|
||||||
from = from.getNext();
|
from = from.getNext();
|
||||||
}
|
}
|
||||||
|
|
||||||
return invocation;
|
return new JsInvocation(qualifier, arguments);
|
||||||
}
|
}
|
||||||
|
|
||||||
private JsExpression mapConditional(Node condNode) throws JsParserException {
|
private JsExpression mapConditional(Node condNode) throws JsParserException {
|
||||||
|
|||||||
Reference in New Issue
Block a user