fix(builder): 优化上下文提供者处理逻辑

- 修正上下文提供者处理逻辑，确保正确处理 `null` 值。
- 更新提示指令格式，使其更清晰。
- 恢复 `MethodContextProvider` 的正确顺序。

空行后详细解释：
- 修正了 `firstNotNullOfOrNull` 的使用，确保返回 `null` 时不会影响后续逻辑。
- 调整了提示指令的格式，增加了更清晰的分隔和描述。
- 恢复了 `MethodContextProvider` 在上下文提供者列表中的正确位置。

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/custom/document/CustomLivingDocPromptBuilder.kt

@@ -19,26 +19,39 @@ class CustomLivingDocPromptBuilder(
             val instruction = StringBuilder(fallbackText)
 
             var inOutString = ""
-            this.contextProviders.firstNotNullOfOrNull { contextProvider ->
-                when (val llmQueryContext = contextProvider.from(target)) {
-                    is MethodContext -> {
-                        inOutString = llmQueryContext.inputOutputString()
-                    }
+            val context = contextProviders.firstNotNullOfOrNull { contextProvider ->
+                val llmQueryContext = contextProvider.from(target)
+
+                if (llmQueryContext != null) {
+                    return@firstNotNullOfOrNull llmQueryContext
+                }
+
+                return@firstNotNullOfOrNull null
+            }
+
+            if (context != null) {
+                val related = "\nHere is related context information of the method\n\n```${target.language}\n" + context.format() + "\n```\n"
+                instruction.append(related)
+            }
+
+            when (context) {
+                is MethodContext -> {
+                    inOutString = context.inputOutputString()
                 }
             }
 
             if (inOutString.isNotEmpty()) {
-                instruction.append("\nCompare this snippet: \n")
+                instruction.append("\nInput and output: \n")
                 instruction.append(inOutString)
                 instruction.append("\n")
             }
 
             val lang = target.language.displayName;
             if (config.example != null) {
-                instruction.append("Q: ```$lang\n${config.example.question}\n```\n")
-                instruction.append("A: ${config.example.answer}\n")
-                instruction.append("Q: ```$lang\n${target.text}\n```\n")
-                instruction.append("A: ")
+                instruction.append("Question: ```$lang\n${config.example.question}\n```\n")
+                instruction.append("Answer: ${config.example.answer}\n")
+                instruction.append("Question: ```$lang\n${target.text}\n```\n")
+                instruction.append("Answer: ")
             }
 
             return@compute instruction.toString();

core/src/main/kotlin/cc/unitmesh/devti/intentions/action/task/LivingDocPromptBuilder.kt

@@ -46,12 +46,12 @@ open class LivingDocPromptBuilder(
     private val logger = logger<LivingDocPromptBuilder>()
 
     protected val contextProviders = listOf(
-        VariableContextProvider(false, false, false),
+        MethodContextProvider(true, false),
         ClassContextProvider(false),
-        MethodContextProvider(true, false)
+        VariableContextProvider(false, false, false)
     )
 
-    private fun contextInstruction(context: LLMCodeContext?): String? {
+    protected fun contextInstruction(context: LLMCodeContext?): String? {
         return when (context) {
             is ClassContext -> classInstruction(context)
             is MethodContext -> methodInstruction(context)
@@ -93,7 +93,7 @@ open class LivingDocPromptBuilder(
 
         // here is related context information of the method
 
-        val related = "\nHere is related context information of the method\n\n```${context.language}" + context.format() + "\n```\n"
+        val related = "\nHere is related context information of the method\n\n```${context.language}\n" + context.format() + "\n```\n"
         return instruction.trimStart() + related
     }
 

gradle.properties

@@ -7,7 +7,7 @@ pluginGroup = com.phodal.autodev
 pluginName = AutoDev
 pluginRepositoryUrl = https://github.com/unit-mesh/auto-dev
 # SemVer format -> https://semver.org
-pluginVersion = 1.8.15
+pluginVersion = 1.8.16-SNAPSHOT
 
 # Supported IDEs: idea, pycharm
 baseIDE=idea