Switch to 182 platform

ultimate/resources/META-INF/ultimate-plugin.xml

@@ -1,10 +1,3 @@
 <idea-plugin>
-    <depends optional="true" config-file="kotlin-spring.xml">com.intellij.spring</depends>
-    <depends optional="true">com.intellij.javaee</depends>
-    <depends optional="true">com.intellij.persistence</depends>
-    <depends optional="true">com.intellij.database</depends>
-    <depends optional="true">com.intellij.css</depends>
-    <depends optional="true">com.intellij.jsp</depends>
-    <depends optional="true">com.intellij.diagram</depends>
     <depends optional="true" config-file="kotlin-nodejs.xml">NodeJS</depends>
 </idea-plugin>

ultimate/resources/META-INF/ultimate-plugin.xml.181

@@ -0,0 +1,10 @@
+<idea-plugin>
+    <depends optional="true" config-file="kotlin-spring.xml">com.intellij.spring</depends>
+    <depends optional="true">com.intellij.javaee</depends>
+    <depends optional="true">com.intellij.persistence</depends>
+    <depends optional="true">com.intellij.database</depends>
+    <depends optional="true">com.intellij.css</depends>
+    <depends optional="true">com.intellij.jsp</depends>
+    <depends optional="true">com.intellij.diagram</depends>
+    <depends optional="true" config-file="kotlin-nodejs.xml">NodeJS</depends>
+</idea-plugin>

ultimate/resources/META-INF/ultimate-plugin.xml.182

@@ -1,3 +0,0 @@
-<idea-plugin>
-    <depends optional="true" config-file="kotlin-nodejs.xml">NodeJS</depends>
-</idea-plugin>

ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test

@@ -1,2 +1,2 @@
-// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.SpringKotlinAutowiredMembersInspection
+// INSPECTION_CLASS: com.intellij.spring.model.highlighting.autowire.SpringUastAutowiredMembersInspection
 // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension

ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test.181

@@ -0,0 +1,2 @@
+// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.SpringKotlinAutowiredMembersInspection
+// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension

ultimate/testData/inspections/spring/autowiredMembersInInvalidClass/inspectionData/inspections.test.182

@@ -1,2 +0,0 @@
-// INSPECTION_CLASS: com.intellij.spring.model.highlighting.autowire.SpringUastAutowiredMembersInspection
-// FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension

ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml

@@ -1,48 +1,4 @@
 <problems>
-    <problem>
-        <file>ambiguousConstructors.kt</file>
-        <line>52</line>
-        <entry_point TYPE="file" FQNAME="temp:///src/ambiguousConstructors/ambiguousConstructors.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
-        <description>Class doesn't contain matching constructor for autowiring</description>
-    </problem>
-    <problem>
-        <file>ambiguousConstructors.kt</file>
-        <line>58</line>
-        <entry_point TYPE="file" FQNAME="temp:///src/ambiguousConstructors/ambiguousConstructors.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
-        <description>Class doesn't contain matching constructor for autowiring</description>
-    </problem>
-
-    <problem>
-        <file>multipleAutowiredConstructors.kt</file>
-        <line>30</line>
-        <entry_point TYPE="file" FQNAME="temp:///src/multipleAutowiredConstructors/multipleAutowiredConstructors.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
-        <description>Only one constructor can have @Autowired annotation</description>
-    </problem>
-    <problem>
-        <file>multipleAutowiredConstructors.kt</file>
-        <line>31</line>
-        <entry_point TYPE="file" FQNAME="temp:///src/multipleAutowiredConstructors/multipleAutowiredConstructors.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
-        <description>Only one constructor can have @Autowired annotation</description>
-    </problem>
-    <problem>
-        <file>multipleAutowiredConstructors.kt</file>
-        <line>35</line>
-        <entry_point TYPE="file" FQNAME="temp:///src/multipleAutowiredConstructors/multipleAutowiredConstructors.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
-        <description>Only one constructor can have @Autowired annotation</description>
-    </problem>
-    <problem>
-        <file>multipleAutowiredConstructors.kt</file>
-        <line>36</line>
-        <entry_point TYPE="file" FQNAME="temp:///src/multipleAutowiredConstructors/multipleAutowiredConstructors.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
-        <description>Only one constructor can have @Autowired annotation</description>
-    </problem>
-
     <problem>
         <file>invalidAutowiredResource.kt</file>
         <line>24</line>

ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml.181

@@ -1,4 +1,48 @@
 <problems>
