Evaluate expression for variable of function type

#KT-10199 Fixed
2015-12-01 16:09:45 +03:00
parent 2bc2d81486
commit 3b3dbbab04
1 changed files with 8 additions and 4 deletions
@@ -62,10 +62,14 @@ class FrameVisitor(context: EvaluationContextImpl) {
                        }
                    }

-                    val localVariable = if (isFunctionType(asmType))
-                        findLocalVariableForLocalFun(name, asmType, checkType)
-                    else
-                        findLocalVariable(name, asmType, checkType)
+                    if (isFunctionType(asmType)) {
+                        val variableForLocalFun = findLocalVariableForLocalFun(name, asmType, checkType)
+                        if (variableForLocalFun != null) {
+                            return variableForLocalFun
+                        }
+                    }
+
+                    val localVariable = findLocalVariable(name, asmType, checkType)

                    if (localVariable != null) {
                        return localVariable