diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java index 6ffd7659f27..d07f7b6fdc8 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java @@ -58,7 +58,8 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { private static final TokenSet BINARY_OPERATIONS = TokenSet.orSet(JetTokens.AUGMENTED_ASSIGNMENTS, TokenSet.create(JetTokens.PLUS, JetTokens.MINUS, JetTokens.MUL, JetTokens.DIV, JetTokens.PERC, JetTokens.RANGE, - JetTokens.LT, JetTokens.GT, JetTokens.LTEQ, JetTokens.GTEQ)); + JetTokens.LT, JetTokens.GT, JetTokens.LTEQ, JetTokens.GTEQ, + JetTokens.IDENTIFIER)); private final Map anonymousSubclassesCount = new HashMap(); diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.java b/compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.java new file mode 100644 index 00000000000..7b299431815 --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.java @@ -0,0 +1,5 @@ +class JavaClass { + void doSomething(Runnable i) { + i.run(); + } +} diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.kt b/compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.kt new file mode 100644 index 00000000000..969631bbd61 --- /dev/null +++ b/compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.kt @@ -0,0 +1,7 @@ +fun box(): String { + val obj = JavaClass() + + var v = "FAIL" + obj doSomething { v = "OK" } + return v +} diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index 189074f3d8e..3cacb6ff849 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -262,6 +262,11 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/get.kt"); } + @TestMetadata("infixCall.kt") + public void testInfixCall() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.kt"); + } + @TestMetadata("invoke.kt") public void testInvoke() throws Exception { doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/invoke.kt");