User: rednesto Date: 13 Sep 24 12:11 Revision: 15e3806b06360b7f7eca2163627a1e47886e4bae Summary: Override new shouldSkipAutopopup, as the old one is deprecated TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9689&personal=false Index: src/main/kotlin/platform/mixin/completion/MixinCompletionConfidence.kt =================================================================== --- src/main/kotlin/platform/mixin/completion/MixinCompletionConfidence.kt (revision 44ffaaa615f66ccf70209edb58c56aceb3cc4676) +++ src/main/kotlin/platform/mixin/completion/MixinCompletionConfidence.kt (revision 15e3806b06360b7f7eca2163627a1e47886e4bae) @@ -24,6 +24,7 @@ import com.demonwav.mcdev.platform.mixin.util.MixinConstants import com.intellij.codeInsight.completion.CompletionConfidence import com.intellij.codeInsight.completion.SkipAutopopupInStrings +import com.intellij.openapi.editor.Editor import com.intellij.patterns.PlatformPatterns import com.intellij.patterns.PsiJavaPatterns import com.intellij.patterns.StandardPatterns @@ -47,7 +48,12 @@ PlatformPatterns.psiFile(), )!! - override fun shouldSkipAutopopup(element: PsiElement, psiFile: PsiFile, offset: Int): ThreeState { + override fun shouldSkipAutopopup( + editor: Editor, + element: PsiElement, + psiFile: PsiFile, + offset: Int + ): ThreeState { // Enable auto complete for all string literals which are children of one of the annotations in Mixin // TODO: Make this more reliable (we don't need to enable it for all parts of the annotation) return if (SkipAutopopupInStrings.isInStringLiteral(element) && mixinAnnotation.accepts(element)) { Index: src/main/kotlin/translations/reference/TranslationReferenceCompletionConfidence.kt =================================================================== --- src/main/kotlin/translations/reference/TranslationReferenceCompletionConfidence.kt (revision 44ffaaa615f66ccf70209edb58c56aceb3cc4676) +++ src/main/kotlin/translations/reference/TranslationReferenceCompletionConfidence.kt (revision 15e3806b06360b7f7eca2163627a1e47886e4bae) @@ -22,12 +22,19 @@ import com.intellij.codeInsight.completion.CompletionConfidence import com.intellij.codeInsight.completion.SkipAutopopupInStrings +import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.util.ThreeState class TranslationReferenceCompletionConfidence : CompletionConfidence() { - override fun shouldSkipAutopopup(element: PsiElement, psiFile: PsiFile, offset: Int): ThreeState { + + override fun shouldSkipAutopopup( + editor: Editor, + element: PsiElement, + psiFile: PsiFile, + offset: Int + ): ThreeState { return if ( SkipAutopopupInStrings.isInStringLiteral(element) && element.parent.references.any { it is TranslationReference }