Permalink
Browse files

Misc: Extract kotlin-ultimate project

  • Loading branch information...
1 parent 1a4a740 commit a818d4714e6b05425a36fedb4bc0d498f04e74f2 @asedunov asedunov committed Mar 29, 2016
Showing with 1,562 additions and 206 deletions.
  1. +8 −0 .gitignore
  2. +0 −1 .idea/artifacts/KotlinPlugin.xml
  3. +0 −1 .idea/modules.xml
  4. +0 −8 ReadMe.md
  5. +0 −1 generators/generators.iml
  6. +3 −33 generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
  7. +1 −0 idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ideaTestUtils.kt
  8. +0 −53 idea/idea-ultimate/idea-ultimate.iml
  9. +2 −6 idea/src/META-INF/plugin.xml
  10. +8 −0 ultimate/.gitignore
  11. +1 −0 ultimate/.idea/.name
  12. +8 −0 ultimate/.idea/ant.xml
  13. +8 −0 ultimate/.idea/artifacts/Dummy.xml
  14. +8 −0 ultimate/.idea/codeInsightSettings.xml
  15. +15 −1 ultimate/.idea/compiler.xml
  16. +9 −0 ultimate/.idea/copyright/apache.xml
  17. +3 −0 ultimate/.idea/copyright/profiles_settings.xml
  18. +24 −0 ultimate/.idea/dictionaries/Nikolay_Krasko.xml
  19. +22 −0 ultimate/.idea/dictionaries/abreslav.xml
  20. +10 −0 ultimate/.idea/dictionaries/bashor.xml
  21. +8 −0 ultimate/.idea/dictionaries/dzharkov.xml
  22. +13 −0 ultimate/.idea/dictionaries/geevee.xml
  23. +9 −0 ultimate/.idea/dictionaries/max.xml
  24. +25 −0 ultimate/.idea/dictionaries/valentin.xml
  25. +1 −1 ultimate/.idea/encodings.xml
  26. +426 −0 ultimate/.idea/inspectionProfiles/idea_default.xml
  27. +1 −1 ultimate/.idea/inspectionProfiles/profiles_settings.xml
  28. +6 −0 ultimate/.idea/kotlinc.xml
  29. 0 { → ultimate}/.idea/libraries/css_support.xml
  30. 0 { → ultimate}/.idea/libraries/database_support.xml
  31. +19 −0 ultimate/.idea/libraries/gradle_and_groovy_plugin.xml
  32. +19 −0 ultimate/.idea/libraries/idea_full.xml
  33. +18 −0 ultimate/.idea/libraries/intellij_core.xml
  34. +14 −0 ultimate/.idea/libraries/java_i18n.xml
  35. 0 { → ultimate}/.idea/libraries/javaee_support.xml
  36. +11 −0 ultimate/.idea/libraries/javax_inject.xml
  37. 0 { → ultimate}/.idea/libraries/jsp_support.xml
  38. +15 −0 ultimate/.idea/libraries/junit_plugin.xml
  39. +9 −0 ultimate/.idea/libraries/kotlin_reflect.xml
  40. +13 −0 ultimate/.idea/libraries/kotlin_runtime.xml
  41. +99 −0 ultimate/.idea/libraries/main_project_production.xml
  42. +21 −0 ultimate/.idea/libraries/main_project_tests.xml
  43. 0 { → ultimate}/.idea/libraries/persistence_support.xml
  44. +14 −0 ultimate/.idea/libraries/properties.xml
  45. 0 { → ultimate}/.idea/libraries/spring_support.xml
  46. +48 −1 ultimate/.idea/misc.xml
  47. +8 −0 ultimate/.idea/modules.xml
  48. +171 −0 ultimate/.idea/projectCodeStyle.xml
  49. +31 −0 ultimate/.idea/runConfigurations/Generate_Tests.xml
  50. +47 −0 ultimate/.idea/runConfigurations/IDEA.xml
  51. +28 −0 ultimate/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
  52. +39 −0 ultimate/.idea/runConfigurations/Ultimate_Plugin_Tests.xml
  53. +13 −1 ultimate/.idea/uiDesigner.xml
  54. +21 −0 ultimate/.idea/vcs.xml
  55. +49 −0 ultimate/build.xml
  56. +31 −0 ultimate/kotlin-ultimate.iml
  57. 0 {idea/idea-ultimate → ultimate}/resources/inspectionDescriptions/KotlinFinalClassOrFunSpring.html
  58. 0 {idea/idea-ultimate → ultimate}/resources/inspectionDescriptions/KotlinSpringFacetCode.html
  59. 0 {idea/idea-ultimate → ultimate}/src/META-INF/kotlin-spring.xml
  60. +8 −0 ultimate/src/META-INF/ultimate-plugin.xml
  61. 0 {idea/idea-ultimate → ultimate}/src/org/jetbrains/kotlin/idea/spring/el/KotlinSpringELInjector.kt
  62. 0 ...ltimate}/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinAutowiredDependencyAction.kt
  63. 0 ...timate}/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanDependencyAction.kt
  64. 0 ...ate}/src/org/jetbrains/kotlin/idea/spring/generate/GenerateKotlinSpringBeanXmlDependencyAction.kt
  65. 0 ...e → ultimate}/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt
  66. 0 ...a-ultimate → ultimate}/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt
  67. 0 ...timate}/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinFinalClassOrFunSpringInspection.kt
  68. 0 ...e → ultimate}/src/org/jetbrains/kotlin/idea/spring/inspections/KotlinSpringFacetCodeInspection.kt
  69. 0 ...timate → ultimate}/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringClassAnnotator.kt
  70. 0 ...e → ultimate}/src/org/jetbrains/kotlin/idea/spring/references/KotlinSpringReferenceContributor.kt
  71. 0 ...ltimate → ultimate}/src/org/jetbrains/kotlin/idea/spring/references/KtSpringBeanScopeReference.kt
  72. 0 {idea/idea-ultimate → ultimate}/src/org/jetbrains/kotlin/idea/spring/springUtils.kt
  73. 0 ...ultimate/testData/inspections}/spring/finalSpringAnnotatedDeclaration/inspectionData/expected.xml
  74. 0 ...mate/testData/inspections}/spring/finalSpringAnnotatedDeclaration/inspectionData/inspections.test
  75. 0 ...timateInspections → ultimate/testData/inspections}/spring/finalSpringAnnotatedDeclaration/test.kt
  76. 0 ...Inspections → ultimate/testData/inspections}/spring/unconfiguredFacet/inspectionData/expected.xml
  77. 0 ...ections → ultimate/testData/inspections}/spring/unconfiguredFacet/inspectionData/inspections.test
  78. 0 {idea/testData/ultimateInspections → ultimate/testData/inspections}/spring/unconfiguredFacet/test.kt
  79. 0 ...mateQuickFixes → ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/.inspection
  80. 0 ...ultimate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt
  81. 0 ...te/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithComponentRuntime.kt.after
  82. 0 ...mate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt
  83. 0 ...estData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithConfigurationRuntime.kt.after
  84. 0 ...estData/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt
  85. 0 ...a/quickFixes}/spring/finalSpringAnnotatedDeclaration/classWithCustomConfigurationRuntime.kt.after
  86. 0 ...imate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt
  87. 0 ...testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithBeanFinalClassRuntime.kt.after
  88. 0 ...timate/testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt
  89. 0 .../testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithBeanOpenClassRuntime.kt.after
  90. 0 ...testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt
  91. 0 ...ta/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanFinalClassRuntime.kt.after
  92. 0 .../testData/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt
  93. 0 ...ata/quickFixes}/spring/finalSpringAnnotatedDeclaration/funWithCustomBeanOpenClassRuntime.kt.after
  94. 0 ...imate}/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt
  95. 0 .../testData/spring/core/generate/autowiredDependencies/duplicatingPropertyAnnotationConfig.kt.after
  96. 0 ...a → ultimate}/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt
  97. 0 ...timate}/testData/spring/core/generate/autowiredDependencies/duplicatingPropertyXmlConfig.kt.after
  98. 0 ...timate}/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt
  99. 0 ...}/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt.after
  100. 0 {idea → ultimate}/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt
  101. 0 ...ltimate}/testData/spring/core/generate/autowiredDependencies/multiplePropertiesXmlConfig.kt.after
  102. 0 ...ate}/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt
  103. 0 ...estData/spring/core/generate/autowiredDependencies/propertyWithQualifierAnnotationConfig.kt.after
  104. 0 ...→ ultimate}/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt
  105. 0 ...mate}/testData/spring/core/generate/autowiredDependencies/propertyWithQualifierXmlConfig.kt.after
  106. 0 ...→ ultimate}/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt
  107. 0 ...mate}/testData/spring/core/generate/autowiredDependencies/singlePropertyAnnotationConfig.kt.after
  108. 0 {idea → ultimate}/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt
  109. 0 ... → ultimate}/testData/spring/core/generate/autowiredDependencies/singlePropertyXmlConfig.kt.after
  110. 0 {idea → ultimate}/testData/spring/core/generate/autowiredDependencies/spring-config.xml
  111. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml
  112. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryBean-config.xml.after
  113. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt.after
  114. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryBean.kt_disabled
  115. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml
  116. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryMethod-config.xml.after
  117. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt.after
  118. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/factoryMethod.kt_disabled
  119. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml
  120. 0 ...→ ultimate}/testData/spring/core/generate/beanDependenciesByXml/firstConstructor-config.xml.after
  121. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt
  122. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/firstConstructor.kt.after
  123. 0 ...timate}/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml
  124. 0 ...}/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam-config.xml.after
  125. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt
  126. 0 ...ultimate}/testData/spring/core/generate/beanDependenciesByXml/primaryConstructorAddParam.kt.after
  127. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/property-config.xml
  128. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/property-config.xml.after
  129. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/property.kt
  130. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/property.kt.after
  131. 0 ...a → ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml
  132. 0 ...timate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor-config.xml.after
  133. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt.after
  134. 0 ... → ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructor.kt_disabled
  135. 0 ...mate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml
  136. 0 ...testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam-config.xml.after
  137. 0 ...a → ultimate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt
  138. 0 ...timate}/testData/spring/core/generate/beanDependenciesByXml/secondaryConstructorAddParam.kt.after
  139. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml
  140. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/setter-config.xml.after
  141. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/setter.kt
  142. 0 {idea → ultimate}/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after
  143. 0 {idea → ultimate}/testData/spring/core/gutter/autowiredBeanCandidates/Bean.kt
  144. 0 {idea → ultimate}/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test
  145. 0 ...gutter/autowiredSetter → ultimate/testData/spring/core/gutter/autowiredBeanCandidates}/config.xml
  146. 0 {idea → ultimate}/testData/spring/core/gutter/autowiredProperty/Bean.kt
  147. 0 {idea → ultimate}/testData/spring/core/gutter/autowiredProperty/autowiredProperty.test
  148. 0 {idea → ultimate}/testData/spring/core/gutter/autowiredProperty/config.xml
  149. 0 {idea → ultimate}/testData/spring/core/gutter/autowiredSetter/Bean.kt
  150. 0 {idea → ultimate}/testData/spring/core/gutter/autowiredSetter/autowiredSetter.test
  151. 0 ...gutter/autowiredBeanCandidates → ultimate/testData/spring/core/gutter/autowiredSetter}/config.xml
  152. 0 {idea → ultimate}/testData/spring/core/gutter/classGutter/Bean.kt
  153. 0 {idea → ultimate}/testData/spring/core/gutter/classGutter/classGutter.test
  154. 0 {idea → ultimate}/testData/spring/core/gutter/classGutter/config.xml
  155. 0 ...a → ultimate}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBean.kt
  156. 0 ...ate}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor.kt
  157. 0 ...te}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/AbstractBeanInheritor2.kt
  158. 0 .../core/gutter/classGutterAbstractShowMappedInheritors/classGutterAbstractShowMappedInheritors.test
  159. 0 {idea → ultimate}/testData/spring/core/gutter/classGutterAbstractShowMappedInheritors/inheritors.xml
  160. 0 ...a/spring/core/gutter/resourceGutter → ultimate/testData/spring/core/gutter/componentScan}/Bean.kt
  161. 0 {idea → ultimate}/testData/spring/core/gutter/componentScan/ComponentScan.kt
  162. 0 {idea → ultimate}/testData/spring/core/gutter/componentScan/beans/MyController.kt
  163. 0 {idea → ultimate}/testData/spring/core/gutter/componentScan/beans/ResourceGutter.kt
  164. 0 {idea → ultimate}/testData/spring/core/gutter/componentScan/componentScan.test
  165. 0 ... → ultimate}/testData/spring/core/gutter/contextBeanInjectionPoints/ContextBeanInjectionPoints.kt
  166. 0 ...ifierInjectionPoints → ultimate/testData/spring/core/gutter/contextBeanInjectionPoints}/FooBar.kt
  167. 0 ... ultimate}/testData/spring/core/gutter/contextBeanInjectionPoints/contextBeanInjectionPoints.test
  168. 0 ...ng/core/gutter/contextBeanWithQualifierInjectionPoints/ContextBeanWithQualifierInjectionPoints.kt
  169. 0 ...nPoints → ultimate/testData/spring/core/gutter/contextBeanWithQualifierInjectionPoints}/FooBar.kt
  170. 0 .../core/gutter/contextBeanWithQualifierInjectionPoints/contextBeanWithQualifierInjectionPoints.test
  171. 0 {idea → ultimate}/testData/spring/core/gutter/innerBean/InnerBean.kt
  172. 0 {idea → ultimate}/testData/spring/core/gutter/innerBean/innerBean.test
  173. 0 {idea → ultimate}/testData/spring/core/gutter/innerBean/innerBeanGutter.xml
  174. 0 .../methodTypeInitMethod → ultimate/testData/spring/core/gutter/methodTypeDefaultInitMethod}/Bean.kt
  175. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeDefaultInitMethod/config.xml
  176. 0 ...ltimate}/testData/spring/core/gutter/methodTypeDefaultInitMethod/methodTypeDefaultInitMethod.test
  177. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeFactory/Bean.kt
  178. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeFactory/config.xml
  179. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeFactory/methodTypeFactory.test
  180. 0 .../methodTypeDefaultInitMethod → ultimate/testData/spring/core/gutter/methodTypeInitMethod}/Bean.kt
  181. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeInitMethod/config.xml
  182. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeInitMethod/methodTypeInitMethod.test
  183. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeMultiple/Bean.kt
  184. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeMultiple/config.xml
  185. 0 {idea → ultimate}/testData/spring/core/gutter/methodTypeMultiple/methodTypeMultiple.test
  186. 0 {idea → ultimate}/testData/spring/core/gutter/propertyGutterForProperty/BeanWithProperties.kt
  187. 0 ...terForSetter → ultimate/testData/spring/core/gutter/propertyGutterForProperty}/propertyGutter.xml
  188. 0 ... → ultimate}/testData/spring/core/gutter/propertyGutterForProperty/propertyGutterForProperty.test
  189. 0 {idea → ultimate}/testData/spring/core/gutter/propertyGutterForSetter/BeanWithProperties.kt
  190. 0 ...terForProperty → ultimate/testData/spring/core/gutter/propertyGutterForSetter}/propertyGutter.xml
  191. 0 {idea → ultimate}/testData/spring/core/gutter/propertyGutterForSetter/propertyGutterForSetter.test
  192. 0 ...a/spring/core/gutter/componentScan → ultimate/testData/spring/core/gutter/resourceGutter}/Bean.kt
  193. 0 {idea → ultimate}/testData/spring/core/gutter/resourceGutter/Resource.kt
  194. 0 {idea → ultimate}/testData/spring/core/gutter/resourceGutter/beans/ResourceGutter.kt
  195. 0 {idea → ultimate}/testData/spring/core/gutter/resourceGutter/resourceGutter.test
  196. 0 {idea → ultimate}/testData/spring/core/gutter/resourceGutter/resourceGutter.xml
  197. 0 {idea → ultimate}/testData/spring/core/references/completion/handler/scopeReference.kt
  198. 0 {idea → ultimate}/testData/spring/core/references/completion/handler/scopeReference.kt.after
  199. 0 {idea → ultimate}/testData/spring/core/references/completion/handler/spring-config.xml
  200. 0 {idea → ultimate}/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt
  201. 0 ... → ultimate}/testData/spring/core/references/completion/handler/springBeanReferenceEnter.kt.after
  202. 0 {idea → ultimate}/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt
  203. 0 {idea → ultimate}/testData/spring/core/references/completion/handler/springBeanReferenceTab.kt.after
  204. 0 {idea → ultimate}/testData/spring/core/references/completion/variants/scopeReference.kt
  205. 0 {idea → ultimate}/testData/spring/core/references/completion/variants/spring-config.xml
  206. 0 {idea → ultimate}/testData/spring/core/references/completion/variants/springBeanReference.kt
  207. 0 {idea → ultimate}/testData/spring/core/references/navigation/fileReferenceInClasspathResource.kt
  208. 0 ... → ultimate}/testData/spring/core/references/navigation/fileReferenceInClasspathResource.test.xml
  209. 0 {idea → ultimate}/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.kt
  210. 0 ... ultimate}/testData/spring/core/references/navigation/fileReferenceInClasspathXmlContext.test.xml
  211. 0 {idea → ultimate}/testData/spring/core/references/navigation/scopeReference.kt
  212. 0 {idea → ultimate}/testData/spring/core/references/navigation/scopeReference_config.xml
  213. 0 {idea → ultimate}/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean.kt
  214. 0 ...ltimate}/testData/spring/core/references/navigation/springBeanRefInFactoryContainsBean_config.xml
  215. 0 {idea → ultimate}/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean.kt
  216. 0 ...a → ultimate}/testData/spring/core/references/navigation/springBeanRefInFactoryGetBean_config.xml
  217. 0 {idea → ultimate}/testData/spring/core/references/navigation/springBeanRefInResource.kt
  218. 0 {idea → ultimate}/testData/spring/core/references/navigation/springBeanRefInResource_config.xml
  219. 0 {idea → ultimate}/testData/spring/core/references/navigation/springFactoryBeanRefInResource.kt
  220. 0 ... → ultimate}/testData/spring/core/references/navigation/springFactoryBeanRefInResource_config.xml
  221. +5 −5 ...mate → ultimate}/tests/org/jetbrains/kotlin/idea/codeInsight/UltimateInspectionTestGenerated.java
  222. +14 −14 ...-ultimate → ultimate}/tests/org/jetbrains/kotlin/idea/quickfix/UltimateQuickFixTestGenerated.java
  223. +2 −3 ...a-ultimate → ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
  224. 0 ...sts/org/jetbrains/kotlin/idea/spring/tests/generate/AbstractGenerateSpringDependencyActionTest.kt
  225. +15 −15 .../org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
  226. +0 −1 ...ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
  227. +18 −18 ...imate}/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
  228. 0 ...ultimate → ultimate}/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt
  229. 0 ...org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionHandlerTest.kt
  230. +1 −1 .../tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
  231. 0 .../tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt
  232. +5 −5 .../jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionHandlerTestGenerated.java
  233. +4 −4 ...sts/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceCompletionTestGenerated.java
  234. +9 −9 ...sts/org/jetbrains/kotlin/idea/spring/tests/references/SpringReferenceNavigationTestGenerated.java
  235. +60 −0 ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt
  236. +22 −0 ultimate/tests/org/jetbrains/kotlin/tests/testUtils.kt
  237. +38 −0 ultimate/update_dependencies.xml
  238. +4 −23 update_dependencies.xml
