[RESTORED] Spring Support: Show Spring line markers for Kotlin classes

#KT-3741 Fixed

idea/testData/search/annotations/testAnnotationsWithParameters.kt

@@ -8,4 +8,5 @@ annotation class MyAnnotation(val first: String, val second: String)
 
 // ANNOTATION: MyAnnotation
 // SEARCH: method:test1
-// SEARCH: class:Test1
+// SEARCH: class:Test1
+// SEARCH: field:test3

idea/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt

@@ -0,0 +1,17 @@
+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
+
+    @Be<caret>an(name = "myBean")
+    @Autowired
+    fun myBean(collab: String): String {
+        return "aaa" + collab
+    }
+}

idea/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test

@@ -0,0 +1,9 @@
+{
+    withRuntime: "true",
+    springConfig: ["config.xml"],
+    file: "Bean.kt",
+    icon: "ShowAutowiredDependencies",
+    tooltip: "Navigate to autowired candidates",
+    naming: "generic",
+    targets: ["myBean(String)", "prop2", "setProp1(String)"]
+}

idea/testData/spring/core/gutter/autowiredBeanCandidates/config.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       default-init-method="myDefaultInitMethod"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="bean" class="Bean"/>
+
+    <bean id="stringBean1" class="java.lang.String"/>
+    <bean id="stringBean2" class="java.lang.String"/>
+</beans>

idea/testData/spring/core/gutter/autowiredProperty/Bean.kt

@@ -0,0 +1,6 @@
+import org.springframework.beans.factory.annotation.Autowired
+
+class Bean {
+    @Autowired
+    lateinit var pr<caret>op: String
+}

idea/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["config.xml"],
+    file: "Bean.kt",
+    icon: "ShowAutowiredDependencies",
+    tooltip: "Navigate to the autowired dependencies",
+    naming: "bean",
+    targets: ["stringBean1", "stringBean2"]
+}

idea/testData/spring/core/gutter/autowiredProperty/config.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       default-init-method="myDefaultInitMethod"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="bean" class="Bean"/>
+
+    <bean id="stringBean1" class="java.lang.String"/>
+    <bean id="stringBean2" class="java.lang.String"/>
+</beans>

idea/testData/spring/core/gutter/autowiredSetter/Bean.kt

@@ -0,0 +1,6 @@
+import org.springframework.beans.factory.annotation.Autowired
+
+class Bean {
+    @Autowired
+    fun setProp(autowired<caret>Prop: String) { }
+}

idea/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test

@@ -0,0 +1,9 @@
+{
+    withRuntime: "true",
+    "springConfig": ["config.xml"],
+    file: "Bean.kt",
+    icon: "ShowAutowiredDependencies",
+    tooltip: "Navigate to the autowired dependencies",
+    naming: "bean",
+    targets: ["stringBean1", "stringBean2"]
+}

idea/testData/spring/core/gutter/autowiredSetter/config.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       default-init-method="myDefaultInitMethod"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="bean" class="Bean"/>
+
+    <bean id="stringBean1" class="java.lang.String"/>
+    <bean id="stringBean2" class="java.lang.String"/>
+</beans>

idea/testData/spring/core/gutter/classGutter/Bean.kt

@@ -0,0 +1,7 @@
+class Be<caret>an {
+    var prop1: String
+
+    fun setProp2(value: String) {
+
+    }
+}

idea/testData/spring/core/gutter/classGutter/classGutter.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["config.xml"],
+    file: "Bean.kt",
+    icon: "SpringBean",
+    tooltip: "Navigate to the spring bean declaration(s)",
+    naming: "bean",
+    targets: ["bean"]
+}

idea/testData/spring/core/gutter/classGutter/config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+    <bean id="bean" class="Bean"/>
+</beans>

idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt

@@ -0,0 +1 @@
+abstract class Abstract<caret>Bean

idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt

@@ -0,0 +1 @@
+class AbstractBeanInheritor : AbstractBean()

idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt

@@ -0,0 +1 @@
+class AbstractBeanInheritor2 : AbstractBean()

idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["inheritors.xml"],
+    file: "AbstractBean.kt",
+    icon: "SpringBean",
+    tooltip: "Navigate to the spring bean declaration(s)",
+    naming: "bean",
+    targets: ["inheritor", "inheritor2"]
+}

