fix(planner): correct typo in AutoDevPlannerToolWindowFactory

phodal · phodal · commit 92c0368ebc17 · 2025-03-17T17:04:23.000+08:00
#331 - Rename `AutoDevPlanerToolWindowFactory` to `AutoDevPlannerToolWindowFactory` to fix typo. - Update references in XML and Kotlin files. - Refactor plan content and UI layout in PlanSketch and SectionPanel.
diff --git a/core/src/223/main/resources/META-INF/autodev-core.xml b/core/src/223/main/resources/META-INF/autodev-core.xml
@@ -59,7 +59,7 @@
                     order="after Structure"
                     icon="cc.unitmesh.devti.AutoDevIcons.AI_COPILOT"
                     secondary="true"
-                    factoryClass="cc.unitmesh.devti.gui.AutoDevPlanerToolWindowFactory"/>
+                    factoryClass="cc.unitmesh.devti.gui.AutoDevPlannerToolWindowFactory"/>
 
         <notificationGroup id="AutoDev.notify" displayType="STICKY_BALLOON" bundle="messages.AutoDevBundle"
                            key="name"/>
diff --git a/core/src/233/main/resources/META-INF/autodev-core.xml b/core/src/233/main/resources/META-INF/autodev-core.xml
@@ -58,7 +58,7 @@
                     order="after Structure"
                     icon="cc.unitmesh.devti.AutoDevIcons.AI_COPILOT"
                     secondary="true"
-                    factoryClass="cc.unitmesh.devti.gui.AutoDevPlanerToolWindowFactory"/>
+                    factoryClass="cc.unitmesh.devti.gui.AutoDevPlannerToolWindowFactory"/>
 
         <notificationGroup id="AutoDev.notify" displayType="STICKY_BALLOON" bundle="messages.AutoDevBundle"
                            key="name"/>
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/gui/AutoDevPlannerToolWindowFactory.kt b/core/src/main/kotlin/cc/unitmesh/devti/gui/AutoDevPlannerToolWindowFactory.kt
@@ -23,7 +23,7 @@ import com.intellij.util.ui.UIUtil
 import java.awt.BorderLayout
 import java.util.concurrent.atomic.AtomicBoolean
 
