feat: Support sting type tasks.depends code completion (#127)

134130 · Jan 5, 2025 · ddd4af2 · ddd4af2
1 parent d60d257
commit ddd4af2
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 6 deletions.
diff --git a/.../main/kotlin/com/github/l34130/mise/core/lang/completion/MiseTomlCompletionContributor.kt b/.../main/kotlin/com/github/l34130/mise/core/lang/completion/MiseTomlCompletionContributor.kt
@@ -3,9 +3,14 @@ package com.github.l34130.mise.core.lang.completion
 import com.github.l34130.mise.core.lang.psi.MiseTomlPsiPatterns
 import com.intellij.codeInsight.completion.CompletionContributor
 import com.intellij.codeInsight.completion.CompletionType
+import com.intellij.patterns.StandardPatterns
 
 class MiseTomlCompletionContributor : CompletionContributor() {
     init {
-        extend(CompletionType.BASIC, MiseTomlPsiPatterns.inTaskDependsArray, MiseTomlTaskCompletionProvider())
+        extend(
+            CompletionType.BASIC,
+            StandardPatterns.or(MiseTomlPsiPatterns.inTaskDependsArray, MiseTomlPsiPatterns.inTaskDependsString),
+            MiseTomlTaskCompletionProvider(),
+        )
     }
 }
diff --git a/...main/kotlin/com/github/l34130/mise/core/lang/completion/MiseTomlTaskCompletionProvider.kt b/...main/kotlin/com/github/l34130/mise/core/lang/completion/MiseTomlTaskCompletionProvider.kt
@@ -16,11 +16,24 @@ import org.toml.lang.psi.TomlTable
 /**
  * ```
  * [tasks.foo]
- * ...
+ * run = "..."
+ * ```
+ *
+ * then
  *
+ * ```
  * [tasks.<task-name>]
  * depends = [ "f<caret>" ]
  *             #^ Provides completion for "foo"
+ * ```
+ *
+ * or
+ *
+ * ```
+ * [tasks.<task-name>]
+ * depends = "f<caret>"
+ *           #^ Provides completion for "foo"
+ * ```
  */
 class MiseTomlTaskCompletionProvider : CompletionProvider<CompletionParameters>() {
     override fun addCompletions(
@@ -31,14 +44,14 @@ class MiseTomlTaskCompletionProvider : CompletionProvider<CompletionParameters>(
         val element = parameters.position
         val miseTomlFile = element.containingFile as? MiseTomlFile ?: return
 
-        val dependsArray = (element.parent.parent as? TomlArray) ?: return
+        val dependsArray = (element.parent.parent as? TomlArray)
 
         val parentTable = element.parentOfType<TomlTable>() ?: return
         val parentTaskName = parentTable.taskName
 
         for (task in miseTomlFile.allTasks()) {
             val taskName = task.name ?: continue
-            if (dependsArray.elements.any { it.stringValue == taskName }) continue
+            if (dependsArray?.elements?.any { it.stringValue == taskName } == true) continue
             if (taskName == parentTaskName) continue
 
             result.addElement(
@@ -48,6 +61,4 @@ class MiseTomlTaskCompletionProvider : CompletionProvider<CompletionParameters>(
             )
         }
     }
-
-    // TODO: Need to support literal string completion
 }
diff --git a/modules/core/src/main/kotlin/com/github/l34130/mise/core/lang/psi/MiseTomlPsiPatterns.kt b/modules/core/src/main/kotlin/com/github/l34130/mise/core/lang/psi/MiseTomlPsiPatterns.kt
@@ -80,6 +80,28 @@ object MiseTomlPsiPatterns {
         )
     val inTaskDependsArray = miseTomlPsiElement<PsiElement>().inside(onTaskDependsArray)
 
+    /**
+     * ```
+     * [tasks]
+     * foo = { version = "*", depends = "" }
+     *                                 #^
+     * ```
+     *
+     * ```
+     * [tasks.foo]
+     * depends = ""
+     *          #^
+     * ```
+     */
+    private val onTaskDependsString =
+        StandardPatterns.or(
+            miseTomlStringLiteral()
+                .withParent(taskProperty("depends")),
+            miseTomlStringLiteral()
+                .withParent(taskProperty("depends_post")),
+        )
+    val inTaskDependsString = miseTomlPsiElement<PsiElement>().inside(onTaskDependsString)
+
     inline fun <reified I : PsiElement> psiElement() = PlatformPatterns.psiElement(I::class.java)
 
     fun <T : Any, Self : ObjectPattern<T, Self>> ObjectPattern<T, Self>.with(