From ff8b7b4276fcce8bdf4c3252eeb5416f9dd67be5 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 4 Sep 2015 16:51:24 +0300 Subject: [PATCH] Fix NPE in DebuggerUtils #EA-69703 - assert: DebuggerUtils.analyzeElementWithInline --- .../org/jetbrains/kotlin/idea/util/DebuggerUtils.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java b/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java index 00961c5a1ce..fa18bcc9f1a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java @@ -277,11 +277,11 @@ public class DebuggerUtils { List innerContexts = new ArrayList(); for (JetNamedFunction inlineFunctions : collectedElements) { JetExpression body = inlineFunctions.getBodyExpression(); - assert body != null : "Inline function should have a body: " + inlineFunctions.getText(); - - BindingContext bindingContextForFunction = resolutionFacade.analyze(body, BodyResolveMode.FULL); - innerContexts.add(analyzeElementWithInline(resolutionFacade, bindingContextForFunction, inlineFunctions, deep + 1, - analyzedElements, analyzeInlineFunctions)); + if (body != null) { + BindingContext bindingContextForFunction = resolutionFacade.analyze(body, BodyResolveMode.FULL); + innerContexts.add(analyzeElementWithInline(resolutionFacade, bindingContextForFunction, inlineFunctions, deep + 1, + analyzedElements, analyzeInlineFunctions)); + } } innerContexts.add(bindingContext);