COMP: Show the trait of an method

intellij-rust · May 5, 2017 · 7589d94 · 7589d94
1 parent 6ddafc0
commit 7589d94
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/main/kotlin/org/rust/lang/core/completion/CompletionEngine.kt b/src/main/kotlin/org/rust/lang/core/completion/CompletionEngine.kt
@@ -17,6 +17,11 @@ object CompletionEngine {
     const val KEYWORD_PRIORITY = 10.0
 }
 
+private fun RsFunction.generateAppendTailText(): String {
+    val trait = parentOfType<RsImplItem>()?.traitRef?.text ?: return ""
+    return " by $trait"
+}
+
 fun RsCompositeElement.createLookupElement(scopeName: String): LookupElement {
     val base = LookupElementBuilder.create(this, scopeName)
         .withIcon(if (this is RsFile) RsIcons.MODULE else getIcon(0))
@@ -35,6 +40,7 @@ fun RsCompositeElement.createLookupElement(scopeName: String): LookupElement {
         is RsFunction -> base
             .withTypeText(retType?.typeReference?.text ?: "()")
             .withTailText(valueParameterList?.text?.replace("\\s+".toRegex(), " ") ?: "()")
+            .appendTailText(generateAppendTailText(), false)
             .withInsertHandler handler@ { context: InsertionContext, _: LookupElement ->
                 if (context.isInUseBlock) return@handler
                 if (context.alreadyHasParens) return@handler

diff --git a/src/test/kotlin/org/rust/lang/core/completion/RsLookupElementTest.kt b/src/test/kotlin/org/rust/lang/core/completion/RsLookupElementTest.kt
@@ -20,6 +20,19 @@ class RsLookupElementTest : RsTestBase() {
         }
     """, tailText = "(&self, x: i32)", typeText = "()")
 
+    fun testTraitByMethod() = check("""
+        trait T {
+            fn foo(&self, x: i32);
+        }
+        struct S;
+        impl T for S {
+            fn foo(&self, x: i32) {
+              //^
+                unimplemented!()
+            }
+        }
+    """, tailText = "(&self, x: i32) by T", typeText = "()")
+
     fun testConsItem() = check("""
         const c: S = unimplemented!();
             //^