Merge branch 'master' of https://github.com/tivo/intellij-haxe

HaxeFoundation · Jun 1, 2015 · 8117bdc · 8117bdc
2 parents 1b9652c + 0ae5e91
commit 8117bdc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/idea_v14.1.properties b/idea_v14.1.properties
@@ -7,7 +7,7 @@
 idea.version=14.1
 
 # Human-readable versions of IDEA that this build is compatible with.
-plugin.compatibility.description=IDEA 14.1.  Warning: This plugin will NOT work correctly using IDEA version 14.1.2.
+plugin.compatibility.description=IDEA 14.1.3
 
 # ###################################################
 # IDEA build IDs that are compatible with this plugin.

diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
@@ -29,12 +29,16 @@
   <depends optional="true" config-file="flex-debugger-support.xml">com.intellij.flex</depends>
   <depends optional="true" config-file="debugger-support.xml">com.intellij.modules.ultimate</depends>
 
-  <version>0.9.4 for @plugin.compatibility.description@</version>
+  <version>0.9.5 for @plugin.compatibility.description@</version>
   <change-notes>
     <![CDATA[
       <p>This build is compatible with @plugin.compatibility.description@</p>
       <p>It was built using IDEA build @idea.sdk.version@</p>
       <p/>
+      <p>0.9.5: (community release)</p>
+      <ul>
+        <li>Fix Cut/Copy/Paste not work #196</li>
+      </ul>
       <p>0.9.4: (community release)</p>
       <ul>
         <li>Fix compile error highlighting in the output pane and jumping to source location when an error is clicked upon (Issues #129, #160, #180).</li>

diff --git a/src/common/com/intellij/plugins/haxe/lang/psi/impl/HaxeReferenceImpl.java b/src/common/com/intellij/plugins/haxe/lang/psi/impl/HaxeReferenceImpl.java
@@ -48,6 +48,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -90,6 +91,10 @@ public boolean isSoft() {
   }
 
   private List<? extends PsiElement> resolveNamesToParents(List<? extends PsiElement> nameList) {
+    if (nameList == null) {
+      return Collections.emptyList();
+    }
+
     List<PsiElement> result = new ArrayList<PsiElement>();
     for (PsiElement element : nameList) {
       PsiElement elementToAdd = element;