Do not include "operator" and "infix" into completion item text for override

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt

@@ -192,6 +192,7 @@ interface DescriptorRendererOptions {
     var alwaysRenderModifiers: Boolean
     var renderConstructorKeyword: Boolean
     var renderUnabbreviatedType: Boolean
+    var includeAdditionalModifiers: Boolean
 }
 
 object ExcludedTypeAnnotations {

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt

@@ -579,7 +579,11 @@ internal class DescriptorRendererImpl(
             renderAnnotations(function, builder)
             renderVisibility(function.visibility, builder)
             renderModalityForCallable(function, builder)
-            renderAdditionalModifiers(function, builder)
+
+            if (includeAdditionalModifiers) {
+                renderAdditionalModifiers(function, builder)
+            }
+
             renderOverride(function, builder)
             renderMemberKind(function, builder)
 

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt

@@ -101,4 +101,6 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions {
     override var renderConstructorKeyword by property(true)
 
     override var renderUnabbreviatedType: Boolean by property(true)
+
+    override var includeAdditionalModifiers: Boolean by property(true)
 }

idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt

@@ -48,6 +48,7 @@ class OverridesCompletion(
 ) {
     private val PRESENTATION_RENDERER = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.withOptions {
         modifiers = emptySet()
+        includeAdditionalModifiers = false
     }
 
     fun complete(position: PsiElement, declaration: KtCallableDeclaration?) {

idea/idea-completion/testData/basic/common/override/AfterFunKeyword.kt

@@ -21,7 +21,7 @@ class A : Base2(), I {
 
 // EXIST: { itemText: "override fun bar() {...}", lookupString: "bar", tailText: null, typeText: "Base1", attributes: "" }
 // EXIST: { itemText: "override fun foo() {...}", lookupString: "foo", tailText: null, typeText: "I", attributes: "bold" }
-// EXIST: { itemText: "override operator fun equals(other: Any?): Boolean {...}", lookupString: "equals", tailText: null, typeText: "Any", attributes: "" }
+// EXIST: { itemText: "override fun equals(other: Any?): Boolean {...}", lookupString: "equals", tailText: null, typeText: "Any", attributes: "" }
 // EXIST: { itemText: "override fun hashCode(): Int {...}", lookupString: "hashCode", tailText: null, typeText: "Any", attributes: "" }
 // EXIST: { itemText: "override fun toString(): String {...}", lookupString: "toString", tailText: null, typeText: "Any", attributes: "" }
 // NOTHING_ELSE

idea/idea-completion/testData/basic/common/override/Generics.kt

@@ -9,4 +9,4 @@ class A<T> : List<String>, I<T> {
 // EXIST: { lookupString: "override", itemText: "override" }
 // EXIST: { itemText: "override fun hashCode(): Int {...}", tailText: null, typeText: "Any", attributes: "" }
 // EXIST: { itemText: "override fun foo(t: T): T {...}", tailText: null, typeText: "I", attributes: "bold" }
-// EXIST: { itemText: "override operator fun get(index: Int): String {...}", tailText: null, typeText: "List", attributes: "bold" }
+// EXIST: { itemText: "override fun get(index: Int): String {...}", tailText: null, typeText: "List", attributes: "bold" }

idea/idea-completion/testData/basic/common/override/Simple.kt

@@ -1,5 +1,5 @@
 interface I {
-    fun foo()
+    infix fun foo(p: Int)
     val someVal: Int
     var someVar: Int
 }
@@ -17,8 +17,8 @@ class A : Base2(), I {
 
 // EXIST: { lookupString: "override", itemText: "override" }
 // EXIST: { itemText: "override fun bar() {...}", lookupString: "override", allLookupStrings: "bar, override", tailText: null, typeText: "Base1", attributes: "" }
-// EXIST: { itemText: "override operator fun equals(other: Any?): Boolean {...}", lookupString: "override", allLookupStrings: "equals, override", tailText: null, typeText: "Any", attributes: "" }
-// EXIST: { itemText: "override fun foo() {...}", lookupString: "override", allLookupStrings: "foo, override", tailText: null, typeText: "I", attributes: "bold" }
+// EXIST: { itemText: "override fun equals(other: Any?): Boolean {...}", lookupString: "override", allLookupStrings: "equals, override", tailText: null, typeText: "Any", attributes: "" }
+// EXIST: { itemText: "override fun foo(p: Int) {...}", lookupString: "override", allLookupStrings: "foo, override", tailText: null, typeText: "I", attributes: "bold" }
 // EXIST: { itemText: "override fun hashCode(): Int {...}", lookupString: "override", allLookupStrings: "hashCode, override", tailText: null, typeText: "Any", attributes: "" }
 // EXIST: { itemText: "override val someVal: Int", lookupString: "override", allLookupStrings: "override, someVal", tailText: null, typeText: "I", attributes: "bold" }
 // EXIST: { itemText: "override var someVar: Int", lookupString: "override", allLookupStrings: "override, someVar", tailText: null, typeText: "I", attributes: "bold" }

idea/idea-completion/testData/handlers/basic/override/AfterFunKeywordKeepModifiersBefore.kt

@@ -3,4 +3,4 @@ class A {
     public override fun e<caret>
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/AfterFunKeywordKeepModifiersBefore.kt.after

@@ -5,4 +5,4 @@ class A {
     }
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt

@@ -3,4 +3,4 @@ class A {
     o<caret>
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt.after

@@ -5,4 +5,4 @@ class A {
     }
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt

@@ -3,4 +3,4 @@ class A {
     public o<caret>
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt.after

@@ -5,4 +5,4 @@ class A {
     }
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt

@@ -2,4 +2,4 @@ class A {
     o<caret>
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt.after

@@ -4,4 +4,4 @@ class A {
     }
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/TypeFunctionName.kt

@@ -2,4 +2,4 @@ class A {
     equ<caret>
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"

idea/idea-completion/testData/handlers/basic/override/TypeFunctionName.kt.after

@@ -4,4 +4,4 @@ class A {
     }
 }
 
-// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"