From aa56c502185bbdf5d2a876bb9a2d575979bc7927 Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Wed, 19 Sep 2018 16:37:01 +0300 Subject: [PATCH] Fixed update copyright action with no package and imports #KT-23864 Fixed --- .../jetbrains/kotlin/idea/copyright/UpdateKotlinCopyright.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyright.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyright.java index 164e4ef6047..7f01d53f4e2 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyright.java +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyright.java @@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiWhiteSpace; import com.maddyhome.idea.copyright.CopyrightProfile; import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright; +import org.jetbrains.kotlin.psi.KtImportList; class UpdateKotlinCopyright extends UpdatePsiFileCopyright { @@ -37,7 +38,7 @@ class UpdateKotlinCopyright extends UpdatePsiFileCopyright { PsiElement last = first; PsiElement next = first; while (next != null) { - if (next instanceof PsiComment || next instanceof PsiWhiteSpace) { + if (next instanceof PsiComment || next instanceof PsiWhiteSpace || next.getText().isEmpty()) { next = getNextSibling(next); } else {