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

RemoveRedundantQualifierNameInspection: apply on idea module

Browse Source
This commit is contained in:
Dmitry Gridin
2019-07-10 16:41:06 +03:00
parent 229b8cb6a3
commit f310bd3324
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.kt
+2 -2
View File
@@ -269,8 +269,8 @@ object SourceNavigationHelper {
if (DumbService.isDumb(from.project)) return from if (DumbService.isDumb(from.project)) return from
when (navigationKind) { when (navigationKind) {
SourceNavigationHelper.NavigationKind.CLASS_FILES_TO_SOURCES -> if (!from.containingKtFile.isCompiled) return from NavigationKind.CLASS_FILES_TO_SOURCES -> if (!from.containingKtFile.isCompiled) return from
SourceNavigationHelper.NavigationKind.SOURCES_TO_CLASS_FILES -> { NavigationKind.SOURCES_TO_CLASS_FILES -> {
val file = from.containingFile val file = from.containingFile
if (file is KtFile && file.isCompiled) return from if (file is KtFile && file.isCompiled) return from
if (!ProjectRootsUtil.isInContent( if (!ProjectRootsUtil.isInContent(
idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
+1 -1
View File
@@ -242,7 +242,7 @@ internal fun ElementAndTextList.convertCodeToKotlin(project: Project, targetModu
val inputElements = this.toList().filterIsInstance<PsiElement>() val inputElements = this.toList().filterIsInstance<PsiElement>()
val (results, _, converterContext) = val (results, _, converterContext) =
ProgressManager.getInstance().runProcessWithProgressSynchronously( ProgressManager.getInstance().runProcessWithProgressSynchronously(
ThrowableComputable<org.jetbrains.kotlin.j2k.Result, Exception> { ThrowableComputable<Result, Exception> {
runReadAction { converter.elementsToKotlin(inputElements) } runReadAction { converter.elementsToKotlin(inputElements) }
}, },
JavaToKotlinAction.title, JavaToKotlinAction.title,