Fix and enable expression chain recursion detection

Also remove duplicate types from resolution result

Author: klesun

src/org/klesun/deep_js_completion/contexts/SearchCtx.scala

@@ -5,13 +5,22 @@ import com.intellij.lang.javascript.psi.{JSCallExpression, JSExpression, JSRefer
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.klesun.deep_js_completion.completion_providers.PropNamePvdr
+import org.klesun.deep_js_completion.helpers.Mt
 import org.klesun.deep_js_completion.resolvers.MainRes
 import org.klesun.lang.DeepJsLang._
 
 import scala.collection.{GenTraversableOnce, mutable}
 
 object SearchCtx {
   val DEBUG = false
+  val DEBUG_OBJ = new {
+    val PRINT_PSI_TREE = true
+  }
+  def formatPsi(element: PsiElement): String = {
+    val line = element.getContainingFile.getText
+      .slice(0, element.getTextOffset).split("\n").length
+    element.getText.replace("\n", " \\n ") + ":" + line
+  }
 }
 
 class SearchCtx(
@@ -82,11 +91,11 @@ class SearchCtx(
       var chain: List[PsiElement] = List()
       while (ctx != null) {
         if (!chain.lastOption.contains(ctx.expr)) {
-          chain = List(ctx.expr) ++ chain
+          chain = chain ++ List(ctx.expr)
         }
         ctx = ctx.parent.orNull
       }
-      chain
+      chain.reverse
     }
 
     private def endsWith[T](superList: List[T], subList: List[T]): Boolean = {
@@ -141,16 +150,17 @@ class SearchCtx(
             None
         } else if (expressionsResolved >= 7500) {
             None
-//        } else if (isRecursion(exprCtx)) {
-//            None
+        } else if (isRecursion(exprCtx)) {
+            //Console.println("ololo recursion")
+            None
         } else {
             putToCache(exprCtx, expr, Iterator.empty.mem())
             val resolved = MainRes.resolveIn(expr, exprCtx).itr
             // no point getting built-in type here, IDEA will show it itself
             val isAtCaret = exprCtx.parent.isEmpty
             val builtIn = getWsType(expr).filter(t => !isAtCaret)
             var result = frs(resolved, builtIn)
-            val mit = result.mem()
+            val mit = result.flatMap(t => Mt.flattenTypes(t)).unq().mem()
             if (SearchCtx.DEBUG) {
                 val postfix = " ||| " + singleLine(expr.getText, 350)
                 // TODO: one of types happens to be null sometimes - fix!

src/org/klesun/lang/DeepJsLang.scala

@@ -1,6 +1,7 @@
 package org.klesun.lang
 
 import java.io.{PrintWriter, StringWriter}
+import java.util
 
 import com.intellij.psi.PsiElement
 import org.klesun.deep_js_completion.contexts.SearchCtx
@@ -276,6 +277,18 @@ object DeepJsLang {
       if (hasNext) Some(next()) else None
     }
 
+    def unq(): It[T] = {
+      val met = new util.HashSet[T]
+      filter(el => {
+        if (met.contains(el)) {
+          false
+        } else {
+          met.add(el)
+          true
+        }
+      })
+    }
+
     /**
      * should not be needed in deep-js code, but deep-assoc, which uses it, has
      * MemIt implementation that may ping hasNext() multiple times for same value