Compatibility fixes for IntelliJ 14, fixes #19

cholick · Jul 5, 2014 · 5284205 · 5284205
1 parent 62927e9
commit 5284205
Show file tree

Hide file tree

Showing 28 changed files with 185 additions and 73 deletions.
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/groovy_plugin_13.xml b/.idea/libraries/groovy_plugin_13.xml
diff --git a/.idea/libraries/groovy_plugin_14.xml b/.idea/libraries/groovy_plugin_14.xml
diff --git a/.idea/libraries/properties_plugin_13.xml b/.idea/libraries/properties_plugin_13.xml
diff --git a/.idea/libraries/properties_plugin_14.xml b/.idea/libraries/properties_plugin_14.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations/Spock_enhancements.xml b/.idea/runConfigurations/Spock_enhancements.xml
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -13,7 +13,7 @@
             </ul>
         ]]>
     </description>
-    <version>0.8</version>
+    <version>0.9</version>
     <vendor>Matt Cholick</vendor>
 
     <depends>org.intellij.groovy</depends>

diff --git a/README.md b/README.md
@@ -24,8 +24,10 @@ Visit http://www.jetbrains.org/display/IJOS/Writing+Plug-ins for instructions on
 * **idea_sdk** For library paths. Set to a current IntelliJ installation path (e.g. ```/Applications/IntelliJ IDEA 12 CE.app```)
 * **idea_sdk_11** For intelij-adapter-11 library paths. Set to IntelliJ 11 installation. (e.g. ```/Applications/IntelliJ IDEA 11.1 CE.app```)
 * **idea_sdk_12** For intelij-adapter-12 library paths. Set to IntelliJ 12 installation. (e.g. ```/Applications/IntelliJ IDEA 12 CE.app```)
-* **idea_sdk_12** For intelij-adapter-13 library paths. Set to IntelliJ 13 installation. (e.g. ```/Applications/Cardea-IU-132.556.app```)
+* **idea_sdk_13** For intelij-adapter-13 library paths. Set to IntelliJ 13 installation. (e.g. ```/Applications/IntelliJ IDEA 13 CE.app```)
+* **idea_sdk_14** For intelij-adapter-14 library paths. Set to IntelliJ 14 installation. (e.g. ```/Applications/IntelliJ IDEA 14 CE EAP.app/Contents```)
 * **idea_sdk_name** Used as project sdk. Set to a configured current sdk (e.g. ```IDEA IC-123.169```)
-* **idea_sdk_name** intelij-adapter-11 module sdk. Set to a configured IntelliJ 11 sdk (e.g. ```IDEA IC-117.1054```)
-* **idea_sdk_name** intelij-adapter-12 module sdk. Set to a configured IntelliJ 12 sdk (e.g. ```IDEA IC-123.169```)
-* **idea_sdk_name** intelij-adapter-13 module sdk. Set to a configured IntelliJ 13 sdk (e.g. ```IDEA IU-132.556```)
+* **idea_sdk_name_11** intelij-adapter-11 module sdk. Set to a configured IntelliJ 11 sdk (e.g. ```IDEA IC-117.1054```)
+* **idea_sdk_name_12** intelij-adapter-12 module sdk. Set to a configured IntelliJ 12 sdk (e.g. ```IDEA IC-123.169```)
+* **idea_sdk_name_13** intelij-adapter-13 module sdk. Set to a configured IntelliJ 13 sdk (e.g. ```IDEA IC-133.696```)
+* **idea_sdk_name_14** intelij-adapter-14 module sdk. Set to a configured IntelliJ 14 sdk (e.g. ```IDEA IC-138.777```)
diff --git a/idea-spock-enhancements.iml b/idea-spock-enhancements.iml
@@ -8,15 +8,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="$idea_sdk_name_13$" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
     <orderEntry type="module" module-name="intellij-adapter-api" />
     <orderEntry type="module" module-name="intellij-adapter-11" />
     <orderEntry type="module" module-name="intellij-adapter-12" />
     <orderEntry type="module" module-name="intellij-adapter-13" />
