Skip to content

Commit 99a4ef2

Browse files
committed
Resolve functions in other files even when IDEA does not manage
1 parent d5370dd commit 99a4ef2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.klesun.deep_js_completion.contexts
22

33
import com.intellij.lang.javascript.psi.resolve.JSTypeEvaluator
4-
import com.intellij.lang.javascript.psi.types.JSAnyType
54
import com.intellij.lang.javascript.psi.{JSExpression, JSType}
65
import org.klesun.deep_js_completion.helpers.Mt
76
import org.klesun.deep_js_completion.resolvers.MainRes
@@ -57,7 +56,6 @@ class SearchCtx extends ICtx
5756
if (debug) {
5857
/** @debug */
5958
println(indent + "resolution: " + resolved)
60-
6159
if (resolved.isEmpty) {
6260
/** @debug */
6361
println(indent + "built-in of " + result)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@ case class VarRes(ctx: ICtx) {
283283
.flatMap(expr => ctx.findExprType(expr))
284284
case prop: JSDefinitionExpression => Option(prop.getExpression)
285285
.flatMap(expr => ctx.findExprType(expr))
286+
case func: JSFunction => Mt.mergeTypes(MainRes.getReturns(func)
287+
.flatMap(expr => ctx.findExprType(expr))
288+
.map(rett => new JSFunctionTypeImpl(JSTypeSource.EMPTY, new util.ArrayList[JSParameterTypeDecorator](), rett)))
286289
case _ =>
287290
//println("Unsupported var declaration - " + psi.getClass + " " + psi.getText)
288291
None

0 commit comments

Comments
 (0)