removing typeHints for resolver, seems like the resolver never utilize this code anymore.

Author: m0rkeulv

src/main/java/com/intellij/plugins/haxe/ide/annotator/semantics/HaxeAssignExpressionAnnotator.java

@@ -19,7 +19,6 @@
 
 import static com.intellij.plugins.haxe.ide.annotator.HaxeSemanticAnnotatorInspections.ASSIGNMENT_TYPE_COMPATIBILITY_CHECK;
 import static com.intellij.plugins.haxe.ide.annotator.HaxeStandardAnnotation.typeMismatch;
-import static com.intellij.plugins.haxe.lang.psi.HaxeResolver.typeHintKey;
 
 public class HaxeAssignExpressionAnnotator implements Annotator {
   public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
@@ -42,14 +41,7 @@ public static void check(HaxeAssignExpression psi, AnnotationHolder holder) {
 
     ResultHolder lhsType = HaxeTypeResolver.getPsiElementType(lhs, psi, lhsResolver);
     rhsResolver.setAssignHint(lhsType.tryUnwrapNullType());
-    // if class add type hinting for resolver
-    if(lhsType.isClassType()){
-      SpecificHaxeClassReference type = lhsType.getClassType();
-      if(type != null && type.getHaxeClass() != null) {
-        String qualifiedName = type.getHaxeClass().getQualifiedName();
-        rhs.putUserData(typeHintKey, qualifiedName);
-      }
-    }
+
     ResultHolder rhsType = HaxeTypeResolver.getPsiElementType(rhs, psi, rhsResolver);
 
     // check if we try to assign to a method reference, if so its required ot be dynamic

src/main/java/com/intellij/plugins/haxe/lang/psi/HaxeResolver.java

@@ -67,8 +67,6 @@
 @CustomLog
 public class HaxeResolver implements ResolveCache.AbstractResolver<HaxeReference, List<? extends PsiElement>> {
   public static final int MAX_DEBUG_MESSAGE_LENGTH = 200;
-  public static final Key<String> typeHintKey = new Key<>("typeHint");
-  private static final Key<Boolean> skipCacheKey = new Key<>("skipCache");
 
   //static {  // Remove when finished debugging.
   //  LOG.setLevel(LogLevel.DEBUG);
@@ -103,8 +101,7 @@ public List<? extends PsiElement> resolve(@NotNull HaxeReference reference, bool
        // fail until the indices are complete), we don't want to cache the (likely incorrect)
        // results.
        boolean isDumb = DumbService.isDumb(reference.getProject());
-       boolean hasTypeHint = checkForTypeHint(reference);
-       boolean skipCaching = skipCachingForDebug || isDumb || hasTypeHint;
+       boolean skipCaching = skipCachingForDebug || isDumb;
 
         List<? extends PsiElement>  elements  = skipCaching ? doResolve(reference, incompleteCode)
                          : ResolveCache.getInstance(reference.getProject())
@@ -132,20 +129,6 @@ public List<? extends PsiElement> resolve(@NotNull HaxeReference reference, bool
        return elements == null ? EMPTY_LIST : elements;
   }
 
-  //TODO until we have type hints everywhere we need to skip caching for those refrences that rely on typeHints
-  private boolean checkForTypeHint(HaxeReference reference) {
-    if (reference.getUserData(typeHintKey) != null ) return true;
-    if (reference.getParent() instanceof  HaxeCallExpression expression) {
-      if (expression.getUserData(typeHintKey) != null ) return true;
-    }
-    return false;
-  }
-
-  private boolean isResolving(@NotNull HaxeReference reference) {
-    Stack<PsiElement> stack = referencesProcessing.get();
-    return stack.contains(reference);
-  }
-
 
   @Nullable
   private List<? extends PsiElement> doResolve(@NotNull HaxeReference reference, boolean incompleteCode) {
@@ -182,6 +165,17 @@ private List<? extends PsiElement> doResolveInner(@NotNull HaxeReference referen
       resolves.incrementAndGet();
     }
 
+    try {
+      if (reference.getParent().getParent().getParent().textMatches(":Array<ClassField>")) { // OR
+        int i = 0;
+      }
+      if (reference.getParent().getParent().getParent().textMatches("::Map<String,Bool>")) {
+        int i = 0;
+      }
+    }catch (Exception e) {
+
+    }
+
     if (reference instanceof HaxeLiteralExpression || reference instanceof HaxeConstantExpression) {
       if (!(reference instanceof HaxeRegularExpression || reference instanceof HaxeStringLiteralExpression)) {
         return EMPTY_LIST;
@@ -232,23 +226,6 @@ private List<? extends PsiElement> doResolveInner(@NotNull HaxeReference referen
             if(matchesInImport.size()> 1 &&  reference.getParent() instanceof  HaxeCallExpression callExpression) {
               int expectedSize = Optional.ofNullable(callExpression.getExpressionList()).map(e -> e.getExpressionList().size()).orElse(0);
 
-              // check type hinting for enumValues
-              for (PsiElement importElement : matchesInImport) {
-                if (importElement.getParent() instanceof  HaxeEnumValueDeclaration enumValueDeclaration) {
-                  PsiElement typeHintPsi = reference;
-
-                  if (reference.getParent() instanceof  HaxeCallExpression expression) {
-                    typeHintPsi = expression;
-                  }
-                  String currentQname = enumValueDeclaration.getContainingClass().getQualifiedName();
-                  String data = typeHintPsi.getUserData(typeHintKey);
-                  if (currentQname != null && currentQname.equals(data)) {
-                    LogResolution(reference, "via import & typeHintKey");
-                    return List.of(importElement);
-                  }
-                }
-              }
-
               // test  call expression if possible
               for (PsiElement importElement : matchesInImport) {
                 if (importElement.getParent() instanceof HaxeEnumValueDeclarationConstructor enumValueDeclaration) {
@@ -299,6 +276,28 @@ private List<? extends PsiElement> doResolveInner(@NotNull HaxeReference referen
       String message = "caching result for :" + referenceText;
       traceAs(log, HaxeDebugUtil.getCallerStackFrame(), message);
     }
+
+    try {
+      if (reference.getParent().getParent().getParent().textMatches(":Array<ClassField>")) {
+        if(result != null && !result.isEmpty()) {
+          PsiElement first = result.getFirst();
+          if(!first.textMatches("Array")) {
+            int i = 0;
+          }
+        }
+      }
+      if (reference.getParent().getParent().getParent().textMatches(":Map<String,Bool>")) {
+        if(result != null && !result.isEmpty()) {
+          PsiElement first = result.getFirst();
+          if(!first.textMatches("Map")) {
+            int i = 0;
+          }
+        }
+      }
+    }catch (Exception e) {
+
+    }
+
     return result;
 
   }

src/main/java/com/intellij/plugins/haxe/model/evaluator/HaxeExpressionEvaluatorHandlers.java

@@ -358,7 +358,7 @@ else if (subelement instanceof HaxeFieldDeclaration fieldDeclaration) {
             if (init != null) {
               HaxeExpression initExpression = init.getExpression();
               HaxeGenericResolver initResolver = HaxeGenericResolverUtil.generateResolverFromScopeParents(initExpression);
-              typeHolder = HaxeTypeResolver.getFieldOrMethodReturnType((AbstractHaxeNamedComponent)subelement, initResolver);
+              typeHolder = HaxeTypeResolver.getFieldOrMethodReturnType(fieldDeclaration, initResolver);
             }
             else {
               HaxeTypeTag tag = fieldDeclaration.getTypeTag();