fix: fix prompting issue

unit-mesh · Jul 13, 2023 · 01966ec · 01966ec
1 parent abca035
commit 01966ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/kotlin/cc/unitmesh/devti/connector/custom/PromptConfig.kt b/src/main/kotlin/cc/unitmesh/devti/connector/custom/PromptConfig.kt
@@ -27,7 +27,7 @@ data class PromptConfig(
 
         fun default(): PromptConfig {
             return PromptConfig(
-                PromptItem("Auto complete code", "{code}"),
+                PromptItem("Complete java code, return rest code, no explaining.", "{code}"),
                 PromptItem("Auto comment code", "{code}"),
                 PromptItem("Code review code", "{code}"),
                 PromptItem("Find bug", "{code}"),

diff --git a/src/main/kotlin/cc/unitmesh/devti/prompting/JavaActionPrompting.kt b/src/main/kotlin/cc/unitmesh/devti/prompting/JavaActionPrompting.kt
@@ -41,7 +41,8 @@ class JavaActionPrompting(
     override fun getUIPrompt(): String {
         val prompt = createPrompt(selectedText)
         val finalPrompt = if (additionContext.isNotEmpty()) {
-            "```java\n$additionContext\n$selectedText```"
+            """$additionContext
+                |$selectedText""".trimMargin()
         } else {
             selectedText
         }
@@ -54,7 +55,8 @@ class JavaActionPrompting(
     override fun getRequestPrompt(): String {
         val prompt = createPrompt(selectedText)
         val finalPrompt = if (additionContext.isNotEmpty()) {
-            "```java\n$additionContext\n$selectedText```"
+            """$additionContext
+                |$selectedText""".trimMargin()
         } else {
             selectedText
         }

diff --git a/src/main/kotlin/cc/unitmesh/devti/prompting/jvm/MvcContextService.kt b/src/main/kotlin/cc/unitmesh/devti/prompting/jvm/MvcContextService.kt
@@ -45,7 +45,7 @@ class MvcContextService(private val project: Project) {
         val file = psiFile as? PsiJavaFileImpl
         val relevantModel = prepareServiceContext(file)
 
-        return """Complete java code, return rest code, no explaining.
+        return """
 ${relevantModel?.joinToString("\n")}
 """
     }
@@ -70,8 +70,7 @@ ${relevantModel?.joinToString("\n")}
         val relevantModel = (services ?: emptyList()) + (models ?: emptyList())
 
         val clazz = DtClass.fromJavaFile(file)
-        return """Complete java code, return rest code, no explaining. 
-```java
+        return """ 
 ${relevantModel.joinToString("\n")}\n
 // current path: ${clazz.path}
 """