From 4896d90c791775b277ce67326cdc3f74103cd007 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 29 Mar 2016 17:16:55 +0300 Subject: [PATCH] [REVERTED] 28b8cfc Alexey Sedunov on 3/22/2016 at 21:26 (committed on 3/24/2016 at 18:42) Spring Support: Show Spring line markers for Kotlin classes --- Changelog.md | 1 - .../kotlin/asJava/KtLightAnnotation.kt | 3 - .../kotlin/asJava/KtLightParameter.java | 11 -- .../src/META-INF/kotlin-spring.xml | 2 - .../lineMarking/KotlinSpringClassAnnotator.kt | 67 --------- .../tests/SpringTestFixtureExtension.kt | 14 -- .../AbstractSpringClassAnnotatorTest.kt | 96 ------------- .../SpringClassAnnotatorTestGenerated.java | 133 ------------------ .../tests/gutter/springGutterTestUtils.kt | 74 ---------- .../KotlinAnnotatedElementsSearcher.kt | 7 +- .../testAnnotationsWithParameters.kt | 3 +- .../gutter/autowiredBeanCandidates/Bean.kt | 17 --- .../autowiredBeanCandidates.test | 9 -- .../gutter/autowiredBeanCandidates/config.xml | 11 -- .../core/gutter/autowiredProperty/Bean.kt | 6 - .../autowiredProperty/autowiredProperty.test | 8 -- .../core/gutter/autowiredProperty/config.xml | 11 -- .../core/gutter/autowiredSetter/Bean.kt | 6 - .../autowiredSetter/autowiredSetter.test | 9 -- .../core/gutter/autowiredSetter/config.xml | 11 -- .../spring/core/gutter/classGutter/Bean.kt | 7 - .../core/gutter/classGutter/classGutter.test | 8 -- .../spring/core/gutter/classGutter/config.xml | 6 - .../AbstractBean.kt | 1 - .../AbstractBeanInheritor.kt | 1 - .../AbstractBeanInheritor2.kt | 1 - ...assGutterAbstractShowMappedInheritors.test | 8 -- .../inheritors.xml | 8 -- .../spring/core/gutter/componentScan/Bean.kt | 3 - .../gutter/componentScan/ComponentScan.kt | 6 - .../componentScan/beans/MyController.kt | 6 - .../componentScan/beans/ResourceGutter.kt | 18 --- .../gutter/componentScan/componentScan.test | 8 -- .../ContextBeanInjectionPoints.kt | 21 --- .../contextBeanInjectionPoints/FooBar.kt | 5 - .../contextBeanInjectionPoints.test | 8 -- ...ContextBeanWithQualifierInjectionPoints.kt | 22 --- .../FooBar.kt | 5 - ...ntextBeanWithQualifierInjectionPoints.test | 9 -- .../spring/core/gutter/innerBean/InnerBean.kt | 1 - .../core/gutter/innerBean/innerBean.test | 8 -- .../core/gutter/innerBean/innerBeanGutter.xml | 10 -- .../methodTypeDefaultInitMethod/Bean.kt | 4 - .../methodTypeDefaultInitMethod/config.xml | 7 - .../methodTypeDefaultInitMethod.test | 8 -- .../core/gutter/methodTypeFactory/Bean.kt | 6 - .../core/gutter/methodTypeFactory/config.xml | 6 - .../methodTypeFactory/methodTypeFactory.test | 9 -- .../core/gutter/methodTypeInitMethod/Bean.kt | 4 - .../gutter/methodTypeInitMethod/config.xml | 6 - .../methodTypeInitMethod.test | 8 -- .../core/gutter/methodTypeMultiple/Bean.kt | 4 - .../core/gutter/methodTypeMultiple/config.xml | 6 - .../methodTypeMultiple.test | 8 -- .../BeanWithProperties.kt | 3 - .../propertyGutter.xml | 10 -- .../propertyGutterForProperty.test | 8 -- .../BeanWithProperties.kt | 3 - .../propertyGutter.xml | 10 -- .../propertyGutterForSetter.test | 8 -- .../spring/core/gutter/resourceGutter/Bean.kt | 3 - .../core/gutter/resourceGutter/Resource.kt | 3 - .../resourceGutter/beans/ResourceGutter.kt | 13 -- .../gutter/resourceGutter/resourceGutter.test | 8 -- .../gutter/resourceGutter/resourceGutter.xml | 19 --- .../kotlin/search/AbstractSearcherTest.java | 4 - 66 files changed, 2 insertions(+), 835 deletions(-) delete mode 100644 idea/idea-ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt delete mode 100644 idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt delete mode 100644 idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java delete mode 100644 idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt delete mode 100644 idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test delete mode 100644 idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml delete mode 100644 idea/testData/spring/core/gutter/autowiredProperty/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test delete mode 100644 idea/testData/spring/core/gutter/autowiredProperty/config.xml delete mode 100644 idea/testData/spring/core/gutter/autowiredSetter/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test delete mode 100644 idea/testData/spring/core/gutter/autowiredSetter/config.xml delete mode 100644 idea/testData/spring/core/gutter/classGutter/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/classGutter/classGutter.test delete mode 100644 idea/testData/spring/core/gutter/classGutter/config.xml delete mode 100644 idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt delete mode 100644 idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt delete mode 100644 idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt delete mode 100644 idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test delete mode 100644 idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml delete mode 100644 idea/testData/spring/core/gutter/componentScan/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/componentScan/ComponentScan.kt delete mode 100644 idea/testData/spring/core/gutter/componentScan/beans/MyController.kt delete mode 100644 idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt delete mode 100644 idea/testData/spring/core/gutter/componentScan/componentScan.test delete mode 100644 idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt delete mode 100644 idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt delete mode 100644 idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test delete mode 100644 idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt delete mode 100644 idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt delete mode 100644 idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test delete mode 100644 idea/testData/spring/core/gutter/innerBean/InnerBean.kt delete mode 100644 idea/testData/spring/core/gutter/innerBean/innerBean.test delete mode 100644 idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml delete mode 100644 idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml delete mode 100644 idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test delete mode 100644 idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/methodTypeFactory/config.xml delete mode 100644 idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test delete mode 100644 idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml delete mode 100644 idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test delete mode 100644 idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/methodTypeMultiple/config.xml delete mode 100644 idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test delete mode 100644 idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt delete mode 100644 idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml delete mode 100644 idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test delete mode 100644 idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt delete mode 100644 idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml delete mode 100644 idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test delete mode 100644 idea/testData/spring/core/gutter/resourceGutter/Bean.kt delete mode 100644 idea/testData/spring/core/gutter/resourceGutter/Resource.kt delete mode 100644 idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt delete mode 100644 idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test delete mode 100644 idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml diff --git a/Changelog.md b/Changelog.md index 4225b838005..05156a4726e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -105,7 +105,6 @@ New features: - [KT-9697](https://youtrack.jetbrains.com/issue/KT-9697) Move method to companion object and back - [KT-11098](https://youtrack.jetbrains.com/issue/KT-11098) Inspection on final classes/functions annotated with Spring @Configuration/@Component/@Bean - [KT-11405](https://youtrack.jetbrains.com/issue/KT-11405) Navigation and Find Usages for Spring beans referenced in annotation arguments and BeanFactory method calls -- [KT-3741](https://youtrack.jetbrains.com/issue/KT-3741) Show Spring-specific line markers on Kotlin classes General issues fixed: diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightAnnotation.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightAnnotation.kt index 80149c2e645..6771ae23495 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightAnnotation.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightAnnotation.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.asJava import com.intellij.openapi.util.TextRange import com.intellij.psi.* -import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.psi.KtAnnotationEntry @@ -67,8 +66,6 @@ class KtLightAnnotation( } } - override fun getReference() = references.singleOrNull() - override fun getReferences() = ReferenceProvidersRegistry.getReferencesFromProviders(delegate, PsiReferenceService.Hints.NO_HINTS) override fun getLanguage() = KotlinLanguage.INSTANCE } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java index 1bcffcc353f..26c454b236a 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java @@ -145,19 +145,8 @@ public class KtLightParameter extends LightParameter implements KtLightDeclarati return ""; } - @Override - public TextRange getTextRange() { - KtParameter origin = getOrigin(); - return origin != null ? origin.getTextRange() : TextRange.EMPTY_RANGE; - } - @Override public PsiIdentifier getNameIdentifier() { return lightIdentifier; } - - @Override - public PsiElement getParent() { - return getMethod().getParameterList(); - } } diff --git a/idea/idea-ultimate/src/META-INF/kotlin-spring.xml b/idea/idea-ultimate/src/META-INF/kotlin-spring.xml index 347c6c334ca..a8767bc3bcb 100644 --- a/idea/idea-ultimate/src/META-INF/kotlin-spring.xml +++ b/idea/idea-ultimate/src/META-INF/kotlin-spring.xml @@ -2,8 +2,6 @@ - - { nameIdentifier }?.let { return it.toLightClass() } - psiElement.getParentOfTypeAndBranch { nameIdentifier }?.let { function -> - val containingClassOrObject = function.containingClassOrObject - val classForLightMethod = if (containingClassOrObject is KtObjectDeclaration - && containingClassOrObject.isCompanion() - && function.resolveToDescriptor().hasJvmStaticAnnotation()) { - containingClassOrObject.containingClassOrObject - } - else { - containingClassOrObject - } - return classForLightMethod?.toLightClass()?.methods?.firstOrNull { (it as? KtLightMethod)?.getOrigin() == function } - } - psiElement.getParentOfTypeAndBranch { nameIdentifier }?.let { return it } - psiElement.getParentOfTypeAndBranch { - (typeReference?.typeElement as? KtUserType)?.referenceExpression?.getReferencedNameElement() - }?.let { return it.toLightAnnotation() } - return null - } - - override fun collectNavigationMarkers(psiElement: PsiElement, result: MutableCollection>?) { - if (psiElement is KtProperty) { - for (it in psiElement.toLightElements()) { - val nameIdentifier = (it as? PsiNameIdentifierOwner)?.nameIdentifier ?: continue - super.collectNavigationMarkers(nameIdentifier, result) - } - return - } - - // Workaround for SpringClassAnnotator - (getElementToProcess(psiElement) as? KtLightAnnotation)?.let { return super.collectNavigationMarkers(it, result) } - - super.collectNavigationMarkers(psiElement, result) - } -} \ No newline at end of file diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt index e210bad5e32..97aed6f6d15 100644 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt +++ b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt @@ -19,8 +19,6 @@ package org.jetbrains.kotlin.idea.spring.tests import com.intellij.facet.impl.FacetUtil import com.intellij.openapi.module.Module import com.intellij.spring.facet.SpringFacet -import com.intellij.spring.facet.SpringFileSet -import com.intellij.testFramework.fixtures.CodeInsightTestFixture import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.TestFixtureExtension @@ -52,18 +50,6 @@ class SpringTestFixtureExtension() : TestFixtureExtension { FacetUtil.addFacet(module, SpringFacet.getSpringFacetType()) } - fun configureFileSet(fixture: CodeInsightTestFixture, configFiles: Collection): SpringFileSet { - return configureFileSet(fixture, "default", module!!, configFiles) - } - - fun configureFileSet(fixture: CodeInsightTestFixture, id: String, module: Module, configFiles: Collection): SpringFileSet { - return module.getSpringFacetWithAssertion().addFileSet(id, id).apply { - configFiles.forEach { addFile(fixture.copyFileToProject(it)) } - } - } - - fun Module.getSpringFacetWithAssertion() = SpringFacet.getInstance(this) ?: error("No Spring facet in ${this}") - override fun tearDown() { try { // clear existing SpringFacet configuration before running next test diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt deleted file mode 100644 index 5968514fc60..00000000000 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2010-2016 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.kotlin.idea.spring.tests.gutter - -import com.google.gson.JsonArray -import com.google.gson.JsonObject -import com.google.gson.JsonParser -import com.intellij.openapi.util.io.FileUtil -import com.intellij.testFramework.LightProjectDescriptor -import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import icons.SpringApiIcons -import org.jetbrains.kotlin.idea.jsonUtils.getString -import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension -import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -import org.jetbrains.kotlin.idea.test.TestFixtureExtension -import org.jetbrains.kotlin.test.KotlinTestUtils -import java.io.File - -abstract class AbstractSpringClassAnnotatorTest : KotlinLightCodeInsightFixtureTestCase() { - override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST - - override fun setUp() { - super.setUp() - TestFixtureExtension.loadFixture(myModule) - } - - protected fun doTest(path: String) { - val configFilePath = "${KotlinTestUtils.getHomeDirectory()}/$path" - val configFile = File(configFilePath) - val testRoot = configFile.parentFile - - val config = JsonParser().parse(FileUtil.loadFile(configFile, true)) as JsonObject - - val withRuntime = config["withRuntime"]?.asBoolean ?: false - if (withRuntime) { - ConfigLibraryUtil.configureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) - } - - try { - val springConfigFiles = (config["springConfig"] as JsonArray).map { it.asString } - - myFixture.testDataPath = testRoot.absolutePath - TestFixtureExtension.getFixture()!!.configureFileSet(myFixture, springConfigFiles) - for (file in testRoot.listFiles()) { - val name = file.name - if (name in springConfigFiles) continue - if (file.isDirectory) myFixture.copyDirectoryToProject(name, name) else myFixture.copyFileToProject(name) - } - - val fileName = config.getString("file") - val gutterMark = myFixture.findGutter(fileName)!! - - val iconName = config.getString("icon") - val icon = SpringApiIcons::class.java.getField(iconName)[null] - assert(gutterMark.icon == icon) - - val tooltip = config.getString("tooltip") - assert(gutterMark.tooltipText == tooltip) - - val naming = config.getString("naming") - val targets = (config["targets"] as JsonArray).map { it.asString } - when (naming) { - "bean" -> checkBeanGutterTargets(gutterMark, targets) - "property" -> checkBeanPropertyTargets(gutterMark, targets) - "generic" -> checkPsiElementGutterTargets(gutterMark, targets) - else -> error("Unexpected naming: $naming") - } - } - finally { - if (withRuntime) { - ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) - } - } - } - - override fun tearDown() { - TestFixtureExtension.unloadFixture() - super.tearDown() - } -} diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java deleted file mode 100644 index e334465c487..00000000000 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright 2010-2016 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.kotlin.idea.spring.tests.gutter; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("idea/testData/spring/core/gutter") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class SpringClassAnnotatorTestGenerated extends AbstractSpringClassAnnotatorTest { - public void testAllFilesPresentInGutter() throws Exception { - KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/spring/core/gutter"), Pattern.compile("^(.+)\\.test$")); - } - - @TestMetadata("autowiredBeanCandidates/autowiredBeanCandidates.test") - public void testAutowiredBeanCandidates_AutowiredBeanCandidates() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test"); - doTest(fileName); - } - - @TestMetadata("autowiredProperty/autowiredProperty.test") - public void testAutowiredProperty_AutowiredProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test"); - doTest(fileName); - } - - @TestMetadata("autowiredSetter/autowiredSetter.test") - public void testAutowiredSetter_AutowiredSetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test"); - doTest(fileName); - } - - @TestMetadata("classGutter/classGutter.test") - public void testClassGutter_ClassGutter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/classGutter/classGutter.test"); - doTest(fileName); - } - - @TestMetadata("classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test") - public void testClassGutterAbstractShowMappedInheritors_ClassGutterAbstractShowMappedInheritors() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test"); - doTest(fileName); - } - - @TestMetadata("componentScan/componentScan.test") - public void testComponentScan_ComponentScan() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/componentScan/componentScan.test"); - doTest(fileName); - } - - @TestMetadata("contextBeanInjectionPoints/contextBeanInjectionPoints.test") - public void testContextBeanInjectionPoints_ContextBeanInjectionPoints() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test"); - doTest(fileName); - } - - @TestMetadata("contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test") - public void testContextBeanWithQualifierInjectionPoints_ContextBeanWithQualifierInjectionPoints() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test"); - doTest(fileName); - } - - @TestMetadata("innerBean/innerBean.test") - public void testInnerBean_InnerBean() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/innerBean/innerBean.test"); - doTest(fileName); - } - - @TestMetadata("methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test") - public void testMethodTypeDefaultInitMethod_MethodTypeDefaultInitMethod() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test"); - doTest(fileName); - } - - @TestMetadata("methodTypeFactory/methodTypeFactory.test") - public void testMethodTypeFactory_MethodTypeFactory() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test"); - doTest(fileName); - } - - @TestMetadata("methodTypeInitMethod/methodTypeInitMethod.test") - public void testMethodTypeInitMethod_MethodTypeInitMethod() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test"); - doTest(fileName); - } - - @TestMetadata("methodTypeMultiple/methodTypeMultiple.test") - public void testMethodTypeMultiple_MethodTypeMultiple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test"); - doTest(fileName); - } - - @TestMetadata("propertyGutterForProperty/propertyGutterForProperty.test") - public void testPropertyGutterForProperty_PropertyGutterForProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test"); - doTest(fileName); - } - - @TestMetadata("propertyGutterForSetter/propertyGutterForSetter.test") - public void testPropertyGutterForSetter_PropertyGutterForSetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test"); - doTest(fileName); - } - - @TestMetadata("resourceGutter/resourceGutter.test") - public void testResourceGutter_ResourceGutter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test"); - doTest(fileName); - } -} diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt deleted file mode 100644 index 978bb38caa0..00000000000 --- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2010-2016 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.kotlin.idea.spring.tests.gutter - -import com.intellij.codeInsight.daemon.GutterMark -import com.intellij.codeInsight.daemon.LineMarkerInfo -import com.intellij.codeInsight.navigation.NavigationGutterIconRenderer -import com.intellij.pom.PomTargetPsiElement -import com.intellij.psi.PsiElement -import com.intellij.psi.presentation.java.SymbolPresentationUtil -import com.intellij.psi.xml.XmlTag -import com.intellij.spring.SpringPresentationProvider -import com.intellij.spring.model.pom.SpringBeanPomTargetUtils -import com.intellij.spring.model.xml.DomSpringBean -import com.intellij.spring.model.xml.beans.SpringPropertyDefinition -import com.intellij.testFramework.UsefulTestCase.assertSameElements -import com.intellij.util.containers.ContainerUtil -import com.intellij.util.xml.DomUtil -import org.jetbrains.kotlin.test.util.assertInstanceOf - -private fun nameBean(element: PsiElement): String { - return when (element) { - is XmlTag -> DomUtil.getDomElement(element).assertInstanceOf().beanName!! - is PomTargetPsiElement -> SpringBeanPomTargetUtils.getSpringBean(element)?.let { SpringPresentationProvider.getSpringBeanName(it) } - ?: namePsi(element) - else -> throw IllegalArgumentException("Cannot convert " + element.javaClass + " (" + element.text + ")") - } -} - -private fun nameProperty(element: PsiElement) = DomUtil.getDomElement(element).assertInstanceOf().propertyName!! - -private fun namePsi(element: PsiElement) = SymbolPresentationUtil.getSymbolPresentableText(element) - -fun checkBeanGutterTargets(gutterMark: GutterMark, expectedBeanNames: Collection) { - checkGutterTargets(gutterMark, expectedBeanNames, ::nameBean) -} - -fun checkBeanPropertyTargets(gutterMark: GutterMark, expectedPropertyNames: Collection) { - checkGutterTargets(gutterMark, expectedPropertyNames, ::nameProperty) -} - -fun checkPsiElementGutterTargets(gutterMark: GutterMark, expectedSymbolNames: Collection) { - checkGutterTargets(gutterMark, expectedSymbolNames, ::namePsi) -} - -fun checkGutterTargets( - gutterMark: GutterMark, - expectedValues: Collection, - targetNamer: (PsiElement) -> String -) { - val targetElements = when (gutterMark) { - is LineMarkerInfo.LineMarkerGutterIconRenderer<*> -> - gutterMark.lineMarkerInfo.navigationHandler.assertInstanceOf().targetElements - is NavigationGutterIconRenderer -> - gutterMark.targetElements - else -> throw IllegalArgumentException("${gutterMark.javaClass.name} not supported") - } - - assertSameElements(ContainerUtil.map(targetElements, targetNamer), expectedValues) -} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt index 5c6adda75bf..e60bf2c6439 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt @@ -49,15 +49,10 @@ class KotlinAnnotatedElementsSearcher : QueryExecutor -> { + is KtNamedFunction, is KtSecondaryConstructor -> { val wrappedMethod = LightClassUtil.getLightClassMethod(declaration as KtFunction) consumer.process(wrappedMethod) } - is KtProperty -> { - with (LightClassUtil.getLightClassPropertyMethods(declaration)) { - if (backingField != null) consumer.process(backingField) else all { consumer.process(it) } - } - } else -> true } } diff --git a/idea/testData/search/annotations/testAnnotationsWithParameters.kt b/idea/testData/search/annotations/testAnnotationsWithParameters.kt index 3817fab1c4e..cab1c878bb8 100644 --- a/idea/testData/search/annotations/testAnnotationsWithParameters.kt +++ b/idea/testData/search/annotations/testAnnotationsWithParameters.kt @@ -8,5 +8,4 @@ annotation class MyAnnotation(val first: String, val second: String) // ANNOTATION: MyAnnotation // SEARCH: method:test1 -// SEARCH: class:Test1 -// SEARCH: field:test3 \ No newline at end of file +// SEARCH: class:Test1 \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt b/idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt deleted file mode 100644 index 5c592abd2e1..00000000000 --- a/idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt +++ /dev/null @@ -1,17 +0,0 @@ -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.context.annotation.Bean - -class Bean { - @Autowired - fun setProp1(autowiredProp: String) { - } - - @Autowired - lateinit var prop2: String - - @Bean(name = "myBean") - @Autowired - fun myBean(collab: String): String { - return "aaa" + collab - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test b/idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test deleted file mode 100644 index 9a1bb8d83ff..00000000000 --- a/idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - withRuntime: "true", - springConfig: ["config.xml"], - file: "Bean.kt", - icon: "ShowAutowiredDependencies", - tooltip: "Navigate to autowired candidates", - naming: "generic", - targets: ["myBean(String)", "prop2", "setProp1(String)"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml b/idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml deleted file mode 100644 index 6b1adf258e2..00000000000 --- a/idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredProperty/Bean.kt b/idea/testData/spring/core/gutter/autowiredProperty/Bean.kt deleted file mode 100644 index 24c26cf48f0..00000000000 --- a/idea/testData/spring/core/gutter/autowiredProperty/Bean.kt +++ /dev/null @@ -1,6 +0,0 @@ -import org.springframework.beans.factory.annotation.Autowired - -class Bean { - @Autowired - lateinit var prop: String -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test b/idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test deleted file mode 100644 index 2eb4925bc67..00000000000 --- a/idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["config.xml"], - file: "Bean.kt", - icon: "ShowAutowiredDependencies", - tooltip: "Navigate to the autowired dependencies", - naming: "bean", - targets: ["stringBean1", "stringBean2"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredProperty/config.xml b/idea/testData/spring/core/gutter/autowiredProperty/config.xml deleted file mode 100644 index 6b1adf258e2..00000000000 --- a/idea/testData/spring/core/gutter/autowiredProperty/config.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredSetter/Bean.kt b/idea/testData/spring/core/gutter/autowiredSetter/Bean.kt deleted file mode 100644 index 91f56438829..00000000000 --- a/idea/testData/spring/core/gutter/autowiredSetter/Bean.kt +++ /dev/null @@ -1,6 +0,0 @@ -import org.springframework.beans.factory.annotation.Autowired - -class Bean { - @Autowired - fun setProp(autowiredProp: String) { } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test b/idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test deleted file mode 100644 index 5b238c5a6f5..00000000000 --- a/idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - withRuntime: "true", - "springConfig": ["config.xml"], - file: "Bean.kt", - icon: "ShowAutowiredDependencies", - tooltip: "Navigate to the autowired dependencies", - naming: "bean", - targets: ["stringBean1", "stringBean2"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/autowiredSetter/config.xml b/idea/testData/spring/core/gutter/autowiredSetter/config.xml deleted file mode 100644 index 6b1adf258e2..00000000000 --- a/idea/testData/spring/core/gutter/autowiredSetter/config.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/classGutter/Bean.kt b/idea/testData/spring/core/gutter/classGutter/Bean.kt deleted file mode 100644 index f6742c966ac..00000000000 --- a/idea/testData/spring/core/gutter/classGutter/Bean.kt +++ /dev/null @@ -1,7 +0,0 @@ -class Bean { - var prop1: String - - fun setProp2(value: String) { - - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/classGutter/classGutter.test b/idea/testData/spring/core/gutter/classGutter/classGutter.test deleted file mode 100644 index c2dc8796def..00000000000 --- a/idea/testData/spring/core/gutter/classGutter/classGutter.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["config.xml"], - file: "Bean.kt", - icon: "SpringBean", - tooltip: "Navigate to the spring bean declaration(s)", - naming: "bean", - targets: ["bean"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/classGutter/config.xml b/idea/testData/spring/core/gutter/classGutter/config.xml deleted file mode 100644 index 1d2f57bb2f7..00000000000 --- a/idea/testData/spring/core/gutter/classGutter/config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt b/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt deleted file mode 100644 index d83435d3da0..00000000000 --- a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt +++ /dev/null @@ -1 +0,0 @@ -abstract class AbstractBean \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt b/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt deleted file mode 100644 index 9d548c208cb..00000000000 --- a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt +++ /dev/null @@ -1 +0,0 @@ -class AbstractBeanInheritor : AbstractBean() \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt b/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt deleted file mode 100644 index 651d247ebb4..00000000000 --- a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt +++ /dev/null @@ -1 +0,0 @@ -class AbstractBeanInheritor2 : AbstractBean() \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test b/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test deleted file mode 100644 index cfb23608280..00000000000 --- a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["inheritors.xml"], - file: "AbstractBean.kt", - icon: "SpringBean", - tooltip: "Navigate to the spring bean declaration(s)", - naming: "bean", - targets: ["inheritor", "inheritor2"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml b/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml deleted file mode 100644 index 5524c5871b2..00000000000 --- a/idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/componentScan/Bean.kt b/idea/testData/spring/core/gutter/componentScan/Bean.kt deleted file mode 100644 index 1ea35e9420f..00000000000 --- a/idea/testData/spring/core/gutter/componentScan/Bean.kt +++ /dev/null @@ -1,3 +0,0 @@ -package test - -class Bean(val n: Int) \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/componentScan/ComponentScan.kt b/idea/testData/spring/core/gutter/componentScan/ComponentScan.kt deleted file mode 100644 index 771f40ca1a3..00000000000 --- a/idea/testData/spring/core/gutter/componentScan/ComponentScan.kt +++ /dev/null @@ -1,6 +0,0 @@ -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration - -@ComponentScan("beans") -@Configuration -open class ComponentScan \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/componentScan/beans/MyController.kt b/idea/testData/spring/core/gutter/componentScan/beans/MyController.kt deleted file mode 100644 index 72f3aca40d1..00000000000 --- a/idea/testData/spring/core/gutter/componentScan/beans/MyController.kt +++ /dev/null @@ -1,6 +0,0 @@ -package beans - -import org.springframework.stereotype.Controller - -@Controller(value = "customControllerName") -class MyController \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt b/idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt deleted file mode 100644 index 41d53870600..00000000000 --- a/idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt +++ /dev/null @@ -1,18 +0,0 @@ -package beans - -import org.springframework.stereotype.Component -import javax.annotation.Resource -import test.Bean - -@Component -class ResourceGutter { - @Resource(name = "bean1") - fun setResource(bean: Bean) { - - } - - @Resource - fun setUnknown(booo: Boolean) { - - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/componentScan/componentScan.test b/idea/testData/spring/core/gutter/componentScan/componentScan.test deleted file mode 100644 index cb075d1e2c3..00000000000 --- a/idea/testData/spring/core/gutter/componentScan/componentScan.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["ComponentScan.kt"], - file: "ComponentScan.kt", - icon: "SpringJavaBean", - tooltip: "Navigate to the spring bean declaration(s)", - naming: "bean", - targets: ["resourceGutter", "customControllerName"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt b/idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt deleted file mode 100644 index 8c5cd45343a..00000000000 --- a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt +++ /dev/null @@ -1,21 +0,0 @@ -import pkg.* -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean - -@Configuration -class ContextBeanInjectionPoints { - @Bean - fun foo(): Foo { - return Foo() - } - - @Bean - fun foo2(): Foo { - return Foo() - } - - @Bean - fun bar(f: Foo): Bar { - return Bar(f) - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt b/idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt deleted file mode 100644 index ad3efc70282..00000000000 --- a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt +++ /dev/null @@ -1,5 +0,0 @@ -package pkg - -class Foo - -class Bar(foo: Foo) \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test b/idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test deleted file mode 100644 index bfe9b32911e..00000000000 --- a/idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: [], - file: "ContextBeanInjectionPoints.kt", - icon: "ShowAutowiredDependencies", - tooltip: "Navigate to the autowired dependencies", - naming: "generic", - targets: ["foo()", "foo2()"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt b/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt deleted file mode 100644 index 63c8c0accd8..00000000000 --- a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt +++ /dev/null @@ -1,22 +0,0 @@ -import pkg.* -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Bean -import org.springframework.beans.factory.annotation.Qualifier - -@Configuration -class ContextBeanWithQualifierInjectionPoints { - @Bean - fun foo(): Foo { - return Foo() - } - - @Bean - fun foo2(): Foo { - return Foo() - } - - @Bean - fun bar(@Qualifier("foo2") f: Foo): Bar { - return Bar(f) - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt b/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt deleted file mode 100644 index ad3efc70282..00000000000 --- a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt +++ /dev/null @@ -1,5 +0,0 @@ -package pkg - -class Foo - -class Bar(foo: Foo) \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test b/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test deleted file mode 100644 index e9c1a88b95e..00000000000 --- a/idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - withRuntime: "true", - springConfig: [], - file: "ContextBeanWithQualifierInjectionPoints.kt", - icon: "ShowAutowiredDependencies", - tooltip: "Navigate to the autowired dependencies", - naming: "generic", - targets: ["foo2()"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/innerBean/InnerBean.kt b/idea/testData/spring/core/gutter/innerBean/InnerBean.kt deleted file mode 100644 index bcec3542de6..00000000000 --- a/idea/testData/spring/core/gutter/innerBean/InnerBean.kt +++ /dev/null @@ -1 +0,0 @@ -class InnerBean \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/innerBean/innerBean.test b/idea/testData/spring/core/gutter/innerBean/innerBean.test deleted file mode 100644 index c122f30c4e0..00000000000 --- a/idea/testData/spring/core/gutter/innerBean/innerBean.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["innerBeanGutter.xml"], - file: "InnerBean.kt", - icon: "SpringBean", - tooltip: "Navigate to the spring bean declaration(s)", - naming: "bean", - targets: ["InnerBean"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml b/idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml deleted file mode 100644 index bd72ca12a9a..00000000000 --- a/idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt b/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt deleted file mode 100644 index a84e58bc83e..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt +++ /dev/null @@ -1,4 +0,0 @@ -class Bean { - fun myInit() { - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml b/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml deleted file mode 100644 index 920414fc636..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test b/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test deleted file mode 100644 index beeaa2a869e..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["config.xml"], - file: "Bean.kt", - icon: "SpringBeanMethod", - tooltip: "Navigate to the spring bean init method declaration", - naming: "generic", - targets: ["default-init-method"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt b/idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt deleted file mode 100644 index d09e49801c1..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt +++ /dev/null @@ -1,6 +0,0 @@ -class Bean { - companion object { - @JvmStatic - fun myFactory() = "TEST" - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/config.xml b/idea/testData/spring/core/gutter/methodTypeFactory/config.xml deleted file mode 100644 index 878e876f483..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeFactory/config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test b/idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test deleted file mode 100644 index 9f9a6ec3aef..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test +++ /dev/null @@ -1,9 +0,0 @@ -{ - withRuntime: "true", - springConfig: ["config.xml"], - file: "Bean.kt", - icon: "FactoryMethodBean", - tooltip: "Navigate to the spring bean factory method declaration", - naming: "generic", - targets: ["factory-method"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt b/idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt deleted file mode 100644 index a84e58bc83e..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt +++ /dev/null @@ -1,4 +0,0 @@ -class Bean { - fun myInit() { - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml b/idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml deleted file mode 100644 index 1026aca4992..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test b/idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test deleted file mode 100644 index 85648d80949..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["config.xml"], - file: "Bean.kt", - icon: "SpringBeanMethod", - tooltip: "Navigate to the spring bean init method declaration", - naming: "generic", - targets: ["init-method"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt b/idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt deleted file mode 100644 index 5035fc33b01..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt +++ /dev/null @@ -1,4 +0,0 @@ -class Bean { - fun myFun() { - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/config.xml b/idea/testData/spring/core/gutter/methodTypeMultiple/config.xml deleted file mode 100644 index 0b5fb6860a9..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeMultiple/config.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test b/idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test deleted file mode 100644 index 0f5d8de9478..00000000000 --- a/idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["config.xml"], - file: "Bean.kt", - icon: "SpringBeanMethod", - tooltip: "Navigate to the spring bean method declarations", - naming: "generic", - targets: ["destroy-method", "init-method"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt b/idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt deleted file mode 100644 index 5c731ed7735..00000000000 --- a/idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt +++ /dev/null @@ -1,3 +0,0 @@ -class BeanWithProperties { - lateinit var prop: String -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml b/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml deleted file mode 100644 index 4e30857e85d..00000000000 --- a/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test b/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test deleted file mode 100644 index e37e457a80b..00000000000 --- a/idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["propertyGutter.xml"], - file: "BeanWithProperties.kt", - icon: "SpringProperty", - tooltip: "Navigate to the spring bean property", - naming: "property", - targets: ["prop", "prop"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt b/idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt deleted file mode 100644 index 405344a7410..00000000000 --- a/idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt +++ /dev/null @@ -1,3 +0,0 @@ -class BeanWithProperties { - fun setProp(prop: String) { } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml b/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml deleted file mode 100644 index 4e30857e85d..00000000000 --- a/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test b/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test deleted file mode 100644 index e37e457a80b..00000000000 --- a/idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["propertyGutter.xml"], - file: "BeanWithProperties.kt", - icon: "SpringProperty", - tooltip: "Navigate to the spring bean property", - naming: "property", - targets: ["prop", "prop"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/resourceGutter/Bean.kt b/idea/testData/spring/core/gutter/resourceGutter/Bean.kt deleted file mode 100644 index 1ea35e9420f..00000000000 --- a/idea/testData/spring/core/gutter/resourceGutter/Bean.kt +++ /dev/null @@ -1,3 +0,0 @@ -package test - -class Bean(val n: Int) \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/resourceGutter/Resource.kt b/idea/testData/spring/core/gutter/resourceGutter/Resource.kt deleted file mode 100644 index 95d9607c807..00000000000 --- a/idea/testData/spring/core/gutter/resourceGutter/Resource.kt +++ /dev/null @@ -1,3 +0,0 @@ -package javax.annotation - -annotation class Resource(val name: String = "") \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt b/idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt deleted file mode 100644 index ca9d4e04e61..00000000000 --- a/idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt +++ /dev/null @@ -1,13 +0,0 @@ -package beans - -import org.springframework.stereotype.Component -import javax.annotation.Resource -import test.Bean - -@Component -class ResourceGutter { - @Resource(name = "bean1") - fun setResource(bean: Bean) { - - } -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test b/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test deleted file mode 100644 index c08073d1102..00000000000 --- a/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - springConfig: ["resourceGutter.xml"], - file: "beans/ResourceGutter.kt", - icon: "ShowAutowiredDependencies", - tooltip: "Navigate to the autowired dependencies", - naming: "bean", - targets: ["bean1"] -} \ No newline at end of file diff --git a/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml b/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml deleted file mode 100644 index 097174ed0a3..00000000000 --- a/idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java index aa025dacf04..0a171353e3b 100644 --- a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.search; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiField; import com.intellij.psi.PsiMethod; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; @@ -75,9 +74,6 @@ public abstract class AbstractSearcherTest extends LightCodeInsightFixtureTestCa if (member instanceof PsiMethod) { return "method:" + ((PsiMethod) member).getName(); } - if (member instanceof PsiField) { - return "field:" + ((PsiField) member).getName(); - } throw new IllegalStateException("Do not know how to render member of type: " + member.getClass().getName()); }