add current module to fq completiom

pontem-network · Sep 30, 2024 · 0471c3d · 0471c3d
1 parent 4be28f1
commit 0471c3d
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 12 deletions.
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider2.kt b/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider2.kt
@@ -161,9 +161,9 @@ fun applySharedCompletionFilters(
 ): RsResolveProcessor {
     var processor = processor0
     processor = filterPathVariantsByUseGroupContext(resolutionCtx, processor)
-    if (MODULE in ns) {
-        processor = removeCurrentModuleItem(resolutionCtx, processor)
-    }
+//    if (MODULE in ns) {
+//        processor = removeCurrentModuleItem(resolutionCtx, processor)
+//    }
     return processor
 }
 

diff --git a/src/test/kotlin/org/move/lang/completion/names/ModulesCompletionTest.kt b/src/test/kotlin/org/move/lang/completion/names/ModulesCompletionTest.kt
@@ -196,15 +196,15 @@ class ModulesCompletionTest: CompletionTestCase() {
     """
     )
 
-    fun `test module name itself should not be present in completion`() = checkNoCompletion(
-        """
-    module 0x1::Main {
-        fun call() {
-            Ma/*caret*/
-        }
-    }    
-    """
-    )
+//    fun `test module name itself should not be present in completion`() = checkNoCompletion(
+//        """
+//    module 0x1::Main {
+//        fun call() {
+//            Ma/*caret*/
+//        }
+//    }
+//    """
+//    )
 
     fun `test test_only modules not present in non test_only scopes`() = checkNoCompletion(
         """
@@ -272,4 +272,18 @@ class ModulesCompletionTest: CompletionTestCase() {
             }
         }
     """)
+
+    fun `test current module completion for the fq address`() = doSingleCompletion("""
+        module 0x1::main {
+            fun main() {
+                0x1::m/*caret*/
+            }
+        }        
+    """, """
+        module 0x1::main {
+            fun main() {
+                0x1::main/*caret*/
+            }
+        }        
+    """)
 }
diff --git a/src/test/kotlin/org/move/lang/completion/names/StructsCompletionTest.kt b/src/test/kotlin/org/move/lang/completion/names/StructsCompletionTest.kt
@@ -335,4 +335,36 @@ class StructsCompletionTest: CompletionTestCase() {
             }
         }        
     """)
+
+    fun `test fq enum completion`() = doSingleCompletion("""
+        module 0x1::m {
+            enum Color { Red, Blue }
+            fun main() {
+                0x1::m::Col/*caret*/
+            }
+        }        
+    """, """
+        module 0x1::m {
+            enum Color { Red, Blue }
+            fun main() {
+                0x1::m::Color/*caret*/
+            }
+        }        
+    """)
+
+    fun `test fq enum item completion`() = doSingleCompletion("""
+        module 0x1::m {
+            enum Color { Red, Blue }
+            fun main() {
+                0x1::m::Color::R/*caret*/
+            }
+        }        
+    """, """
+        module 0x1::m {
+            enum Color { Red, Blue }
+            fun main() {
+                0x1::m::Color::Red/*caret*/
+            }
+        }        
+    """)
 }