refactor(sketch): extend LangSketch with ExtensionLangSketch interface …

…#153 - Updated MermaidSketchProvider and PlantUmlSketchProvider to use ExtensionLangSketch. - Modified ShirePanelView to handle ExtensionLangSketch. - Added ExtensionLangSketch interface to LanguageSketchProvider.
phodal · Dec 10, 2024 · 2447864 · 2447864
1 parent 5622123
commit 2447864
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/core/src/main/kotlin/com/phodal/shirecore/provider/sketch/LanguageSketchProvider.kt b/core/src/main/kotlin/com/phodal/shirecore/provider/sketch/LanguageSketchProvider.kt
@@ -4,10 +4,15 @@ import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.project.Project
 import com.phodal.shirecore.ui.viewer.LangSketch
 
+
+interface ExtensionLangSketch: LangSketch {
+    fun getExtensionName(): String
+}
+
 interface LanguageSketchProvider {
     fun isSupported(lang: String): Boolean
 
-    fun createSketch(project: Project, content: String): LangSketch
+    fun createSketch(project: Project, content: String): ExtensionLangSketch
 
     companion object {
         private val EP_NAME: ExtensionPointName<LanguageSketchProvider> =

diff --git a/core/src/main/kotlin/com/phodal/shirecore/ui/ShirePanelView.kt b/core/src/main/kotlin/com/phodal/shirecore/ui/ShirePanelView.kt
@@ -15,6 +15,7 @@ import com.intellij.ui.dsl.builder.Cell
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
+import com.phodal.shirecore.provider.sketch.ExtensionLangSketch
 import com.phodal.shirecore.ui.viewer.CodeHighlightSketch
 import com.phodal.shirecore.ui.viewer.DiffLangSketch
 import com.phodal.shirecore.ui.viewer.LangSketch
@@ -116,8 +117,8 @@ class ShirePanelView(val project: Project) : SimpleToolWindowPanel(true, true),
                         }
 
                         else -> {
-                            var langSketch: LangSketch? = null
-                            if (codeFence.originLanguage != null && codeFence.isComplete) {
+                            var langSketch: ExtensionLangSketch? = null
+                            if (codeFence.originLanguage != null && codeFence.isComplete && blockViews[index] !is ExtensionLangSketch) {
                                 langSketch = LanguageSketchProvider.provide(codeFence.originLanguage)
                                     ?.createSketch(project, codeFence.text)
                             }

diff --git a/toolsets/mermaid/src/main/kotlin/com/phodal/shire/mermaid/provider/MermaidSketchProvider.kt b/toolsets/mermaid/src/main/kotlin/com/phodal/shire/mermaid/provider/MermaidSketchProvider.kt
@@ -1,25 +1,26 @@
 package com.phodal.shire.mermaid.provider
 
 import com.intellij.lang.Language
+import com.intellij.mermaid.preview.MermaidDiagramPreviewComponent
 import com.intellij.openapi.project.Project
-import com.intellij.ui.dsl.builder.*
+import com.intellij.ui.dsl.builder.panel
+import com.phodal.shirecore.provider.sketch.ExtensionLangSketch
 import com.phodal.shirecore.provider.sketch.LanguageSketchProvider
 import com.phodal.shirecore.ui.viewer.LangSketch
 import javax.swing.JComponent
-import com.intellij.mermaid.preview.MermaidDiagramPreviewComponent
 import javax.swing.JPanel
 
 class MermaidSketchProvider : LanguageSketchProvider {
     override fun isSupported(lang: String): Boolean {
         return lang == "mermaid"
     }
 
-    override fun createSketch(project: Project, content: String): LangSketch {
+    override fun createSketch(project: Project, content: String): ExtensionLangSketch {
         TODO("Not yet implemented")
     }
 }
 
-class MermaidSketch(private val project: Project, private val content: String) : LangSketch {
+class MermaidSketch(private val project: Project, private val content: String) : ExtensionLangSketch {
     private var mainPanel: JPanel
 
     init {
@@ -34,6 +35,10 @@ class MermaidSketch(private val project: Project, private val content: String) :
         }
     }
 
+    override fun getExtensionName(): String {
+        return "mermaid"
+    }
+
     override fun getViewText(): String {
         return content
     }

diff --git a/toolsets/plantuml/src/main/kotlin/com/phodal/shire/plantuml/PlantUmlSketchProvider.kt b/toolsets/plantuml/src/main/kotlin/com/phodal/shire/plantuml/PlantUmlSketchProvider.kt
@@ -6,8 +6,8 @@ import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.testFramework.LightVirtualFile
+import com.phodal.shirecore.provider.sketch.ExtensionLangSketch
 import com.phodal.shirecore.provider.sketch.LanguageSketchProvider
-import com.phodal.shirecore.ui.viewer.LangSketch
 import org.plantuml.idea.preview.PlantUmlPreviewPanel
 import org.plantuml.idea.preview.editor.PlantUmlPreviewEditor
 import org.plantuml.idea.preview.editor.PlantUmlSplitEditor
@@ -24,13 +24,13 @@ class PlantUmlSketchProvider : LanguageSketchProvider {
         return true
     }
 
-    override fun createSketch(project: Project, content: String): LangSketch {
+    override fun createSketch(project: Project, content: String): ExtensionLangSketch {
         val virtualFile = LightVirtualFile("plantuml.puml", content)
         return PlantUmlSketch(project, virtualFile)
     }
 }
 
-class PlantUmlSketch(private val project: Project, private val virtualFile: VirtualFile) : LangSketch {
+class PlantUmlSketch(private val project: Project, private val virtualFile: VirtualFile) : ExtensionLangSketch {
     private var mainPanel: JPanel = JPanel()
     private var umlPreviewEditor: PlantUmlPreviewEditor
 
@@ -40,6 +40,8 @@ class PlantUmlSketch(private val project: Project, private val virtualFile: Virt
         umlPreviewEditor.editor = editor.editor
         val splitEditor = PlantUmlSplitEditor(editor, umlPreviewEditor)
 
+        splitEditor.component.preferredSize = null
+
         mainPanel.add(splitEditor.component, BorderLayout.CENTER)
 
         PlantUmlSettings.getInstance().previewSettings.splitEditorLayout = SplitFileEditor.SplitEditorLayout.SECOND
@@ -49,6 +51,10 @@ class PlantUmlSketch(private val project: Project, private val virtualFile: Virt
         (umlPreviewEditor.component as PlantUmlPreviewPanel).processRequest(LazyApplicationPoolExecutor.Delay.NOW, RenderCommand.Reason.FILE_SWITCHED)
     }
 
+    override fun getExtensionName(): String {
+        return "plantuml"
+    }
+
     override fun getViewText(): String {
         return virtualFile.inputStream.bufferedReader().use { it.readText() }
     }