From 8085ec8b0be34186718b4067333705afce5f5d43 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Wed, 27 Nov 2019 14:56:05 +0300
Subject: [PATCH] [FIR-TEST] Add test with ambiguity between java field and
 java accessor

---
 .../resolve/problems/javaFieldVsAccessor.kt      | 16 ++++++++++++++++
 .../resolve/problems/javaFieldVsAccessor.txt     |  5 +++++
 .../kotlin/fir/FirDiagnosticsTestGenerated.java  |  5 +++++
 3 files changed, 26 insertions(+)
 create mode 100644 compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt
 create mode 100644 compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.txt

diff --git a/compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt b/compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt
new file mode 100644
index 00000000000..def51571152
--- /dev/null
+++ b/compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt
@@ -0,0 +1,16 @@
+// FILE: A.java
+
+public class A {
+    public int x;
+
+    public String getX() {
+        return ""
+    }
+}
+
+// FILE: main.kt
+
+fun test(a: A) {
+    val int = a.<!AMBIGUITY!>x<!> // <- should be int
+    val string = a.getX()
+}
\ No newline at end of file
diff --git a/compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.txt b/compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.txt
new file mode 100644
index 00000000000..f5be316b83f
--- /dev/null
+++ b/compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.txt
@@ -0,0 +1,5 @@
+FILE: main.kt
+    public final fun test(a: R|A|): R|kotlin/Unit| {
+        lval int: <ERROR TYPE REF: Ambiguity: x, [/A.x, /A.x]> = R|<local>/a|.<Ambiguity: x, [/A.x, /A.x]>#
+        lval string: R|ft<kotlin/String, kotlin/String?>!| = R|<local>/a|.R|/A.getX|()
+    }
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
index 1400dd2ac3a..b6fc04878b3 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
@@ -883,6 +883,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             runTest("compiler/fir/resolve/testData/resolve/problems/javaAccessorConversion.kt");
         }
 
+        @TestMetadata("javaFieldVsAccessor.kt")
+        public void testJavaFieldVsAccessor() throws Exception {
+            runTest("compiler/fir/resolve/testData/resolve/problems/javaFieldVsAccessor.kt");
+        }
+
         @TestMetadata("localFunctionsHiding.kt")
         public void testLocalFunctionsHiding() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/localFunctionsHiding.kt");