-    <orderEntry type="library" scope="PROVIDED" name="groovy_plugin" level="project" />
-    <orderEntry type="library" name="properties_plugin" level="project" />
+    <orderEntry type="module" module-name="intellij-adapter-14" />
+    <orderEntry type="library" scope="PROVIDED" name="groovy_plugin_13" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="properties_plugin_13" level="project" />
   </component>
 </module>
 
diff --git a/intellij-adapter-11/intellij-adapter-11.iml b/intellij-adapter-11/intellij-adapter-11.iml
@@ -7,6 +7,8 @@
     </content>
     <orderEntry type="jdk" jdkName="$idea_sdk_name_11$" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij-adapter-api" />
+    <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="groovy_plugin">
         <CLASSES>
@@ -17,8 +19,6 @@
         <jarDirectory url="file://$idea_sdk_11$/plugins/Groovy/lib" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
-    <orderEntry type="module" module-name="intellij-adapter-api" />
   </component>
 </module>
 
diff --git a/intellij-adapter-11/src/com/cholick/idea/spock/LanguageLookup11.groovy b/intellij-adapter-11/src/com/cholick/idea/spock/LanguageLookup11.groovy
@@ -0,0 +1,12 @@
+package com.cholick.idea.spock
+
+import com.intellij.lang.Language
+import org.jetbrains.plugins.groovy.GroovyFileType
+
+public class LanguageLookup11 extends LanguageLookup {
+
+    Language groovy() {
+        return GroovyFileType.GROOVY_LANGUAGE;
+    }
+
+}
diff --git a/intellij-adapter-12/intellij-adapter-12.iml b/intellij-adapter-12/intellij-adapter-12.iml
@@ -5,20 +5,20 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="$idea_sdk_name_12$" jdkType="IDEA JDK" />
+    <orderEntry type="jdk" jdkName="$idea_sdk_name$" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij-adapter-api" />
+    <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="groovy_plugin">
         <CLASSES>
-          <root url="file://$idea_sdk_12$/plugins/Groovy/lib" />
+          <root url="file://$idea_sdk$/plugins/Groovy/lib" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
-        <jarDirectory url="file://$idea_sdk_12$/plugins/Groovy/lib" recursive="false" />
+        <jarDirectory url="file://$idea_sdk$/plugins/Groovy/lib" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
-    <orderEntry type="module" module-name="intellij-adapter-api" />
   </component>
 </module>
 
diff --git a/intellij-adapter-13/intellij-adapter-13.iml b/intellij-adapter-13/intellij-adapter-13.iml
@@ -7,6 +7,8 @@
     </content>
     <orderEntry type="jdk" jdkName="$idea_sdk_name_13$" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij-adapter-api" />
+    <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="groovy_plugin">
         <CLASSES>
@@ -17,8 +19,6 @@
         <jarDirectory url="file://$idea_sdk_13$/plugins/Groovy/lib" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
-    <orderEntry type="module" module-name="intellij-adapter-api" />
   </component>
 </module>
 
diff --git a/intellij-adapter-14/intellij-adapter-14.iml b/intellij-adapter-14/intellij-adapter-14.iml
@@ -0,0 +1,24 @@
+<?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" />
+    </content>
+    <orderEntry type="jdk" jdkName="$idea_sdk_name_14$" jdkType="IDEA JDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij-adapter-api" />
+    <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library name="groovy_plugin">
+        <CLASSES>
+          <root url="file://$idea_sdk_14$/plugins/Groovy/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$idea_sdk_14$/plugins/Groovy/lib" recursive="false" />
+      </library>
+    </orderEntry>
+  </component>
+</module>
+
diff --git a/intellij-adapter-14/src/com/cholick/idea/spock/LanguageLookup14.groovy b/intellij-adapter-14/src/com/cholick/idea/spock/LanguageLookup14.groovy
@@ -0,0 +1,12 @@
+package com.cholick.idea.spock
+
+import com.intellij.lang.Language
+import org.jetbrains.plugins.groovy.GroovyLanguage;
+
+class LanguageLookup14 extends LanguageLookup {
+
+    Language groovy() {
+        return GroovyLanguage.INSTANCE;
+    }
+
+}
diff --git a/intellij-adapter-api/intellij-adapter-api.iml b/intellij-adapter-api/intellij-adapter-api.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="$idea_sdk_name_13$" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="groovy_plugin">
@@ -17,7 +17,6 @@
         <jarDirectory url="file://$idea_sdk_13$/plugins/Groovy/lib" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="groovy-1.8.9" level="application" />
   </component>
 </module>
 
