azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simple public interface is Java, not Kotlin

Browse Source 
#KT-22823 Fixed
This commit is contained in:
Alexander Podkhalyuzin
2018-07-09 15:23:52 +03:00
parent 04fd4ef9de
commit fb5e11dfc6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinFilePasteProvider.kt
+5 -2
View File
@@ -55,11 +55,14 @@ class KotlinFilePasteProvider : PasteProvider {
val ideView = ideView(dataContext) val ideView = ideView(dataContext)
if (project == null || ideView == null || ideView.directories.isEmpty()) return false if (project == null || ideView == null || ideView.directories.isEmpty()) return false
val text = CopyPasteManager.getInstance().getContents<String>(DataFlavor.stringFlavor) ?: return false val text = CopyPasteManager.getInstance().getContents<String>(DataFlavor.stringFlavor) ?: return false
if (text.contains(";\n")) return false //Optimisation for Java. Kotlin doesn't need that... //todo: KT-25329, to remove these heuristics
if (text.contains(";\n") ||
((text.contains("public interface") || text.contains("public class")) &&
!text.contains("fun "))) return false //Optimisation for Java. Kotlin doesn't need that...
val file = KtPsiFactory(project).createFile(text) val file = KtPsiFactory(project).createFile(text)
return !PsiTreeUtil.hasErrorElements(file) return !PsiTreeUtil.hasErrorElements(file)
} }
private fun project(dataContext: DataContext): Project? = CommonDataKeys.PROJECT.getData(dataContext) private fun project(dataContext: DataContext): Project? = CommonDataKeys.PROJECT.getData(dataContext)
private fun ideView(dataContext: DataContext): IdeView? = LangDataKeys.IDE_VIEW.getData(dataContext) private fun ideView(dataContext: DataContext): IdeView? = LangDataKeys.IDE_VIEW.getData(dataContext)
} }