azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix splitExportedSuspendInlineFunctionDeclarations usages, argument must not be null

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-12-14 17:07:10 +03:00
parent 93882736ed
commit 9ad899fb01
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java
+8 -2
View File
@@ -355,23 +355,29 @@ public class JsInliner extends JsVisitorWithContextImpl {
if (e instanceof JsBinaryOperation) { if (e instanceof JsBinaryOperation) {
JsBinaryOperation binOp = (JsBinaryOperation) e; JsBinaryOperation binOp = (JsBinaryOperation) e;
if (binOp.getOperator() == JsBinaryOperator.ASG) { if (binOp.getOperator() == JsBinaryOperator.ASG) {
JsFunction splitSuspendInlineFunction = splitExportedSuspendInlineFunctionDeclarations(binOp.getArg2()); JsExpression argument2 = binOp.getArg2();
if (argument2 != null) {
JsFunction splitSuspendInlineFunction = splitExportedSuspendInlineFunctionDeclarations(argument2);
if (splitSuspendInlineFunction != null) { if (splitSuspendInlineFunction != null) {
binOp.setArg2(splitSuspendInlineFunction); binOp.setArg2(splitSuspendInlineFunction);
} }
} }
} }
}
super.endVisit(x, ctx); super.endVisit(x, ctx);
} }
@Override @Override
public void endVisit(@NotNull JsVars.JsVar x, @NotNull JsContext ctx) { public void endVisit(@NotNull JsVars.JsVar x, @NotNull JsContext ctx) {
JsFunction splitSuspendInlineFunction = splitExportedSuspendInlineFunctionDeclarations(x.getInitExpression()); JsExpression initExpression = x.getInitExpression();
if (initExpression != null) {
JsFunction splitSuspendInlineFunction = splitExportedSuspendInlineFunctionDeclarations(initExpression);
if (splitSuspendInlineFunction != null) { if (splitSuspendInlineFunction != null) {
x.setInitExpression(splitSuspendInlineFunction); x.setInitExpression(splitSuspendInlineFunction);
} }
} }
}
@Nullable @Nullable
private JsFunction splitExportedSuspendInlineFunctionDeclarations(@NotNull JsExpression expression) { private JsFunction splitExportedSuspendInlineFunctionDeclarations(@NotNull JsExpression expression) {