Merge pull request #406 from eliasku/bugfix/issue405

Fix resolution of types and variables with similar names (Issue #234 and #405)
HaxeFoundation · Feb 7, 2016 · d44634b · d44634b
2 parents 944d521 + 9242c1a
commit d44634b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 2 deletions.
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
@@ -45,6 +45,7 @@
         <li>Fix extending anonymous types. (Issue #353)</li>
         <li>Error annotation if type extends itself</li>
         <li>Fix qualified name resolving for ancillary types declaration (multiple types inside .hx file)</li>
+        <li>Fix for resolving variables with names as any type name (Issues #405, #234)</li>
       </ul>
       <p>0.9.8: (community release)</p>
       <ul>

diff --git a/src/common/com/intellij/plugins/haxe/lang/psi/HaxeResolver.java b/src/common/com/intellij/plugins/haxe/lang/psi/HaxeResolver.java
@@ -250,7 +250,13 @@ private PsiFile resolveImportFile(HaxeReference reference) {
         VirtualFile importVFile = importDir == null ? null : importDir.findChild(fileName);
         importPsiFile = importVFile == null ? null : PsiManager.getInstance(reference.getProject()).findFile(importVFile);
         if (importPsiFile != null) {
-          break;
+          // for addition case-sensetive check because find file is not case-sensetive
+          if(!fileName.equals(importPsiFile.getName())) {
+            importPsiFile = null;
+          }
+          else {
+            break;
+          }
         }
       }
     }

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
@@ -396,7 +396,7 @@ else if (implementOrExtendSameClass) {
           return resolveResult;
         }
         // std Array
-        if ("Array".equalsIgnoreCase(resolveResultHaxeClass.getQualifiedName())) {
+        if ("Array".equals(resolveResultHaxeClass.getQualifiedName())) {
           HaxeClassResolveResult arrayResolveResult = resolveResult.getSpecialization().get(resolveResultHaxeClass, "T");
 
           if (arrayResolveResult != null) {

diff --git a/testData/completion/references/LowerCase.hx b/testData/completion/references/LowerCase.hx
@@ -0,0 +1,7 @@
+class LowerCase {
+  private function print(array:Array<String>){
+    for(string in array) {
+      string.<caret>
+    }
+  }
+}
diff --git a/testData/completion/references/LowerCase.txt b/testData/completion/references/LowerCase.txt
@@ -0,0 +1,2 @@
+BASIC 1 INCLUDES
+split
diff --git a/testSrc/com/intellij/plugins/haxe/lang/completion/ReferenceCompletionTest.java b/testSrc/com/intellij/plugins/haxe/lang/completion/ReferenceCompletionTest.java
@@ -202,6 +202,11 @@ public void testGenericFromSuperPackage() throws Throwable {
     doTestVariantsInner("generic1/clients/Client.txt");
   }
 
+  public void testLowerCase() throws Throwable {
+    myFixture.configureByFiles("LowerCase.hx", "com/util/Bar.hx", "std/String.hx", "std/Array.hx", "std/StdTypes.hx");
+    doTestVariantsInner("LowerCase.txt");
+  }
+
   // @TODO: Temporarily disabled. Not being recognized for an unknown reason.
   /*
   public void testExtensionMethod1() throws Throwable {