From 22794cbf64021031fd4d1977a0fc4d5596d6041d Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 28 Aug 2012 18:20:09 +0400 Subject: [PATCH] Fix for EA-38626 - can't find class delegate for JetLightClass constructed for kotlin enum entry. --- .../jet/asJava/JavaElementFinder.java | 12 ++-- .../asJava/findClasses/FromEnumEntry.kt | 18 +++++ compiler/tests/compiler-tests.iml | 1 + .../jet/asJava/JavaElementFinderTest.java | 70 +++++++++++++++++++ 4 files changed, 97 insertions(+), 4 deletions(-) create mode 100644 compiler/testData/asJava/findClasses/FromEnumEntry.kt create mode 100644 compiler/tests/org/jetbrains/jet/asJava/JavaElementFinderTest.java diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java index 699eaa54a29..4aaec962799 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java @@ -136,11 +136,15 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade if (localName != null) { FqName fqn = QualifiedNamesUtil.combine(containerFqn, Name.identifier(localName)); if (qualifiedName.equals(fqn)) { - answer.add(new JetLightClass(psiManager, file, qualifiedName)); + if (!(declaration instanceof JetEnumEntry)) { + answer.add(new JetLightClass(psiManager, file, qualifiedName)); + } } - else { - for (JetDeclaration child : ((JetClassOrObject) declaration).getDeclarations()) { - scanClasses(answer, child, qualifiedName, fqn, file); + else if (QualifiedNamesUtil.isSubpackageOf(qualifiedName, fqn)) { + if (!(declaration instanceof JetEnumEntry)) { + for (JetDeclaration child : ((JetClassOrObject) declaration).getDeclarations()) { + scanClasses(answer, child, qualifiedName, fqn, file); + } } } } diff --git a/compiler/testData/asJava/findClasses/FromEnumEntry.kt b/compiler/testData/asJava/findClasses/FromEnumEntry.kt new file mode 100644 index 00000000000..b1955a07301 --- /dev/null +++ b/compiler/testData/asJava/findClasses/FromEnumEntry.kt @@ -0,0 +1,18 @@ +enum class Direction { + NORTH + SOUTH(val x : Int) { + fun again() : String { + return "Hello" + } + + class Hello + } + WEST { + class Some { + fun test() : Int { + return 12 + 14 + } + } + } + EAST +} \ No newline at end of file diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml index cbab9fe5a6c..da889f38b4b 100644 --- a/compiler/tests/compiler-tests.iml +++ b/compiler/tests/compiler-tests.iml @@ -12,6 +12,7 @@ + diff --git a/compiler/tests/org/jetbrains/jet/asJava/JavaElementFinderTest.java b/compiler/tests/org/jetbrains/jet/asJava/JavaElementFinderTest.java new file mode 100644 index 00000000000..10bf0d3a901 --- /dev/null +++ b/compiler/tests/org/jetbrains/jet/asJava/JavaElementFinderTest.java @@ -0,0 +1,70 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.asJava; + +import com.intellij.psi.PsiClass; +import com.intellij.psi.search.GlobalSearchScope; +import org.jetbrains.jet.JetLiteFixture; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.jet.config.CommonConfigurationKeys; +import org.jetbrains.jet.config.CompilerConfiguration; + +/** + * @author Nikolay Krasko + */ +public class JavaElementFinderTest extends JetLiteFixture { + private JavaElementFinder finder; + + public JavaElementFinderTest() { + super("asJava/findClasses"); + } + + @Override + protected JetCoreEnvironment createEnvironment() { + CompilerConfiguration configuration = new CompilerConfiguration(); + + configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, getTestDataPath() + "/asJava/findClasses/" + getTestName(false) + ".kt"); + + return new JetCoreEnvironment(getTestRootDisposable(), configuration); + } + + @Override + public void setUp() throws Exception { + super.setUp(); + finder = new JavaElementFinder(getProject()); + } + + public void testFromEnumEntry() { + assertClass("Direction"); + assertNoClass("Direction.NORTH"); + assertNoClass("Direction.SOUTH"); + assertNoClass("Direction.WEST"); + // TODO: assertClass("Direction.SOUTH.Hello"); + // TODO: assertClass("Direction.WEST.Some"); + } + + private void assertClass(String qualifiedName) { + PsiClass psiClass = finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject())); + assertNotNull(String.format("Class with fqn='%s' wasn't found.", qualifiedName), psiClass); + assertTrue(String.format("Class with fqn='%s' is not valid.", qualifiedName), psiClass.isValid()); + } + + private void assertNoClass(String qualifiedName) { + assertNull(String.format("Class with fqn='%s' isn't expected to be found.", qualifiedName), + finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject()))); + } +}