-class AutoDevPlanerToolWindowFactory : ToolWindowFactory, ToolWindowManagerListener, DumbAware {
+class AutoDevPlannerToolWindowFactory : ToolWindowFactory, ToolWindowManagerListener, DumbAware {
     private val orientation = AtomicBoolean(true)
 
     override fun createToolWindowContent(
@@ -58,7 +58,31 @@ class AutoDevPlanerTooWindow(val project: Project) : SimpleToolWindowPanel(true,
     override fun getName(): @NlsActions.ActionText String? = "AutoDev Planer"
     var connection = ApplicationManager.getApplication().messageBus.connect(this)
 
-    val content = ""
+    val content = """1. 分析当前Blog功能结构（✓）
+   - 当前Blog功能分散在entity(BlogPost)、service、controller层，采用贫血模型
+   - domain.Blog类存在但未充分使用，需要明确领域模型边界
+
+2. 建立领域模型（*）
+   a. 定义Blog聚合根（进行中）
+   b. 创建Value Object（标题、内容等）
+   c. 定义领域服务接口
+   d. 实现业务规则（如发布校验、状态转换）
+
+3. 重构数据持久层
+   - 将BlogRepository改为面向领域模型
+   - 移除BlogPost实体与数据库的直接映射
+
+4. 调整应用层
+   - 重写BlogService使用领域模型
+   - 修改BlogController适配DTO转换
+
+5. 业务逻辑迁移
+   - 将Service中的CRUD逻辑转移到Blog领域对象
+   - 实现领域事件机制（如博客发布事件）
+
+6. 验证测试
+   - 修改现有测试用例
+   - 添加领域模型单元测试"""
     var planSketch: PlanSketch = PlanSketch(project, content, MarkdownPlanParser.parse(content).toMutableList(), true)
 
     init {
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/PlanSketch.kt b/core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/PlanSketch.kt
@@ -1,4 +1,3 @@
-// filepath: /Volumes/source/ai/autocrud/core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/PlanSketch.kt
 package cc.unitmesh.devti.sketch.ui.plan
 
 import cc.unitmesh.devti.observer.agent.AgentStateService
@@ -10,7 +9,7 @@ import com.intellij.lang.Language
 import com.intellij.openapi.project.Project
 import com.intellij.ui.components.JBPanel
 import com.intellij.ui.components.JBScrollPane
-import com.intellij.util.ui.JBEmptyBorder
+import com.intellij.ui.components.panels.VerticalLayout
 import com.intellij.util.ui.JBUI
 import java.awt.BorderLayout
 import java.awt.Dimension
@@ -24,43 +23,39 @@ import javax.swing.ScrollPaneConstants
  * Controller class for managing the plan data and UI updates
  */
 class PlanController(
-    private val project: Project, 
+    private val project: Project,
     private val contentPanel: JPanel,
     private var agentTaskItems: MutableList<AgentTaskEntry>
 ) {
     fun renderPlan() {
         contentPanel.removeAll()
-        
         agentTaskItems.forEachIndexed { index, planItem ->
             val sectionPanel = SectionPanel(project, index, planItem) {
                 contentPanel.revalidate()
                 contentPanel.repaint()
             }
-            
+
             contentPanel.add(sectionPanel)
         }
-        
-        // Add a vertical glue to push content up when there's extra space
-        contentPanel.add(Box.createVerticalGlue())
-        
+
         contentPanel.revalidate()
         contentPanel.repaint()
     }
-    
+
     fun updatePlan(newPlanItems: List<AgentTaskEntry>) {
         if (newPlanItems.isEmpty()) {
             return
         }
-        
+
         val taskStateMap = mutableMapOf<String, Pair<Boolean, TaskStatus>>()
         agentTaskItems.forEach { planItem ->
             planItem.steps.forEach { task ->
                 taskStateMap[task.step] = Pair(task.completed, task.status)
             }
         }
-        
+
         agentTaskItems.clear()
-        
+
         newPlanItems.forEach { newItem ->
             agentTaskItems.add(newItem)
             newItem.steps.forEach { task ->
@@ -70,10 +65,10 @@ class PlanController(
                 }
             }
         }
-        
+
         renderPlan()
     }
-    
+
     fun savePlanToService() {
         project.getService(AgentStateService::class.java).updatePlan(agentTaskItems)
     }
@@ -88,30 +83,24 @@ class PlanSketch(
     private var agentTaskItems: MutableList<AgentTaskEntry>,
     private val isInToolwindow: Boolean = false
 ) : JBPanel<PlanSketch>(BorderLayout(JBUI.scale(8), 0)), ExtensionLangSketch {
-    private val contentPanel = JPanel().apply {
-        layout = BoxLayout(this, BoxLayout.Y_AXIS)
-        // Ensure content panel takes maximum width but doesn't force height
-        maximumSize = Dimension(Int.MAX_VALUE, Int.MAX_VALUE)
-        alignmentX = LEFT_ALIGNMENT
-    }
-    
+    private val contentPanel = JPanel(VerticalLayout(JBUI.scale(0)))
+    val scrollPane: JBScrollPane
     private val toolbarFactory = PlanToolbarFactory(project)
     private val planController = PlanController(project, contentPanel, agentTaskItems)
-    
+
     init {
         if (!isInToolwindow) {
             add(toolbarFactory.createToolbar(this), BorderLayout.NORTH)
             border = JBUI.Borders.empty(8)
         }
-        
+
         planController.renderPlan()
-        
-        val scrollPane = JBScrollPane(contentPanel).apply {
+
+        scrollPane = JBScrollPane(contentPanel).apply {
             verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED
             horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
-            border = null
-            
-            // Make sure viewport tracks width but not height
+            border = JBUI.Borders.empty()
+
             viewport.isOpaque = false
             viewport.view = contentPanel
         }
@@ -128,30 +117,31 @@ class PlanSketch(
     }
 
     override fun getExtensionName(): String = "ThoughtPlan"
-    
+
     override fun getViewText(): String = content
-    
+
     override fun updateViewText(text: String, complete: Boolean) {
         this.content = text
         val agentPlans = MarkdownPlanParser.parse(text)
         planController.updatePlan(agentPlans)
     }
-    
+
     override fun onComplete(context: String) {
         if (!isInToolwindow) {
             val agentPlans = MarkdownPlanParser.parse(content).toMutableList()
             planController.updatePlan(agentPlans)
             planController.savePlanToService()
         }
     }
-    
+
     fun updatePlan(newPlanItems: List<AgentTaskEntry>) {
         planController.updatePlan(newPlanItems)
     }
-    
+
     override fun getComponent(): JComponent = this
-    
+
     override fun updateLanguage(language: Language?, originLanguage: String?) {}
-    
+
     override fun dispose() {}
 }
+
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/PlanToolbarFactory.kt b/core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/PlanToolbarFactory.kt
@@ -1,6 +1,6 @@
 package cc.unitmesh.devti.sketch.ui.plan
 
-import cc.unitmesh.devti.gui.AutoDevPlanerToolWindowFactory
+import cc.unitmesh.devti.gui.AutoDevPlannerToolWindowFactory
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
@@ -49,7 +49,7 @@ class PlanToolbarFactory(private val project: Project) {
 
             override fun actionPerformed(e: AnActionEvent) {
                 val toolWindow =
-                    ToolWindowManager.Companion.getInstance(project).getToolWindow(AutoDevPlanerToolWindowFactory.Companion.PlANNER_ID)
+                    ToolWindowManager.Companion.getInstance(project).getToolWindow(AutoDevPlannerToolWindowFactory.Companion.PlANNER_ID)
                         ?: return
 
                 toolWindow.activate {
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/SectionPanel.kt b/core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/SectionPanel.kt
@@ -1,4 +1,3 @@
-// filepath: /Volumes/source/ai/autocrud/core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/SectionPanel.kt
 package cc.unitmesh.devti.sketch.ui.plan
 
 import cc.unitmesh.devti.AutoDevBundle
@@ -28,14 +27,11 @@ class SectionPanel(
     private val planItem: AgentTaskEntry,
     private val onStatusChange: () -> Unit
 ) : JBPanel<JBPanel<*>>(BorderLayout()) {
-
     init {
         layout = BoxLayout(this, BoxLayout.Y_AXIS)
         background = JBUI.CurrentTheme.ToolWindow.background()
-        
-        alignmentX = LEFT_ALIGNMENT
-        maximumSize = Dimension(Int.MAX_VALUE, Int.MAX_VALUE)
-        
+        border = JBUI.Borders.empty(2, 0)
+
         val titlePanel = createSectionTitlePanel()
         add(titlePanel)
 
@@ -45,11 +41,8 @@ class SectionPanel(
                 onStatusChange()
             }
 
-            taskPanel.alignmentX = LEFT_ALIGNMENT
             add(taskPanel)
         }
-
-        revalidate()
     }
 
     private fun createSectionTitlePanel(): JPanel {
@@ -85,15 +78,14 @@ class SectionPanel(
     private fun createExecuteSectionButton(): JButton {
         return JButton(AllIcons.Actions.Execute).apply {
             border = BorderFactory.createEmptyBorder()
-
             preferredSize = Dimension(20, 20)
             toolTipText = "Execute Task"
             background = JBUI.CurrentTheme.ToolWindow.background()
 
             addActionListener {
                 AutoDevToolWindowFactory.Companion.sendToSketchToolWindow(project, ChatActionType.SKETCH) { ui, _ ->
-                    val allSteps = planItem.steps.joinToString("\n") { it.step }
-                    ui.sendInput(AutoDevBundle.message("sketch.plan.finish.task") + allSteps)
+                    val content = planItem.title + "\n" + planItem.steps.joinToString("\n") { "   - " + it.step }
+                    ui.sendInput(AutoDevBundle.message("sketch.plan.finish.task") + content)
                 }
             }
         }
@@ -102,4 +94,4 @@ class SectionPanel(
     fun updateSectionStatus() {
         planItem.updateCompletionStatus()
     }
-}
+}
