fix(completion): fix completion of variants with the same name

server/src/completion/ReferenceCompletionProcessor.ts

@@ -263,8 +263,13 @@ export class ReferenceCompletionProcessor implements ScopeProcessor {
 
     public addItem(node: WeightedCompletionItem) {
         if (node.label === "") return
-        const prev = this.result.get(node.label)
+        const lookup = this.lookupString(node)
+        const prev = this.result.get(lookup)
         if (prev && prev.kind === node.kind) return
-        this.result.set(node.label, node)
+        this.result.set(lookup, node)
+    }
+
+    private lookupString(item: WeightedCompletionItem): string {
+        return (item.kind ?? 1).toString() + item.label
     }
 }

server/src/e2e/suite/testcases/completion/fields.test

@@ -204,3 +204,26 @@ fun foo(f: User?) {
 9  address: Address?   of User
 9  age: Int?   of User
 9  name: String   of User
+
+========================================================================
+Field with same name method
+========================================================================
+primitive Int;
+primitive Address;
+primitive String;
+
+trait Foo {
+    name: String;
+
+    fun name(): String {
+        return self.name;
+    }
+
+    fun bar() {
+        return self.<caret>;
+    }
+}
+------------------------------------------------------------------------
+9  name: String   of Foo
+2  bar()
+2  name(): String

server/src/e2e/suite/testcases/completion/variables.test

@@ -486,3 +486,35 @@ fun test() {
 14 try-catch
 14 until
 14 while
+
+========================================================================
+Variable and function with the same name
+========================================================================
+primitive Int;
+
+fun first() {}
+
+fun test() {
+    let first = 1;
+    <caret>
+}
+------------------------------------------------------------------------
+5  first   Int
+13 false
+13 initOf Contract(params)   StateInit
+13 null
+13 return;
+13 true
+2  first()
+2  test()
+14 do
+14 foreach
+14 if
+14 ife
+14 let
+14 lett
+14 repeat
+14 try
+14 try-catch
+14 until
+14 while