refactor(core): rename Code to CodeFence and update usages

phodal · phodal · commit d6fa92a67381 · 2024-12-15T12:56:42.000+08:00
Update the `Code` class to `CodeFence` and replace all instances of `Code` with `CodeFence` throughout the codebase. This includes imports, variable declarations, and method calls. The `CodeFence` class now also includes an optional `extension` parameter. Update related test classes and method names to reflect the change from `Code` to `CodeFence`.
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/agent/CustomAgentChatProcessor.kt b/core/src/main/kotlin/cc/unitmesh/devti/agent/CustomAgentChatProcessor.kt
@@ -11,7 +11,7 @@ import cc.unitmesh.devti.provider.ContextPrompter
 import cc.unitmesh.devti.provider.devins.LanguagePromptProcessor
 import cc.unitmesh.devti.provider.devins.CustomAgentContext
 import cc.unitmesh.devti.util.LLMCoroutineScope
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.logger
@@ -56,7 +56,7 @@ class CustomAgentChatProcessor(val project: Project) {
                 llmProvider.appendLocalMessage(content, ChatRole.Assistant)
                 message.reRenderAssistantOutput()
 
-                val code = Code.parse(content)
+                val code = CodeFence.parse(content)
                 if (code.language.displayName == "DevIn") {
                     devInCode = code.text
                 }
@@ -76,7 +76,7 @@ class CustomAgentChatProcessor(val project: Project) {
                 ui.hiddenProgressBar()
                 ui.updateUI()
 
-                val code = Code.parse(msg)
+                val code = CodeFence.parse(msg)
                 if (code.language.displayName == "DevIn") {
                     devInCode = code.text
                 }
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/custom/tasks/FileGenerateTask.kt b/core/src/main/kotlin/cc/unitmesh/devti/custom/tasks/FileGenerateTask.kt
@@ -4,7 +4,7 @@ import cc.unitmesh.cf.core.llms.LlmMsg
 import cc.unitmesh.cf.core.parser.MarkdownCode
 import cc.unitmesh.devti.AutoDevBundle
 import cc.unitmesh.devti.llms.LlmFactory
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
@@ -18,7 +18,6 @@ import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.runBlocking
 import java.nio.file.Path
 import kotlin.io.path.Path
-import kotlinx.coroutines.flow.*
 
 class FileGenerateTask(
     @JvmField val project: Project,
@@ -58,7 +57,7 @@ class FileGenerateTask(
         }
 
         if (codeOnly) {
-            val code = Code.parse(result).text
+            val code = CodeFence.parse(result).text
             file.writeText(code)
             refreshAndOpenInEditor(file.toPath(), projectRoot)
             return
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/AutoDevInput.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/chat/AutoDevInput.kt
@@ -1,7 +1,7 @@
 package cc.unitmesh.devti.gui.chat
 
 import cc.unitmesh.devti.settings.LanguageChangedCallback.placeholder
-import cc.unitmesh.devti.util.parser.Code.Companion.findLanguage
+import cc.unitmesh.devti.util.parser.CodeFence.Companion.findLanguage
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.actionSystem.ex.AnActionListener
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/pair/AutoDevPairToolWindow.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/pair/AutoDevPairToolWindow.kt
@@ -9,8 +9,7 @@ import cc.unitmesh.devti.gui.chat.ChatRole
 import cc.unitmesh.devti.pair.arch.ProjectPackageTree
 import cc.unitmesh.devti.pair.tasking.Tasking
 import cc.unitmesh.devti.provider.architecture.LayeredArchProvider
-import cc.unitmesh.devti.util.parser.Code
-import com.intellij.lang.html.HTMLLanguage
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.fileTypes.PlainTextLanguage
 import com.intellij.openapi.project.Project
@@ -54,7 +53,7 @@ class AutoDevPairToolWindow(val project: Project, val disposable: Disposable) :
             row {
                 val text = layeredArch?.print() ?: "No Layered Arch"
                 val block = CodeBlock(SimpleMessage(text, text, ChatRole.User))
-                block.code = Code(PlainTextLanguage.INSTANCE, text, true)
+                block.code = CodeFence(PlainTextLanguage.INSTANCE, text, true)
 
                 val codeBlockView = CodeBlockView(block, project, disposable)
                 val component = codeBlockView.getComponent()
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/intentions/action/task/BaseCompletionTask.kt b/core/src/main/kotlin/cc/unitmesh/devti/intentions/action/task/BaseCompletionTask.kt
@@ -9,7 +9,7 @@ import cc.unitmesh.devti.llms.LlmFactory
 import cc.unitmesh.devti.settings.AutoDevSettingsState
 import cc.unitmesh.devti.statusbar.AutoDevStatus
 import cc.unitmesh.devti.statusbar.AutoDevStatusService
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.openapi.actionSystem.CustomShortcutSet
 import com.intellij.openapi.actionSystem.KeyboardShortcut
 import com.intellij.openapi.application.invokeLater
@@ -70,7 +70,7 @@ abstract class BaseCompletionTask(private val request: CodeCompletionRequest) :
                     return@collect
                 }
 
-                val parsedContent = Code.parse(char).text;
+                val parsedContent = CodeFence.parse(char).text;
 
                 suggestion.append(parsedContent)
                 invokeLater {
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/intentions/action/task/LivingDocumentationTask.kt b/core/src/main/kotlin/cc/unitmesh/devti/intentions/action/task/LivingDocumentationTask.kt
@@ -7,14 +7,13 @@ import cc.unitmesh.devti.provider.LivingDocumentation
 import cc.unitmesh.devti.custom.document.LivingDocumentationType
 import cc.unitmesh.devti.statusbar.AutoDevStatus
 import cc.unitmesh.devti.statusbar.AutoDevStatusService
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.Task
 import com.intellij.psi.PsiElement
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.flow.*
 
 /**
  * The `LivingDocumentationTask` class represents a background task for generating living documentation.
@@ -50,7 +49,7 @@ class LivingDocumentationTask(
 
         // result maybe surroding by ```
         if (result.startsWith("```") && result.endsWith("```")) {
-            result = Code.parse(result).text
+            result = CodeFence.parse(result).text
         }
 
         documentation.updateDoc(target, result, type, editor)
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/util/parser/CodeUtil.kt b/core/src/main/kotlin/cc/unitmesh/devti/util/parser/CodeUtil.kt
@@ -3,11 +3,11 @@ package cc.unitmesh.devti.util.parser
 import com.intellij.lang.Language
 import com.intellij.openapi.fileTypes.PlainTextLanguage
 
-class Code(val language: Language, val text: String, val isComplete: Boolean) {
+class CodeFence(val language: Language, val text: String, val isComplete: Boolean, val extension: String? = "") {
     companion object {
-        fun parse(content: String): Code {
+        fun parse(content: String): CodeFence {
             val regex = Regex("```([\\w#+\\s]*)")
-            val lines = content.lines()
+            val lines = content.replace("\\n", "\n").lines()
 
             var codeStarted = false
             var codeClosed = false
@@ -30,36 +30,16 @@ class Code(val language: Language, val text: String, val isComplete: Boolean) {
                 }
             }
 
-            var startIndex = 0
-            var endIndex = codeBuilder.length - 1
-
-            while (startIndex <= endIndex) {
-                if (!codeBuilder[startIndex].isWhitespace()) {
-                    break
-                }
-                startIndex++
-            }
-
-            while (endIndex >= startIndex) {
-                if (!codeBuilder[endIndex].isWhitespace()) {
-                    break
-                }
-                endIndex--
-            }
-
-            var trimmedCode = codeBuilder.substring(startIndex, endIndex + 1).toString()
+            val trimmedCode = codeBuilder.trim().toString()
             val language = findLanguage(languageId ?: "")
+            val extension =
+                language.associatedFileType?.defaultExtension ?: lookupFileExt(languageId ?: "txt")
 
-            // if content is not empty, but code is empty, then it's a markdown
-            if (trimmedCode.isEmpty()) {
-                return Code(findLanguage("markdown"), content.replace("\\n", "\n"), codeClosed)
-            }
-
-            if (languageId == "devin" || languageId == "devins") {
-                trimmedCode = trimmedCode.replace("\\`\\`\\`", "```")
+            return if (trimmedCode.isEmpty()) {
+                CodeFence(language, "", codeClosed, extension)
+            } else {
+                CodeFence(language, trimmedCode, codeClosed, extension)
             }
-
-            return Code(language, trimmedCode, codeClosed)
         }
 
         /**
@@ -83,5 +63,34 @@ class Code(val language: Language, val text: String, val isComplete: Boolean) {
             return registeredLanguages.find { it.displayName.equals(fixedLanguage, ignoreCase = true) }
                 ?: PlainTextLanguage.INSTANCE
         }
+
+        fun lookupFileExt(languageId: String): String {
+            return when (languageId.lowercase()) {
+                "c#" -> "cs"
+                "c++" -> "cpp"
+                "c" -> "c"
+                "java" -> "java"
+                "javascript" -> "js"
+                "kotlin" -> "kt"
+                "python" -> "py"
+                "ruby" -> "rb"
+                "swift" -> "swift"
+                "typescript" -> "ts"
+                "markdown" -> "md"
+                "sql" -> "sql"
+                "plantuml" -> "puml"
+                "shell" -> "sh"
+                "objective-c" -> "m"
+                "objective-c++" -> "mm"
+                "go" -> "go"
+                "html" -> "html"
+                "css" -> "css"
+                "dart" -> "dart"
+                "scala" -> "scala"
+                "rust" -> "rs"
+                "http request" -> "http"
+                else -> languageId
+            }
+        }
     }
 }
diff --git a/core/src/main/kotlin/com/intellij/temporary/gui/block/CodeBlockView.kt b/core/src/main/kotlin/com/intellij/temporary/gui/block/CodeBlockView.kt
@@ -2,7 +2,7 @@
 package com.intellij.temporary.gui.block
 
 import cc.unitmesh.devti.gui.chat.ChatRole
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.lang.Language
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionGroup
@@ -70,7 +70,7 @@ class CodeBlockView(
     }
 
     private fun updateOrCreateCodeView(): CodePartEditorInfo? {
-        val code: Code = getBlock().code
+        val code: CodeFence = getBlock().code
         if (editorInfo == null) {
             val graphProperty = PropertyGraph(null, false).property(code.text)
             val editorInfo: CodePartEditorInfo = createCodeViewer(
diff --git a/core/src/main/kotlin/com/intellij/temporary/gui/block/MessageBlock.kt b/core/src/main/kotlin/com/intellij/temporary/gui/block/MessageBlock.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.temporary.gui.block
 
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.lang.Language
 
 interface MessageBlock {
@@ -65,13 +65,13 @@ class TextBlock(val msg: CompletableMessage) : AbstractMessageBlock(msg) {
 class CodeBlock(private val msg: CompletableMessage, language: Language = Language.ANY) : AbstractMessageBlock(msg) {
     override var type: MessageBlockType = MessageBlockType.CodeEditor
 
-    var code: Code
+    var code: CodeFence
 
     init {
-        this.code = Code(language, msg.text, false)
+        this.code = CodeFence(language, msg.text, false)
     }
 
     override fun onContentChanged(content: String) {
-        this.code = Code.parse(content)
+        this.code = CodeFence.parse(content)
     }
 }
diff --git a/core/src/main/kotlin/com/intellij/temporary/inlay/codecomplete/LLMInlayManagerImpl.kt b/core/src/main/kotlin/com/intellij/temporary/inlay/codecomplete/LLMInlayManagerImpl.kt
@@ -2,7 +2,7 @@ package com.intellij.temporary.inlay.codecomplete
 
 import cc.unitmesh.devti.intentions.action.task.CodeCompletionRequest
 import cc.unitmesh.devti.intentions.action.task.CodeCompletionTask
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
 import cc.unitmesh.devti.util.parser.PostCodeProcessor
 import com.intellij.injected.editor.EditorWindow
 import com.intellij.openapi.Disposable
@@ -116,7 +116,7 @@ class LLMInlayManagerImpl : LLMInlayManager {
         CodeCompletionTask(request).execute { completion ->
             if (completion.isEmpty()) return@execute
 
-            val completeCode = Code.parse(completion).text
+            val completeCode = CodeFence.parse(completion).text
             currentCompletion = PostCodeProcessor(request.prefixText, request.suffixText, completeCode).execute()
 
             WriteCommandAction.runWriteCommandAction(editor.project) {
diff --git a/core/src/test/kotlin/cc/unitmesh/devti/parser/CodeUtilTest.kt b/core/src/test/kotlin/cc/unitmesh/devti/parser/CodeUtilTest.kt
@@ -1,13 +1,13 @@
 package cc.unitmesh.devti.parser
 
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
+import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertTrue
 import org.junit.Test
 
-class CodeUtilTest {
-    @Test
-    fun should_parse_code_from_markdown_java_hello_world() {
+class CodeUtilTest  : BasePlatformTestCase() {
+    fun testShould_parse_code_from_markdown_java_hello_world() {
         val markdown = """
             |```java
             |public class HelloWorld {
@@ -18,7 +18,7 @@ class CodeUtilTest {
             |```
         """.trimMargin()
 
-        val code = Code.parse(markdown)
+        val code = CodeFence.parse(markdown)
 
         assertEquals(
             code.text, """
@@ -32,16 +32,15 @@ class CodeUtilTest {
         assertTrue(code.isComplete)
     }
 
-    @Test
-    fun should_handle_code_not_complete_from_markdown() {
+    fun testShould_handle_code_not_complete_from_markdown() {
         val markdown = """
             |```java
             |public class HelloWorld {
             |    public static void main(String[] args) {
             |        System.out.println("Hello, World");
         """.trimMargin()
 
-        val code = Code.parse(markdown)
+        val code = CodeFence.parse(markdown)
         assertEquals(
             code.text, """
             |public class HelloWorld {
@@ -52,17 +51,15 @@ class CodeUtilTest {
         assertTrue(!code.isComplete)
     }
 
-    @Test
-    fun should_handle_pure_markdown_content() {
+    fun testShould_handle_pure_markdown_content() {
         val content = "```markdown\nGET /wp/v2/posts\n```"
-        val code = Code.parse(content)
+        val code = CodeFence.parse(content)
         assertEquals(code.text, "GET /wp/v2/posts")
     }
 
-    @Test
-    fun should_handle_http_request() {
+    fun testShould_handle_http_request() {
         val content = "```http request\nGET /wp/v2/posts\n```"
-        val code = Code.parse(content)
+        val code = CodeFence.parse(content)
         assertEquals(code.text, "GET /wp/v2/posts")
     }
-}
+}
diff --git a/core/src/test/kotlin/cc/unitmesh/devti/parser/PostCodeFenceProcessorTest.kt b/core/src/test/kotlin/cc/unitmesh/devti/parser/PostCodeFenceProcessorTest.kt
@@ -4,7 +4,7 @@ import cc.unitmesh.devti.util.parser.PostCodeProcessor
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-class PostCodeProcessorTest {
+class PostCodeFenceProcessorTest {
     @Test
     fun should_handle_with_no_indent_code() {
         val prefix = "public class Test {\n"
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/DevInLanguageInjector.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/DevInLanguageInjector.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package cc.unitmesh.devti.language
 
-import cc.unitmesh.devti.util.parser.Code.Companion.findLanguage
+import cc.unitmesh.devti.util.parser.CodeFence.Companion.findLanguage
 import cc.unitmesh.devti.language.parser.CodeBlockElement
 import cc.unitmesh.devti.language.psi.DevInTypes
 import com.intellij.lang.Language
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/compiler/exec/CommitInsCommand.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/compiler/exec/CommitInsCommand.kt
@@ -1,14 +1,14 @@
 package cc.unitmesh.devti.language.compiler.exec
 
 import cc.unitmesh.devti.language.git.GitUtil
-import cc.unitmesh.devti.util.parser.Code
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vcs.changes.ChangeListManager
 import com.intellij.openapi.vcs.changes.LocalChangeList
 
 class CommitInsCommand(val myProject: Project, val code: String) : InsCommand {
     override suspend fun execute(): String {
-        val commitMsg = Code.parse(code).text
+        val commitMsg = CodeFence.parse(code).text
 
         val changeListManager = ChangeListManager.getInstance(myProject)
         changeListManager.changeLists.forEach {
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/compiler/exec/WriteInsCommand.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/compiler/exec/WriteInsCommand.kt
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/provider/DevInsPromptProcessor.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/provider/DevInsPromptProcessor.kt
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/flow/DevInsProcessProcessor.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/flow/DevInsProcessProcessor.kt
diff --git a/exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/CommitMessageSuggestionAction.kt b/exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/CommitMessageSuggestionAction.kt
