diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt index dbd48bfcf9a..686082e79fc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt @@ -40,6 +40,10 @@ class AddOperatorModifierIntention : JetSelfTargetingRangeIntention(Errors.USELESS_CAST) { element, diagnostic -> val expression = RemoveRightPartOfBinaryExpressionFix(element, "").invoke() diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt index 274ec7f8f3c..5745006f66c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt @@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.util.SmartList +import org.jetbrains.kotlin.idea.caches.resolve.KotlinOutOfBlockCompletionModificationTracker import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference import org.jetbrains.kotlin.idea.conversion.copy.range @@ -32,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.psiUtil.elementsInRange import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics -import java.util.LinkedHashMap +import java.util.* public class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor { override fun insertImport(file: JetFile, fqName: FqName) { @@ -65,6 +66,9 @@ public class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor { if (modificationStamp == file.modificationStamp) break + //TODO: it's a hack! + KotlinOutOfBlockCompletionModificationTracker.getInstance(file.project).incModificationCount() + elementToActions = collectAvailableActions(file, rangeMarker) } diff --git a/j2k/testData/fileOrElement/postProcessing/GetOperator.kt b/j2k/testData/fileOrElement/postProcessing/GetOperator.kt index c1953f369ff..d479f3f1676 100644 --- a/j2k/testData/fileOrElement/postProcessing/GetOperator.kt +++ b/j2k/testData/fileOrElement/postProcessing/GetOperator.kt @@ -3,7 +3,7 @@ import java.util.HashMap import kotlinApi.KotlinClass internal class X { - fun get(index: Int): Int { + operator fun get(index: Int): Int { return 0 } } @@ -14,7 +14,7 @@ internal class C { } fun foo(x: X): Int { - return x.get(0) + return x[0] } fun foo(kotlinClass: KotlinClass): Int {