idea/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="inheritor" class="AbstractBeanInheritor"/>
+    <bean id="inheritor2" class="AbstractBeanInheritor2"/>
+</beans>

idea/testData/spring/core/gutter/componentScan/Bean.kt

@@ -0,0 +1,3 @@
+package test
+
+class Bean(val n: Int)

idea/testData/spring/core/gutter/componentScan/ComponentScan.kt

@@ -0,0 +1,6 @@
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+
+@Component<caret>Scan("beans")
+@Configuration
+open class ComponentScan

idea/testData/spring/core/gutter/componentScan/beans/MyController.kt

@@ -0,0 +1,6 @@
+package beans
+
+import org.springframework.stereotype.Controller
+
+@Controller(value = "customControllerName")
+class MyController

idea/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt

@@ -0,0 +1,18 @@
+package beans
+
+import org.springframework.stereotype.Component
+import javax.annotation.Resource
+import test.Bean
+
+@Component
+class ResourceGutter {
+    @Resource(name = "bean1")
+    fun setResource(be<caret>an: Bean) {
+
+    }
+
+    @Resource
+    fun setUnknown(booo: Boolean) {
+
+    }
+}

idea/testData/spring/core/gutter/componentScan/componentScan.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["ComponentScan.kt"],
+    file: "ComponentScan.kt",
+    icon: "SpringJavaBean",
+    tooltip: "Navigate to the spring bean declaration(s)",
+    naming: "bean",
+    targets: ["resourceGutter", "customControllerName"]
+}

idea/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt

@@ -0,0 +1,21 @@
+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: F<caret>oo): Bar {
+        return Bar(f)
+    }
+}

idea/testData/spring/core/gutter/contextBeanInjectionPoints/FooBar.kt

@@ -0,0 +1,5 @@
+package pkg
+
+class Foo
+
+class Bar(foo: Foo)

idea/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test

@@ -0,0 +1,8 @@
+{
+    springConfig: [],
+    file: "ContextBeanInjectionPoints.kt",
+    icon: "ShowAutowiredDependencies",
+    tooltip: "Navigate to the autowired dependencies",
+    naming: "generic",
+    targets: ["foo()", "foo2()"]
+}

idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt

@@ -0,0 +1,22 @@
+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: F<caret>oo): Bar {
+        return Bar(f)
+    }
+}

idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/FooBar.kt

@@ -0,0 +1,5 @@
+package pkg
+
+class Foo
+
+class Bar(foo: Foo)

idea/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test

@@ -0,0 +1,9 @@
+{
+    withRuntime: "true",
+    springConfig: [],
+    file: "ContextBeanWithQualifierInjectionPoints.kt",
+    icon: "ShowAutowiredDependencies",
+    tooltip: "Navigate to the autowired dependencies",
+    naming: "generic",
+    targets: ["foo2()"]
+}

idea/testData/spring/core/gutter/innerBean/InnerBean.kt

@@ -0,0 +1 @@
+class Inner<caret>Bean

idea/testData/spring/core/gutter/innerBean/innerBean.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["innerBeanGutter.xml"],
+    file: "InnerBean.kt",
+    icon: "SpringBean",
+    tooltip: "Navigate to the spring bean declaration(s)",
+    naming: "bean",
+    targets: ["InnerBean"]
+}

idea/testData/spring/core/gutter/innerBean/innerBeanGutter.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+    <bean id="bean" class="Bean">
+        <property name="foo">
+            <bean class="InnerBean"/>
+        </property>
+    </bean>
+</beans>

idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/Bean.kt

@@ -0,0 +1,4 @@
+class Bean {
+    fun my<caret>Init() {
+    }
+}

idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       default-init-method="myInit"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+    <bean id="bean" class="Bean"/>
+</beans>

idea/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["config.xml"],
+    file: "Bean.kt",
+    icon: "SpringBeanMethod",
+    tooltip: "Navigate to the spring bean init method declaration",
+    naming: "generic",
+    targets: ["default-init-method"]
+}

idea/testData/spring/core/gutter/methodTypeFactory/Bean.kt

@@ -0,0 +1,6 @@
+class Bean {
+    companion object {
+        @JvmStatic
+        fun my<caret>Factory() = "TEST"
+    }
+}

idea/testData/spring/core/gutter/methodTypeFactory/config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+    <bean id="bean" class="Bean" factory-method="myFactory"/>
+</beans>

idea/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test

@@ -0,0 +1,9 @@
+{
+    withRuntime: "true",
+    springConfig: ["config.xml"],
+    file: "Bean.kt",
+    icon: "FactoryMethodBean",
+    tooltip: "Navigate to the spring bean factory method declaration",
+    naming: "generic",
+    targets: ["factory-method"]
+}

idea/testData/spring/core/gutter/methodTypeInitMethod/Bean.kt

@@ -0,0 +1,4 @@
+class Bean {
+    fun my<caret>Init() {
+    }
+}

idea/testData/spring/core/gutter/methodTypeInitMethod/config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+    <bean id="bean" class="Bean" init-method="myInit"/>
+</beans>

idea/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["config.xml"],
+    file: "Bean.kt",
+    icon: "SpringBeanMethod",
+    tooltip: "Navigate to the spring bean init method declaration",
+    naming: "generic",
+    targets: ["init-method"]
+}

idea/testData/spring/core/gutter/methodTypeMultiple/Bean.kt

@@ -0,0 +1,4 @@
+class Bean {
+    fun my<caret>Fun() {
+    }
+}

idea/testData/spring/core/gutter/methodTypeMultiple/config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+    <bean id="bean" class="Bean" destroy-method="myFun" factory-method="myFun" init-method="myFun"/>
+</beans>

idea/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["config.xml"],
+    file: "Bean.kt",
+    icon: "SpringBeanMethod",
+    tooltip: "Navigate to the spring bean method declarations",
+    naming: "generic",
+    targets: ["destroy-method", "init-method"]
+}

idea/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt

@@ -0,0 +1,3 @@
+class BeanWithProperties {
+    lateinit var pr<caret>op: String
+}

idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutter.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="my" class="BeanWithProperties" p:prop="2">
+        <property name="prop" value="2"/>
+    </bean>
+</beans>

idea/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["propertyGutter.xml"],
+    file: "BeanWithProperties.kt",
+    icon: "SpringProperty",
+    tooltip: "Navigate to the spring bean property",
+    naming: "property",
+    targets: ["prop", "prop"]
+}

idea/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt

@@ -0,0 +1,3 @@
+class BeanWithProperties {
+    fun set<caret>Prop(prop: String) { }
+}

idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutter.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="my" class="BeanWithProperties" p:prop="2">
+        <property name="prop" value="2"/>
+    </bean>
+</beans>

idea/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["propertyGutter.xml"],
+    file: "BeanWithProperties.kt",
+    icon: "SpringProperty",
+    tooltip: "Navigate to the spring bean property",
+    naming: "property",
+    targets: ["prop", "prop"]
+}

idea/testData/spring/core/gutter/resourceGutter/Bean.kt

@@ -0,0 +1,3 @@
+package test
+
+class Bean(val n: Int)

idea/testData/spring/core/gutter/resourceGutter/Resource.kt

@@ -0,0 +1,3 @@
+package javax.annotation
+
+annotation class Resource(val name: String = "")

idea/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt

@@ -0,0 +1,13 @@
+package beans
+
+import org.springframework.stereotype.Component
+import javax.annotation.Resource
+import test.Bean
+
+@Component
+class ResourceGutter {
+    @Resource(name = "bean1")
+    fun setResource(be<caret>an: Bean) {
+
+    }
+}

idea/testData/spring/core/gutter/resourceGutter/resourceGutter.test

@@ -0,0 +1,8 @@
+{
+    springConfig: ["resourceGutter.xml"],
+    file: "beans/ResourceGutter.kt",
+    icon: "ShowAutowiredDependencies",
+    tooltip: "Navigate to the autowired dependencies",
+    naming: "bean",
+    targets: ["bean1"]
+}

idea/testData/spring/core/gutter/resourceGutter/resourceGutter.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+    xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ctx="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd ">
+
+    <ctx:component-scan annotation-config="true" base-package="beans"/>
+
+    <bean id="bean1" class="test.Bean">
+        <constructor-arg type="int" value="1"/>
+    </bean>
+
+    <bean id="bean2" class="test.Bean">
+        <constructor-arg type="int" value="2"/>
+    </bean>
+</beans>