From 9ba7907b815780531d27fe9be0cfe3308f50111f Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 4 Jul 2019 16:28:36 +0900 Subject: [PATCH] Fix compatibility issues with third-party plugins This commit fixes compatibility with these plugins: 1. com.wuhao.code.check:1.4.5 2. net.lagerwey.cucumber-kotlin:1.1.1 3. cat.helm.clean:0.1.1-SNAPSHOT 4. no.tornado.tornadofx.idea:1.7.17.2 5. com.gmail.blueboxware.libgdxplugin:1.20 --- .../idea/refactoring/kotlinRefactoringUtil.kt | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt index d64abefdc57..45f40a84989 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt @@ -101,6 +101,10 @@ import java.util.* import javax.swing.Icon import kotlin.math.min +import org.jetbrains.kotlin.idea.core.util.getLineCount as newGetLineCount +import org.jetbrains.kotlin.idea.core.util.toPsiDirectory as newToPsiDirectory +import org.jetbrains.kotlin.idea.core.util.toPsiFile as newToPsiFile + const val CHECK_SUPER_METHODS_YES_NO_DIALOG = "CHECK_SUPER_METHODS_YES_NO_DIALOG" @JvmOverloads @@ -984,3 +988,30 @@ fun T.replaceWithCopyWithResolveCheck( return if (originDescriptor.canonicalRender() == newDescriptor.canonicalRender()) elementCopy.postHook() else null } + +@Deprecated( + "Use org.jetbrains.kotlin.idea.core.util.getLineCount() instead", + ReplaceWith("this.getLineCount()", "org.jetbrains.kotlin.idea.core.util.getLineCount"), + DeprecationLevel.ERROR +) +fun PsiElement.getLineCount(): Int { + return newGetLineCount() +} + +@Deprecated( + "Use org.jetbrains.kotlin.idea.core.util.toPsiDirectory() instead", + ReplaceWith("this.toPsiDirectory()", "org.jetbrains.kotlin.idea.core.util.toPsiDirectory"), + DeprecationLevel.ERROR +) +fun VirtualFile.toPsiDirectory(project: Project): PsiDirectory? { + return newToPsiDirectory(project) +} + +@Deprecated( + "Use org.jetbrains.kotlin.idea.core.util.toPsiFile() instead", + ReplaceWith("this.toPsiFile()", "org.jetbrains.kotlin.idea.core.util.toPsiFile"), + DeprecationLevel.ERROR +) +fun VirtualFile.toPsiFile(project: Project): PsiFile? { + return newToPsiFile(project) +} \ No newline at end of file