+    <problem>
+        <file>ambiguousConstructors.kt</file>
+        <line>52</line>
+        <entry_point TYPE="file" FQNAME="temp:///src/ambiguousConstructors/ambiguousConstructors.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
+        <description>Class doesn't contain matching constructor for autowiring</description>
+    </problem>
+    <problem>
+        <file>ambiguousConstructors.kt</file>
+        <line>58</line>
+        <entry_point TYPE="file" FQNAME="temp:///src/ambiguousConstructors/ambiguousConstructors.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
+        <description>Class doesn't contain matching constructor for autowiring</description>
+    </problem>
+
+    <problem>
+        <file>multipleAutowiredConstructors.kt</file>
+        <line>30</line>
+        <entry_point TYPE="file" FQNAME="temp:///src/multipleAutowiredConstructors/multipleAutowiredConstructors.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
+        <description>Only one constructor can have @Autowired annotation</description>
+    </problem>
+    <problem>
+        <file>multipleAutowiredConstructors.kt</file>
+        <line>31</line>
+        <entry_point TYPE="file" FQNAME="temp:///src/multipleAutowiredConstructors/multipleAutowiredConstructors.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
+        <description>Only one constructor can have @Autowired annotation</description>
+    </problem>
+    <problem>
+        <file>multipleAutowiredConstructors.kt</file>
+        <line>35</line>
+        <entry_point TYPE="file" FQNAME="temp:///src/multipleAutowiredConstructors/multipleAutowiredConstructors.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
+        <description>Only one constructor can have @Autowired annotation</description>
+    </problem>
+    <problem>
+        <file>multipleAutowiredConstructors.kt</file>
+        <line>36</line>
+        <entry_point TYPE="file" FQNAME="temp:///src/multipleAutowiredConstructors/multipleAutowiredConstructors.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
+        <description>Only one constructor can have @Autowired annotation</description>
+    </problem>
+
     <problem>
         <file>invalidAutowiredResource.kt</file>
         <line>24</line>

ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml

@@ -2,17 +2,17 @@
     <problem>
         <file>test.kt</file>
         <line>14</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@ComponentScan setup (Kotlin)</problem_class>
-        <description>Cannot resolve package bar</description>
+        <package>&lt;default&gt;</package>
+        <entry_point TYPE="file" FQNAME="temp:///src/test/test.kt" />
+        <problem_class severity="ERROR" attribute_key="WRONG_REFERENCES_ATTRIBUTES">@ComponentScan setup</problem_class>
+        <description>Cannot resolve symbol 'bar'</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>18</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@ComponentScan setup (Kotlin)</problem_class>
-        <description>Cannot resolve package bar</description>
+        <package>&lt;default&gt;</package>
+        <entry_point TYPE="file" FQNAME="temp:///src/test/test.kt" />
+        <problem_class severity="ERROR" attribute_key="WRONG_REFERENCES_ATTRIBUTES">@ComponentScan setup</problem_class>
+        <description>Cannot resolve symbol 'bar'</description>
     </problem>
 </problems>

ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml.181

@@ -0,0 +1,18 @@
+<problems>
+    <problem>
+        <file>test.kt</file>
+        <line>14</line>
+        <module>light_idea_test_case</module>
+        <entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@ComponentScan setup (Kotlin)</problem_class>
+        <description>Cannot resolve package bar</description>
+    </problem>
+    <problem>
+        <file>test.kt</file>
+        <line>18</line>
+        <module>light_idea_test_case</module>
+        <entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@ComponentScan setup (Kotlin)</problem_class>
+        <description>Cannot resolve package bar</description>
+    </problem>
+</problems>

ultimate/testData/inspections/spring/componentScan/inspectionData/expected.xml.182

@@ -1,18 +0,0 @@
-<problems>
-    <problem>
-        <file>test.kt</file>
-        <line>14</line>
-        <package>&lt;default&gt;</package>
-        <entry_point TYPE="file" FQNAME="temp:///src/test/test.kt" />
-        <problem_class severity="ERROR" attribute_key="WRONG_REFERENCES_ATTRIBUTES">@ComponentScan setup</problem_class>
-        <description>Cannot resolve symbol 'bar'</description>
-    </problem>
-    <problem>
-        <file>test.kt</file>
-        <line>18</line>
-        <package>&lt;default&gt;</package>
-        <entry_point TYPE="file" FQNAME="temp:///src/test/test.kt" />
-        <problem_class severity="ERROR" attribute_key="WRONG_REFERENCES_ATTRIBUTES">@ComponentScan setup</problem_class>
-        <description>Cannot resolve symbol 'bar'</description>
-    </problem>
-</problems>

ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test

@@ -1,3 +1,3 @@
-// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringComponentScanInspection
+// INSPECTION_CLASS: com.intellij.spring.model.highlighting.jam.SpringComponentScanInspection
 // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension
 // CONFIGURE_SPRING_FILE_SET

ultimate/testData/inspections/spring/componentScan/inspectionData/inspections.test.181

@@ -1,3 +1,3 @@
-// INSPECTION_CLASS: com.intellij.spring.model.highlighting.jam.SpringComponentScanInspection
+// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringComponentScanInspection
 // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension
 // CONFIGURE_SPRING_FILE_SET

ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test

@@ -1,3 +1,3 @@
-// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringFacetCodeInspection
+// INSPECTION_CLASS: com.intellij.spring.model.highlighting.config.SpringFacetUastInspection
 // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension
 // FORBID_SPRING_FILE_SET_AUTOCONFIGURE

ultimate/testData/inspections/spring/unconfiguredFacet/inspectionData/inspections.test.181

@@ -1,3 +1,3 @@
-// INSPECTION_CLASS: com.intellij.spring.model.highlighting.config.SpringFacetUastInspection
+// INSPECTION_CLASS: org.jetbrains.kotlin.idea.spring.inspections.KotlinSpringFacetCodeInspection
 // FIXTURE_CLASS: org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension
 // FORBID_SPRING_FILE_SET_AUTOCONFIGURE