From cff0c35987ec374e1d8da4b25760c736525d450e Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 8 Oct 2014 20:28:31 +0400 Subject: [PATCH] Checked that KT-3596 is not reproducible --- .../completion/basic/common/ImportedEnumMembers.kt | 10 ++++++++++ .../completion/handlers/ImportedEnumMember.kt | 13 +++++++++++++ .../completion/handlers/ImportedEnumMember.kt.after | 13 +++++++++++++ .../completion/JSBasicCompletionTestGenerated.java | 6 ++++++ .../completion/JvmBasicCompletionTestGenerated.java | 11 +++++++---- .../handlers/BasicCompletionHandlerTest.kt | 2 ++ .../jet/shortenRefs/ShortenRefsTestGenerated.java | 5 ++++- 7 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 idea/testData/completion/basic/common/ImportedEnumMembers.kt create mode 100644 idea/testData/completion/handlers/ImportedEnumMember.kt create mode 100644 idea/testData/completion/handlers/ImportedEnumMember.kt.after diff --git a/idea/testData/completion/basic/common/ImportedEnumMembers.kt b/idea/testData/completion/basic/common/ImportedEnumMembers.kt new file mode 100644 index 00000000000..6aaf2acacb0 --- /dev/null +++ b/idea/testData/completion/basic/common/ImportedEnumMembers.kt @@ -0,0 +1,10 @@ +package p + +import java.lang.Character.* + +fun foo() { + M +} + +// EXIST_JAVA_ONLY: MIN_RADIX +// EXIST_JAVA_ONLY: MATH_SYMBOL diff --git a/idea/testData/completion/handlers/ImportedEnumMember.kt b/idea/testData/completion/handlers/ImportedEnumMember.kt new file mode 100644 index 00000000000..e7f33ff79a1 --- /dev/null +++ b/idea/testData/completion/handlers/ImportedEnumMember.kt @@ -0,0 +1,13 @@ +package foo + +import foo.Foo.* + +enum class Foo { + AAA +} + +fun take(a: Any){} + +fun test() { + take(A) +} diff --git a/idea/testData/completion/handlers/ImportedEnumMember.kt.after b/idea/testData/completion/handlers/ImportedEnumMember.kt.after new file mode 100644 index 00000000000..116e0d94861 --- /dev/null +++ b/idea/testData/completion/handlers/ImportedEnumMember.kt.after @@ -0,0 +1,13 @@ +package foo + +import foo.Foo.* + +enum class Foo { + AAA +} + +fun take(a: Any){} + +fun test() { + take(AAA) +} diff --git a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java index ca65b0b1af2..fd333735c76 100644 --- a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java @@ -234,6 +234,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes doTest(fileName); } + @TestMetadata("ImportedEnumMembers.kt") + public void testImportedEnumMembers() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ImportedEnumMembers.kt"); + doTest(fileName); + } + @TestMetadata("InCallExpression.kt") public void testInCallExpression() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InCallExpression.kt"); diff --git a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java index aa308f57a50..f5c73272202 100644 --- a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java @@ -17,13 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.JUnit3RunnerWithInners; +import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; @@ -234,6 +231,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT doTest(fileName); } + @TestMetadata("ImportedEnumMembers.kt") + public void testImportedEnumMembers() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ImportedEnumMembers.kt"); + doTest(fileName); + } + @TestMetadata("InCallExpression.kt") public void testInCallExpression() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InCallExpression.kt"); diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt b/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt index 02fc6778f91..dafa2ffc8d0 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt +++ b/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt @@ -153,4 +153,6 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){ fun testInfixCall() = doTest(1, "to", null, null, '\n') fun testInfixCallOnSpace() = doTest(1, "to", null, null, ' ') + + fun testImportedEnumMember() { doTest(1, "AAA", null, null, '\n') } } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java index 92b57d24c03..5af901c5ec4 100644 --- a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java @@ -17,10 +17,13 @@ package org.jetbrains.jet.shortenRefs; import com.intellij.testFramework.TestDataPath; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.junit.runner.RunWith; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern;