Fix for #31 / #28

META-INF/plugin.xml

@@ -13,7 +13,7 @@
             </ul>
         ]]>
     </description>
-    <version>0.10</version>
+    <version>0.11</version>
     <vendor>Matt Cholick</vendor>
 
     <depends>org.intellij.groovy</depends>

idea-spock-enhancements.iml

@@ -8,16 +8,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="$idea_sdk_name_13$" jdkType="IDEA JDK" />
+    <orderEntry type="jdk" jdkName="IDEA 13 IC-133.696" 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="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" />
+    <orderEntry type="library" scope="PROVIDED" name="groovy_plugin_16" level="project" />
   </component>
-</module>
-
+</module>

src/main/com/cholick/idea/spock/actions/NewSpockSpecAction.java

@@ -1,8 +1,8 @@
 package com.cholick.idea.spock.actions;
 
-import com.cholick.idea.spock.GroovyIcons;
 import com.cholick.idea.spock.template.SpockTemplates;
 import com.cholick.idea.spock.template.SpockTemplatesFactory;
+import com.cholick.idea.spock.util.Icons;
 import com.cholick.idea.spock.util.SpockConstants;
 import com.intellij.ide.IdeView;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
@@ -40,14 +40,14 @@
 public class NewSpockSpecAction extends JavaCreateTemplateInPackageAction<GrTypeDefinition> implements DumbAware {
 
     public NewSpockSpecAction() {
-        super("Spock Specification", "Create new Spock Specification", GroovyIcons.getInstance().getClassIcon(), true);
+        super("Spock Specification", "Create new Spock Specification", Icons.getGroovyIcon(), true);
     }
 
     @Override
     protected void buildDialog(Project project, PsiDirectory directory, CreateFileFromTemplateDialog.Builder builder) {
         builder
                 .setTitle(GroovyBundle.message("newclass.dlg.title"))
-                .addKind("Class", GroovyIcons.getInstance().getClassIcon(), SpockTemplates.SPOCK_SPEC);
+                .addKind("Class", Icons.getGroovyIcon(), SpockTemplates.SPOCK_SPEC);
     }
 
     @Override

src/main/com/cholick/idea/spock/adapter/SpockPluginLoader.java

@@ -3,9 +3,6 @@
 import com.cholick.idea.spock.GrLabeledStatementAdapter;
 import com.cholick.idea.spock.GrLabeledStatementAdapter11;
 import com.cholick.idea.spock.GrLabeledStatementAdapter13;
-import com.cholick.idea.spock.GroovyIcons;
-import com.cholick.idea.spock.GroovyIcons11;
-import com.cholick.idea.spock.GroovyIcons12;
 import com.cholick.idea.spock.HighlightInfoFactory;
 import com.cholick.idea.spock.HighlightInfoFactory11;
 import com.cholick.idea.spock.HighlightInfoFactory13;
@@ -29,7 +26,6 @@ public class SpockPluginLoader implements ApplicationComponent {
     @Override
     public void initComponent() {
         MutablePicoContainer picoContainer = componentManager.getPicoContainer();
-        registerGroovyIcons(picoContainer);
         registerHighlightInfoFactory(picoContainer);
         registerGrLabeledStatementAdapter(picoContainer);
         registerLanguageLookup(picoContainer);
@@ -45,14 +41,6 @@ public String getComponentName() {
         return "Spock Framework Enhancements";
     }
 
-    private void registerGroovyIcons(MutablePicoContainer picoContainer) {
-        if (isAtLeast12()) {
-            picoContainer.registerComponentInstance(GroovyIcons.class.getName(), new GroovyIcons12());
-        } else {
-            picoContainer.registerComponentInstance(GroovyIcons.class.getName(), new GroovyIcons11());
-        }
-    }
-
     private void registerHighlightInfoFactory(MutablePicoContainer picoContainer) {
         if (isAtLeast13()) {
             picoContainer.registerComponentInstance(HighlightInfoFactory.class.getName(), new HighlightInfoFactory13());
@@ -70,7 +58,7 @@ private void registerGrLabeledStatementAdapter(MutablePicoContainer picoContaine
     }
 
     private void registerLanguageLookup(MutablePicoContainer picoContainer) {
-        if(isAtLeast14()) {
+        if (isAtLeast14()) {
             picoContainer.registerComponentInstance(LanguageLookup.class.getName(), new LanguageLookup14());
         } else {
             picoContainer.registerComponentInstance(LanguageLookup.class.getName(), new LanguageLookup11());
@@ -79,7 +67,11 @@ private void registerLanguageLookup(MutablePicoContainer picoContainer) {
 
     private IntelliJVersion getVersion() {
         int version = ApplicationInfo.getInstance().getBuild().getBaselineVersion();
-        if (version >= 138) {
+        if (version >= 145) {
+            return IntelliJVersion.V16;
+        } else if (version >= 143) {
+            return IntelliJVersion.V15;
+        } else if (version >= 138) {
             return IntelliJVersion.V14;
         } else if (version >= 130) {
             return IntelliJVersion.V13;
@@ -89,10 +81,6 @@ private IntelliJVersion getVersion() {
         return IntelliJVersion.V11;
     }
 
-    private boolean isAtLeast12() {
-        return getVersion().compareTo(IntelliJVersion.V12) >= 0;
-    }
-
     private boolean isAtLeast13() {
         return getVersion().compareTo(IntelliJVersion.V13) >= 0;
     }
@@ -102,7 +90,7 @@ private boolean isAtLeast14() {
     }
 
     enum IntelliJVersion {
-        V11, V12, V13, V14
+        V11, V12, V13, V14, V15, V16
     }
 
 }

src/main/com/cholick/idea/spock/template/SpockTemplatesFactory.java

@@ -1,6 +1,6 @@
 package com.cholick.idea.spock.template;
 
-import com.cholick.idea.spock.GroovyIcons;
+import com.cholick.idea.spock.util.Icons;
 import com.intellij.ide.fileTemplates.FileTemplate;
 import com.intellij.ide.fileTemplates.FileTemplateDescriptor;
 import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor;
@@ -41,7 +41,7 @@ public static SpockTemplatesFactory getInstance() {
     static final String LOW_CASE_NAME_TEMPLATE_PROPERTY = "lowCaseName";
 
     public FileTemplateGroupDescriptor getFileTemplatesDescriptor() {
-        final FileTemplateGroupDescriptor group = new FileTemplateGroupDescriptor("Spock", GroovyIcons.getInstance().getGroovy16Icon());
+        final FileTemplateGroupDescriptor group = new FileTemplateGroupDescriptor("Spock", Icons.getGroovyIcon());
         final FileTypeManager fileTypeManager = FileTypeManager.getInstance();
         group.addTemplate(new FileTemplateDescriptor(SpockTemplates.SPOCK_SPEC, fileTypeManager.getFileTypeByFileName(SpockTemplates.SPOCK_SPEC).getIcon()));
 

src/main/com/cholick/idea/spock/testIntegration/SpockTestFramework.java

@@ -1,7 +1,7 @@
 package com.cholick.idea.spock.testIntegration;
 
-import com.cholick.idea.spock.GroovyIcons;
 import com.cholick.idea.spock.LanguageLookup;
+import com.cholick.idea.spock.util.Icons;
 import com.cholick.idea.spock.util.SpockConstants;
 import com.intellij.execution.junit.JUnitUtil;
 import com.intellij.ide.fileTemplates.FileTemplate;
@@ -101,7 +101,7 @@ public String getName() {
     @NotNull
     @Override
     public Icon getIcon() {
-        return GroovyIcons.getInstance().getGroovy16Icon();
+        return Icons.getGroovyIcon();
     }
 
     @NotNull

src/main/com/cholick/idea/spock/util/Icons.java

@@ -0,0 +1,13 @@
+package com.cholick.idea.spock.util;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.Icon;
+
+public class Icons {
+
+    public static Icon getGroovyIcon() {
+        return IconLoader.getIcon("/icons/groovy_16x16.png");
+    }
+
+}