From f77825b85abebc6ad98a0e834de365c6f746aed5 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sun, 29 Sep 2019 11:27:12 +0300 Subject: [PATCH] New J2K: remove `RedundantCompanionReferenceInspectionBasedProcessing` as it already applied on shortening references --- .../kotlin/nj2k/postProcessing/J2kPostProcessor.kt | 1 - .../processings/inspeсtionLikeProcessings.kt | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt index 9b440b949ee..c4105783305 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt @@ -147,7 +147,6 @@ private val removeRedundantElementsProcessingGroup = processings = listOf( RemoveExplicitTypeArgumentsProcessing(), RemoveJavaStreamsCollectCallTypeArgumentsProcessing(), - RedundantCompanionReferenceInspectionBasedProcessing(), ExplicitThisInspectionBasedProcessing(), intentionBasedProcessing(RemoveEmptyClassBodyIntention()) ) diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt index 20e5d92248f..dfd15b6ceb8 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt @@ -442,17 +442,6 @@ class RedundantSemicolonInspectionBasedProcessing : } } - -class RedundantCompanionReferenceInspectionBasedProcessing : - InspectionLikeProcessingForElement(KtReferenceExpression::class.java) { - override fun isApplicableTo(element: KtReferenceExpression, settings: ConverterSettings?): Boolean = - RedundantCompanionReferenceInspection.isRedundantCompanionReference(element) - - override fun apply(element: KtReferenceExpression) { - RemoveRedundantCompanionReferenceFix.removeRedundantCompanionReference(element) - } -} - class ExplicitThisInspectionBasedProcessing : InspectionLikeProcessingForElement(KtExpression::class.java) { override fun isApplicableTo(element: KtExpression, settings: ConverterSettings?): Boolean =