From f1482177b4f5f4440dd4013e49c9899bc80cb938 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 2 Aug 2019 20:05:26 +0300 Subject: [PATCH] Fix NPE in J2K copy-paste handler for invalid offset --- .../idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt index 2bdf0138f8b..d2a658874a5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt @@ -292,7 +292,7 @@ internal fun ElementAndTextList.convertCodeToKotlin(project: Project, targetModu internal fun isNoConversionPosition(file: KtFile, offset: Int): Boolean { if (offset == 0) return false - val token = file.findElementAt(offset - 1)!! + val token = file.findElementAt(offset - 1) ?: return true if (token !is PsiWhiteSpace && token.endOffset != offset) return true // pasting into the middle of token