Allow to specify node module in the doc like `@param db = from(./../.…

…./../Utils/Db.es6)()`

Same way it is done for requirejs

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>lv.midiana.misc.idea-plugins.deep-js-completion</id>
   <name>deep-js-completion</name>
-  <version>2018.10.25.001</version>
+  <version>2018.12.03.001</version>
   <vendor email="[email protected]"  url="http://midiana.lv/entry/deep-js-completion">Klesun</vendor>
 
   <description><![CDATA[
@@ -26,8 +26,7 @@ This plugin will be highly inspired by my other plugin, <a href="https://plugins
     ]]></description>
 
   <change-notes><![CDATA[
-  <li>GoTo string paths like './dir/file', even if it does not end with '.js'</li>
-  <li>Fix: null pointer on JSLiteralExpressionImpl.getValue</li>
+  <li>Allow to specify node module in the doc like `@param db = from('./../../../Utils/Db.es6')()` (similar to how it works for requirejs)</li>
     ]]>
   </change-notes>
 

src/org/klesun/deep_js_completion/resolvers/VarRes.scala

@@ -5,11 +5,14 @@ import java.util.Objects
 
 import com.intellij.lang.javascript.dialects.JSDialectSpecificHandlersFactory
 import com.intellij.lang.javascript.documentation.JSDocumentationUtils
+import com.intellij.lang.javascript.psi.JSRecordType.TypeMember
 import com.intellij.lang.javascript.psi.impl.{JSDefinitionExpressionImpl, JSFunctionImpl, JSReferenceExpressionImpl}
 import com.intellij.lang.javascript.psi._
 import com.intellij.lang.javascript.psi.jsdoc.JSDocTag
 import com.intellij.lang.javascript.psi.jsdoc.impl.JSDocCommentImpl
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil
+import com.intellij.lang.javascript.psi.types.JSRecordMemberSourceFactory.EmptyMemberSource
+import com.intellij.lang.javascript.psi.types.JSRecordTypeImpl.PropertySignatureImpl
 import com.intellij.lang.javascript.psi.types._
 import com.intellij.psi.impl.source.resolve.ResolveCache.PolyVariantResolver
 import com.intellij.psi.{PsiElement, PsiFile, PsiWhiteSpace}
@@ -64,6 +67,35 @@ case class VarRes(ctx: ICtx) {
       .flatMap(moduleSupplier => ctx.findExprType(moduleSupplier))
   }
 
+  private def resolveCommonJsFormatDef(file: PsiFile): Option[JSType] = {
+    val types = file.getChildren
+      .flatMap(cast[JSExpressionStatement](_))
+      .flatMap(_.getChildren)
+      .flatMap(cast[JSAssignmentExpression](_))
+      .flatMap(ass => Option(ass.getROperand)
+        .flatMap(value => Option(ass.getLOperand)
+          .flatMap(vari => {
+            val txt = Option(vari.getText).getOrElse("")
+            if (txt startsWith "module.exports") {
+              ctx.findExprType(value)
+            } else if (txt startsWith "exports.") {
+              cast[JSDefinitionExpression](vari)
+                .filter(ref => Option(vari.getText).exists(txt => txt startsWith "exports."))
+                .flatMap(defi => Option(defi.getFirstChild))
+                .flatMap(cast[JSReferenceExpressionImpl](_))
+                .flatMap(ref => Option(ref.getReferencedName))
+                .flatMap(name => ctx.findExprType(value)
+                  .map(valT => new PropertySignatureImpl(name, valT, false, new EmptyMemberSource)))
+                .map((prop: TypeMember) => new JSRecordTypeImpl(JSTypeSource.EMPTY, List(prop).asJava))
+            } else {
+              None
+            }
+          })
+        )
+      )
+    MultiType.mergeTypes(types)
+  }
+
   private def resolveRequireJsFormatDef(file: PsiFile): Option[JSType] = {
     val types = List[JSType]() ++
       resolveKlesunWhenLoadedSupplierDef(file) ++
@@ -126,7 +158,7 @@ case class VarRes(ctx: ICtx) {
       .lift(0)
   }
 
-  private def parseDocExpr(caretPsi: PsiElement, expr: String): Option[JSType] = {
+  private def parseDocExpr(caretPsi: PsiElement, expr: String): Iterable[JSType] = {
     Option(null)
       .orElse("""^\s*=\s*(\w+)(\([^\)]*\)|)\s*$""".r.findFirstMatchIn(expr)
         .flatMap(found => {
@@ -140,8 +172,11 @@ case class VarRes(ctx: ICtx) {
           val path = found.group(1)
           val isFuncCall = !found.group(2).equals("")
           Option(caretPsi.getContainingFile)
-            .flatMap(f => PathStrGoToDecl.getReferencedFile(path, f))
-            .flatMap(file => resolveRequireJsFormatDef(file))
+            .flatMap(f => PathStrGoToDecl.getReferencedFile(path, f)).toList
+            .flatMap(file => List()
+              ++ resolveCommonJsFormatDef(file)
+              ++ resolveRequireJsFormatDef(file)
+            ).lift(0)
             .flatMap(t => if (isFuncCall) MultiType.getReturnType(t) else Some(t))
         }))
   }