Merge pull request #194 from pontem-network/fq-completion

fully qualified path completion tests
pontem-network · Oct 1, 2024 · c4828b6 · c4828b6
2 parents 8bfb9b4 + c8061bf
commit c4828b6
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -76,7 +76,7 @@ version = pluginVersion
 plugins {
     id("java")
     kotlin("jvm") version "2.0.20"
-    id("org.jetbrains.intellij.platform") version "2.0.1"
+    id("org.jetbrains.intellij.platform") version "2.1.0"
     id("org.jetbrains.grammarkit") version "2022.3.2.2"
     id("net.saliman.properties") version "1.5.2"
     id("org.gradle.idea")

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/ide/annotator/HighlightingAnnotatorTest.kt b/src/test/kotlin/org/move/ide/annotator/HighlightingAnnotatorTest.kt
@@ -349,6 +349,12 @@ class HighlightingAnnotatorTest: AnnotatorTestCase(HighlightingAnnotator::class)
     """
     )
 
+    fun `test enum highlighting`() = checkHighlighting("""
+        module 0x1::m {
+            <KEYWORD>enum</KEYWORD> <ENUM>S</ENUM> { One, Two(u8) }
+        }        
+    """)
+
 //    fun `test resource access control keywords highlighting`() = checkHighlighting(
 //        """
 //        module 0x1::m {

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,20 @@ class StructsCompletionTest: CompletionTestCase() {
             }
         }        
     """)
+
+    fun `test fq enum completion`() = doSingleCompletion("""
+        module 0x1::m {
+            enum Color { Red, Blue }
+            fun main() {
+                let s: 0x1::m::Col/*caret*/
+            }
+        }        
+    """, """
+        module 0x1::m {
+            enum Color { Red, Blue }
+            fun main() {
+                let s: 0x1::m::Color/*caret*/
+            }
+        }        
+    """)
 }