From 179ec84684f8718d852b0937ed7058b43079a6b5 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 12 Jul 2017 15:57:37 +0300 Subject: [PATCH] Refactoring: mark getTopmostElementAtOffset() as not-null --- .../org/jetbrains/kotlin/idea/codeInsight/CodeInsightUtils.java | 2 +- .../kotlin/idea/debugger/breakpoints/breakpointTypeUtils.kt | 2 +- .../idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/CodeInsightUtils.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/CodeInsightUtils.java index 68d61823ccd..45cb7e05715 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/CodeInsightUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/CodeInsightUtils.java @@ -325,7 +325,7 @@ public class CodeInsightUtils { return CharArrayUtil.shiftBackward(document.getCharsSequence(), lineStartOffset, " \t"); } - @Nullable + @NotNull public static PsiElement getTopmostElementAtOffset(@NotNull PsiElement element, int offset) { do { PsiElement parent = element.getParent(); diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/breakpointTypeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/breakpointTypeUtils.kt index 8286a753b68..4a3b36b8efe 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/breakpointTypeUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/breakpointTypeUtils.kt @@ -103,7 +103,7 @@ fun computeVariants( if (mainMethod != null) { result.add(kotlinBreakpointType.KotlinLineBreakpointVariant( XSourcePositionImpl.createByElement(mainMethod), - CodeInsightUtils.getTopmostElementAtOffset(elementAt, pos.offset) ?: mainMethod)) + CodeInsightUtils.getTopmostElementAtOffset(elementAt, pos.offset))) } lambdas.forEachIndexed { ordinal, lambda -> diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt index 9314d15bfc0..73982881437 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -206,7 +206,7 @@ private fun getExpressionToAddDebugExpressionBefore(tmpFile: KtFile, contextElem val elementAtOffset = tmpFile.findElementAt(lineStart) ?: return null - return CodeInsightUtils.getTopmostElementAtOffset(elementAtOffset, lineStart) ?: elementAtOffset + return CodeInsightUtils.getTopmostElementAtOffset(elementAtOffset, lineStart) } fun shouldStop(el: PsiElement?, p: PsiElement?) = p is KtBlockExpression || el is KtDeclaration || el is KtFile