View
@@ -13,3 +13,11 @@ workspace.xml
*.versionsBackup
/idea/testData/debugger/tinyApp/classes*
/jps-plugin/testData/kannotator
+ultimate/.DS_Store
+ultimate/.idea/shelf
+ultimate/dependencies
+ultimate/ideaSDK
+ultimate/out
+ultimate/tmp
+ultimate/workspace.xml
+ultimate/*.versionsBackup
@@ -47,7 +47,6 @@
<element id="module-output" name="idea-repl" />
<element id="module-output" name="idea-live-templates" />
<element id="module-output" name="resolution" />
- <element id="module-output" name="plugin-api" />
<element id="module-output" name="idea-ultimate" />
</element>
<element id="library" level="project" name="javax.inject" />
View
@@ -47,7 +47,6 @@
<module fileurl="file://$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" filepath="$PROJECT_DIR$/idea/idea-repl/idea-repl.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" filepath="$PROJECT_DIR$/idea/idea-test-framework/idea-test-framework.iml" group="ide" />
- <module fileurl="file://$PROJECT_DIR$/idea/idea-ultimate/idea-ultimate.iml" filepath="$PROJECT_DIR$/idea/idea-ultimate/idea-ultimate.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
<module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
View
@@ -34,11 +34,6 @@ which will setup the dependencies on
* intellij-core: is a part of command line compiler and contains only necessary APIs.
* idea-full: is a full blown IntelliJ IDEA Community Edition to be used in former plugin module.
-* idea-ultimate-full: is a full blown IntelliJ IDEA Ultimate Edition to be used in former plugin module.
-
-If you are not dealing with IDEA Ultimate-specific features, you may want to disable corresponding project dependency.
-(that will also relieve you from necessity to download the IDEA Ultimate distribution during dependency update process)
-To do so change "use.ultimate.by.default" property to false (update_dependencies.xml) before running dependency update
Then, you need to run
@@ -72,9 +67,6 @@ plugin [see this document](http://devnet.jetbrains.net/docs/DOC-181) which descr
From this root project there are Run/Debug Configurations for running IDEA or the Compiler Tests for example; so if you want to try out the latest and greatest IDEA plugin
-If you've decided to disable IDEA Ultimate configuration during dependency update, you also need to locally disable the compilation of its dependent code.
-To do so you can either delete idea-ultimate module using IDEA action in the Project View, or remove corresponding line in .idea/modules.xml
-
* VCS -> Git -> Pull
* Run IntelliJ IDEA
* a child IntelliJ IDEA with the Kotlin plugin will then startup
@@ -38,6 +38,5 @@
<orderEntry type="module" module-name="plugins-tests" scope="TEST" />
<orderEntry type="module" module-name="idea-android" scope="TEST" />
<orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
- <orderEntry type="module" module-name="idea-ultimate" scope="TEST" />
</component>
</module>
@@ -99,10 +99,6 @@ import org.jetbrains.kotlin.idea.refactoring.pushDown.AbstractPushDownTest
import org.jetbrains.kotlin.idea.refactoring.rename.AbstractRenameTest
import org.jetbrains.kotlin.idea.refactoring.safeDelete.AbstractSafeDeleteTest
import org.jetbrains.kotlin.idea.resolve.*
-import org.jetbrains.kotlin.idea.spring.tests.generate.AbstractGenerateSpringDependencyActionTest
-import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionHandlerTest
-import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceCompletionTest
-import org.jetbrains.kotlin.idea.spring.tests.references.AbstractSpringReferenceNavigationTest
import org.jetbrains.kotlin.idea.structureView.AbstractKotlinFileStructureTest
import org.jetbrains.kotlin.idea.stubs.AbstractMultiFileHighlightingTest
import org.jetbrains.kotlin.idea.stubs.AbstractResolveByStubTest
@@ -795,32 +791,6 @@ fun main(args: Array<String>) {
}
}
- testGroup("idea/idea-ultimate/tests", "idea/testData") {
- testClass<AbstractInspectionTest>("UltimateInspectionTestGenerated") {
- model("ultimateInspections", pattern = "^(inspections\\.test)$", singleClass = true)
- }
-
- testClass<AbstractQuickFixTest>("UltimateQuickFixTestGenerated") {
- model("ultimateQuickFixes", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true)
- }
-
- testClass<AbstractSpringReferenceCompletionHandlerTest>() {
- model("spring/core/references/completion/handler")
- }
-
- testClass<AbstractSpringReferenceCompletionTest>() {
- model("spring/core/references/completion/variants")
- }
-
- testClass<AbstractSpringReferenceNavigationTest>() {
- model("spring/core/references/navigation")
- }
-
- testClass<AbstractGenerateSpringDependencyActionTest>() {
- model("spring/core/generate", pattern = "^([\\w]+)\\.kt$", singleClass = true)
- }
- }
-
testGroup("idea/tests", "compiler/testData") {
testClass<AbstractResolveByStubTest>() {
model("loadJava/compiledKotlin")
@@ -1132,7 +1102,7 @@ fun main(args: Array<String>) {
}
}
-internal class TestGroup(val testsRoot: String, val testDataRoot: String) {
+class TestGroup(val testsRoot: String, val testDataRoot: String) {
inline fun <reified T: TestCase> testClass(
suiteTestClass: String = getDefaultSuiteTestClass(T::class.java),
noinline init: TestClass.() -> Unit
@@ -1196,11 +1166,11 @@ internal class TestGroup(val testsRoot: String, val testDataRoot: String) {
}
-private fun testGroup(testsRoot: String, testDataRoot: String, init: TestGroup.() -> Unit) {
+fun testGroup(testsRoot: String, testDataRoot: String, init: TestGroup.() -> Unit) {
TestGroup(testsRoot, testDataRoot).init()
}
-private fun getDefaultSuiteTestClass(baseTestClass:Class<*>): String {
+fun getDefaultSuiteTestClass(baseTestClass:Class<*>): String {
val baseName = baseTestClass.simpleName
if (!baseName.startsWith("Abstract")) {
throw IllegalArgumentException("Doesn't start with \"Abstract\": $baseName")
@@ -37,4 +37,5 @@ fun CodeInsightTestFixture.configureWithExtraFile(path: String, vararg extraName
configureByFiles(*(listOf(path) + extraPaths).toTypedArray())
}
+@Suppress("unused") // Used in kotlin-ultimate
inline fun <reified T: Any> Any?.assertInstanceOf() = UsefulTestCase.assertInstanceOf(this, T::class.java)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="backend" />
- <orderEntry type="module" module-name="frontend" />
- <orderEntry type="module" module-name="frontend.java" />
- <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
- <orderEntry type="module" module-name="light-classes" />
- <orderEntry type="module" module-name="cli-common" />
- <orderEntry type="library" name="idea-full" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="intellilang-plugin" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="testng-plugin" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="copyright-plugin" level="project" />
- <orderEntry type="module" module-name="j2k" />
- <orderEntry type="module" module-name="cli" scope="TEST" />
- <orderEntry type="module" module-name="idea-jps-common" />
- <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
- <orderEntry type="module" module-name="eval4j" />
- <orderEntry type="module" module-name="idea-core" />
- <orderEntry type="module" module-name="idea-analysis" exported="" />
- <orderEntry type="module" module-name="js.frontend" />
- <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
- <orderEntry type="module" module-name="util" />
- <orderEntry type="library" name="markdown" level="project" />
- <orderEntry type="module" module-name="idea-completion" />
- <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
- <orderEntry type="module" module-name="js.serializer" />
- <orderEntry type="module" module-name="daemon-client" />
- <orderEntry type="module" module-name="idea-repl" scope="TEST" />
- <orderEntry type="module" module-name="idea-live-templates" exported="" scope="RUNTIME" />
- <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
- <orderEntry type="module" module-name="idea" />
- <orderEntry type="module" module-name="generators" scope="TEST" />
- <orderEntry type="library" scope="PROVIDED" name="spring-support" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="javaee-support" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="persistence-support" level="project" />
- <orderEntry type="library" name="database-support" level="project" />
- <orderEntry type="library" name="css-support" level="project" />
- <orderEntry type="library" name="jsp-support" level="project" />
- </component>
-</module>
@@ -18,12 +18,8 @@
<depends optional="true" config-file="coverage.xml">Coverage</depends>
<depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
<depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
- <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>
+
+ <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
<project-components>
<component>
View
@@ -0,0 +1,8 @@
+.DS_Store
+.idea/shelf
+dependencies
+ideaSDK
+out
+tmp
+workspace.xml
+*.versionsBackup
@@ -0,0 +1 @@
+kotlin-ultimate
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="AntConfiguration">
+ <buildFile url="file://$PROJECT_DIR$/update_dependencies.xml" />
+ <buildFile url="file://$PROJECT_DIR$/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/../idea-runner/runner.xml" />
+ </component>
+</project>
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+ <artifact name="Dummy">
+ <output-path>$PROJECT_DIR$/out/artifacts/Dummy</output-path>
+ <root id="root">
+ <element id="module-output" name="kotlin-ultimate" />
+ </root>
+ </artifact>
+</component>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="JavaProjectCodeInsightSettings">
+ <excluded-names>
+ <name>kotlin.reflect.jvm.internal.impl</name>
+ </excluded-names>
+ </component>
+</project>
@@ -1,12 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <option name="BUILD_PROCESS_HEAP_SIZE" value="2000" />
<resourceExtensions />
- <wildcardResourcePatterns />
+ <wildcardResourcePatterns>
+ <entry name="!?*.java" />
+ <entry name="!?*.form" />
+ <entry name="!?*.class" />
+ <entry name="!?*.groovy" />
+ <entry name="!?*.scala" />
+ <entry name="!?*.flex" />
+ <entry name="!?*.kt" />
+ <entry name="!?*.clj" />
+ </wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
+ <component name="JavacSettings">
+ <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />
+ </component>
</project>
@@ -0,0 +1,9 @@
+<component name="CopyrightManager">
+ <copyright>
+ <option name="notice" value="Copyright 2010-&amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+ <option name="keyword" value="Copyright" />
+ <option name="allowReplaceKeyword" value="JetBrains" />
+ <option name="myName" value="apache" />
+ <option name="myLocal" value="true" />
+ </copyright>
+</component>
@@ -1,5 +1,8 @@
<component name="CopyrightManager">
<settings default="">
+ <module2copyright>
+ <element module="all except testData" copyright="apache" />
+ </module2copyright>
<LanguageOptions name="Groovy">
<option name="fileTypeOverride" value="1" />
</LanguageOptions>
@@ -0,0 +1,24 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="Nikolay.Krasko">
+ <words>
+ <w>accessors</w>
+ <w>fqname</w>
+ <w>goto</w>
+ <w>gradle</w>
+ <w>intrinsics</w>
+ <w>kdoc</w>
+ <w>kompiler</w>
+ <w>memoize</w>
+ <w>memoized</w>
+ <w>multiline</w>
+ <w>preload</w>
+ <w>preloader</w>
+ <w>preloading</w>
+ <w>preprocess</w>
+ <w>redeclarations</w>
+ <w>subclassed</w>
+ <w>subgraph</w>
+ <w>substep</w>
+ </words>
+ </dictionary>
+</component>
@@ -0,0 +1,22 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="abreslav">
+ <words>
+ <w>accessor</w>
+ <w>covariantly</w>
+ <w>deserialized</w>
+ <w>dominator</w>
+ <w>inferrer</w>
+ <w>iterable</w>
+ <w>nondeterministic</w>
+ <w>nullable</w>
+ <w>overridable</w>
+ <w>pseudocode</w>
+ <w>substitutor</w>
+ <w>subtyping</w>
+ <w>supertype</w>
+ <w>supertypes</w>
+ <w>tuple</w>
+ <w>unary</w>
+ </words>
+ </dictionary>
+</component>
@@ -0,0 +1,10 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="bashor">
+ <words>
+ <w>ctor</w>
+ <w>interner</w>
+ <w>lookups</w>
+ <w>unescape</w>
+ </words>
+ </dictionary>
+</component>
@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="dzharkov">
+ <words>
+ <w>checkcast</w>
+ <w>insn</w>
+ </words>
+ </dictionary>
+</component>
@@ -0,0 +1,13 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="geevee">
+ <words>
+ <w>builtins</w>
+ <w>callables</w>
+ <w>klass</w>
+ <w>proto</w>
+ <w>protoc</w>
+ <w>protos</w>
+ <w>ubuntu</w>
+ </words>
+ </dictionary>
+</component>
@@ -0,0 +1,9 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="max">
+ <words>
+ <w>classfiles</w>
+ <w>codegen</w>
+ <w>kotlin</w>
+ </words>
+ </dictionary>
+</component>
Oops, something went wrong.

0 comments on commit a818d47

Please sign in to comment.