diff --git a/intellij-adapter-api/src/com/cholick/idea/spock/GroovyIcons.java b/intellij-adapter-api/src/com/cholick/idea/spock/GroovyIcons.java
@@ -2,7 +2,7 @@
 
 import com.intellij.openapi.components.ServiceManager;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 public abstract class GroovyIcons {
 

diff --git a/intellij-adapter-api/src/com/cholick/idea/spock/HighlightInfoFactory.groovy b/intellij-adapter-api/src/com/cholick/idea/spock/HighlightInfoFactory.groovy
diff --git a/intellij-adapter-api/src/com/cholick/idea/spock/HighlightInfoFactory.java b/intellij-adapter-api/src/com/cholick/idea/spock/HighlightInfoFactory.java
@@ -0,0 +1,19 @@
+package com.cholick.idea.spock;
+
+import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.editor.markup.TextAttributes;
+import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public abstract class HighlightInfoFactory {
+
+    public static HighlightInfoFactory getInstance() {
+        return ServiceManager.getService(HighlightInfoFactory.class);
+    }
+
+    public abstract HighlightInfo createHighlightInfo(@NotNull HighlightInfoType type, @NotNull PsiElement element, @Nullable String message, @Nullable TextAttributes attributes);
+
+}
diff --git a/intellij-adapter-api/src/com/cholick/idea/spock/LanguageLookup.java b/intellij-adapter-api/src/com/cholick/idea/spock/LanguageLookup.java
@@ -0,0 +1,14 @@
+package com.cholick.idea.spock;
+
+import com.intellij.lang.Language;
+import com.intellij.openapi.components.ServiceManager;
+
+public abstract class LanguageLookup {
+
+    public static LanguageLookup getInstance() {
+        return ServiceManager.getService(LanguageLookup.class);
+    }
+
+    public abstract Language groovy();
+
+}
diff --git a/src/main/com/cholick/idea/spock/adapter/SpockPluginLoader.java b/src/main/com/cholick/idea/spock/adapter/SpockPluginLoader.java
@@ -9,6 +9,9 @@
 import com.cholick.idea.spock.HighlightInfoFactory;
 import com.cholick.idea.spock.HighlightInfoFactory11;
 import com.cholick.idea.spock.HighlightInfoFactory13;
+import com.cholick.idea.spock.LanguageLookup;
+import com.cholick.idea.spock.LanguageLookup11;
+import com.cholick.idea.spock.LanguageLookup14;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.components.impl.ComponentManagerImpl;
@@ -29,6 +32,7 @@ public void initComponent() {
         registerGroovyIcons(picoContainer);
         registerHighlightInfoFactory(picoContainer);
         registerGrLabeledStatementAdapter(picoContainer);
+        registerLanguageLookup(picoContainer);
     }
 
     @Override
@@ -65,9 +69,19 @@ private void registerGrLabeledStatementAdapter(MutablePicoContainer picoContaine
         }
     }
 
+    private void registerLanguageLookup(MutablePicoContainer picoContainer) {
+        if(isAtLeast14()) {
+            picoContainer.registerComponentInstance(LanguageLookup.class.getName(), new LanguageLookup14());
+        } else {
+            picoContainer.registerComponentInstance(LanguageLookup.class.getName(), new LanguageLookup11());
+        }
+    }
+
     private IntelliJVersion getVersion() {
         int version = ApplicationInfo.getInstance().getBuild().getBaselineVersion();
-        if (version >= 130) {
+        if (version >= 138) {
+            return IntelliJVersion.V14;
+        } else if (version >= 130) {
             return IntelliJVersion.V13;
         } else if (version >= 120) {
             return IntelliJVersion.V12;
@@ -83,8 +97,12 @@ private boolean isAtLeast13() {
         return getVersion().compareTo(IntelliJVersion.V13) >= 0;
     }
 
+    private boolean isAtLeast14() {
+        return getVersion().compareTo(IntelliJVersion.V14) >= 0;
+    }
+
     enum IntelliJVersion {
-        V11, V12, V13
+        V11, V12, V13, V14
     }
 
 }