feat: add inline code support

unit-mesh · Dec 16, 2023 · 5c784ab · 5c784ab
1 parent 15683a0
commit 5c784ab
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/unit-picker/src/main/kotlin/cc/unitmesh/pick/prompt/InstructionBuilder.kt b/unit-picker/src/main/kotlin/cc/unitmesh/pick/prompt/InstructionBuilder.kt
@@ -7,7 +7,6 @@ import kotlinx.serialization.json.Json
 
 @Serializable
 data class CodeCompletionIns(
-    val language: String,
     val beforeCursor: String,
     val afterCursor: String,
 ) {

diff --git a/...picker/src/main/kotlin/cc/unitmesh/pick/prompt/builder/AfterBlockCodeCompletionBuilder.kt b/...picker/src/main/kotlin/cc/unitmesh/pick/prompt/builder/AfterBlockCodeCompletionBuilder.kt
@@ -8,6 +8,18 @@ import chapi.domain.core.CodeFunction
 
 class AfterBlockCodeCompletionBuilder(val context: JobContext) : InstructionBuilder {
     override fun build(function: CodeFunction): List<CodeCompletionIns> {
-        TODO("Not yet implemented")
+        val position = function.Position
+        val beforeCursor = context.job.codeLines.subList(0, position.StartLine).joinToString("\n")
+
+        // pick after lines
+        val stopLine = if (position.StopLine == 0) {
+            context.job.codeLines.size
+        } else {
+            position.StopLine
+        }
+
+        val afterCursor = context.job.codeLines.subList(position.StartLine, stopLine).joinToString("\n")
+
+        return listOf(CodeCompletionIns(beforeCursor, afterCursor))
     }
 }
diff --git a/unit-picker/src/main/kotlin/cc/unitmesh/pick/prompt/builder/InBlockCodeCompletionBuilder.kt b/unit-picker/src/main/kotlin/cc/unitmesh/pick/prompt/builder/InBlockCodeCompletionBuilder.kt
@@ -7,7 +7,17 @@ import chapi.domain.core.CodeFunction
 
 class InBlockCodeCompletionBuilder(val context: JobContext) : InstructionBuilder {
     override fun build(function: CodeFunction): List<CodeCompletionIns> {
-        TODO("Not yet implemented")
-    }
+        val position = function.Position
+        val beforeCursor = context.job.codeLines.subList(0, position.StartLine).joinToString("\n")
+
+        val stopLine = if (position.StopLine == 0) {
+            context.job.codeLines.size
+        } else {
+            position.StopLine
+        }
 
+        val afterCursor = context.job.codeLines.subList(position.StartLine, stopLine).joinToString("\n")
+
+        return listOf(CodeCompletionIns(beforeCursor, afterCursor))
+    }
 }
diff --git a/unit-picker/src/main/kotlin/cc/unitmesh/pick/prompt/builder/InlineCodeCompletionBuilder.kt b/unit-picker/src/main/kotlin/cc/unitmesh/pick/prompt/builder/InlineCodeCompletionBuilder.kt
@@ -6,8 +6,11 @@ import cc.unitmesh.pick.prompt.JobContext
 import chapi.domain.core.CodeFunction
 
 class InlineCodeCompletionBuilder(val context: JobContext) : InstructionBuilder {
+    fun isValidTypeOver(char: Char): Boolean {
+        return char == ')' || char == ']' || char == '}' || char == '"' || char == '\'' || char == '>' || char == ';'
+    }
+
     override fun build(function: CodeFunction): List<CodeCompletionIns> {
         TODO("Not yet implemented")
     }
-
 }
diff --git a/...picker/src/main/kotlin/cc/unitmesh/pick/prompt/strategy/SimilarChunksCompletionBuilder.kt b/...picker/src/main/kotlin/cc/unitmesh/pick/prompt/strategy/SimilarChunksCompletionBuilder.kt
@@ -2,6 +2,7 @@ package cc.unitmesh.pick.prompt.strategy
 
 import cc.unitmesh.pick.prompt.Instruction
 import cc.unitmesh.pick.prompt.CodeContextBuilder
+import cc.unitmesh.pick.prompt.InstructionBuilder
 import cc.unitmesh.pick.prompt.JobContext
 import cc.unitmesh.pick.related.JavaSimilarChunker
 import kotlinx.serialization.Serializable