Skip to content

Commit 2e0d1c7

Browse files
phodalphodal
committed
refactor(terminal): optimize terminal execution and UI interactions
- Remove unused comment blocks and redundant code - Improve code readability and reduce code duplication in AnAction objects - Optimize terminal execution flow, considering enableAutoRunTerminal flag- Refactor result status updates and terminal actions for better maintainability
1 parent 9108d22 commit 2e0d1c7

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

‎core/src/223/main/resources/META-INF/autodev-core.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@
363363
class="cc.unitmesh.devti.gui.snippet.AutoDevLanguageLabelAction"/>
364364

365365
<action id="AutoDev.ToolWindow.Snippet.CopyToClipboard"
366-
icon="cc.unitmesh.devti.AutoDevIcons.Copy"
366+
icon="cc.unitmesh.devti.AutoDevIcons.COPY"
367367
class="cc.unitmesh.devti.gui.snippet.AutoDevCopyToClipboardAction"/>
368368
<action id="AutoDev.ToolWindow.Snippet.InsertCode"
369369
icon="cc.unitmesh.devti.AutoDevIcons.InsertCode"
@@ -372,7 +372,7 @@
372372
icon="cc.unitmesh.devti.AutoDevIcons.Run"
373373
class="cc.unitmesh.devti.gui.snippet.AutoDevRunAction"/>
374374
<action id="AutoDev.ToolWindow.Snippet.SaveFile"
375-
icon="cc.unitmesh.devti.AutoDevIcons.SaveFile"
375+
icon="cc.unitmesh.devti.AutoDevIcons.SAVE_FILE"
376376
class="cc.unitmesh.devti.gui.snippet.AutoDevSaveFileAction"/>
377377
</group>
378378

‎core/src/233/main/resources/META-INF/autodev-core.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
class="cc.unitmesh.devti.gui.snippet.AutoDevLanguageLabelAction"/>
367367

368368
<action id="AutoDev.ToolWindow.Snippet.CopyToClipboard"
369-
icon="cc.unitmesh.devti.AutoDevIcons.Copy"
369+
icon="cc.unitmesh.devti.AutoDevIcons.COPY"
370370
class="cc.unitmesh.devti.gui.snippet.AutoDevCopyToClipboardAction"/>
371371
<action id="AutoDev.ToolWindow.Snippet.InsertCode"
372372
icon="cc.unitmesh.devti.AutoDevIcons.InsertCode"
@@ -375,7 +375,7 @@
375375
icon="cc.unitmesh.devti.AutoDevIcons.RUN"
376376
class="cc.unitmesh.devti.gui.snippet.AutoDevRunAction"/>
377377
<action id="AutoDev.ToolWindow.Snippet.SaveFile"
378-
icon="cc.unitmesh.devti.AutoDevIcons.SaveFile"
378+
icon="cc.unitmesh.devti.AutoDevIcons.SAVE_FILE"
379379
class="cc.unitmesh.devti.gui.snippet.AutoDevSaveFileAction"/>
380380
</group>
381381

‎core/src/main/kotlin/cc/unitmesh/devti/AutoDevIcons.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,28 @@ object AutoDevIcons {
3939
val REPAIR: Icon = IconLoader.getIcon("/icons/repair.svg", AutoDevIcons::class.java)
4040

4141
@JvmField
42-
val Build: Icon = IconLoader.getIcon("/icons/build.svg", AutoDevIcons::class.java)
42+
val BUILD: Icon = IconLoader.getIcon("/icons/build.svg", AutoDevIcons::class.java)
4343

4444
@JvmField
45-
val Copy: Icon = IconLoader.getIcon("/icons/copy.svg", AutoDevIcons::class.java)
45+
val COPY: Icon = IconLoader.getIcon("/icons/copy.svg", AutoDevIcons::class.java)
4646

4747
@JvmField
48-
val Idea: Icon = IconLoader.getIcon("/icons/idea.svg", AutoDevIcons::class.java)
48+
val IDEA: Icon = IconLoader.getIcon("/icons/idea.svg", AutoDevIcons::class.java)
4949

5050
@JvmField
5151
val VIEW: Icon = IconLoader.getIcon("/icons/view.svg", AutoDevIcons::class.java)
5252

5353
@JvmField
54-
val Terminal: Icon = IconLoader.getIcon("/icons/terminal.svg", AutoDevIcons::class.java)
54+
val TERMINAL: Icon = IconLoader.getIcon("/icons/terminal.svg", AutoDevIcons::class.java)
5555

5656
@JvmField
57-
val SaveFile: Icon = IconLoader.getIcon("/icons/save-file.svg", AutoDevIcons::class.java)
57+
val SAVE_FILE: Icon = IconLoader.getIcon("/icons/save-file.svg", AutoDevIcons::class.java)
5858

5959
@JvmField
60-
val Stop: Icon = IconLoader.getIcon("/icons/stop.svg", AutoDevIcons::class.java)
60+
val STOP: Icon = IconLoader.getIcon("/icons/stop.svg", AutoDevIcons::class.java)
6161

6262
@JvmField
63-
val Clear: Icon = IconLoader.getIcon("/icons/clear.svg", AutoDevIcons::class.java)
63+
val CLEAR: Icon = IconLoader.getIcon("/icons/clear.svg", AutoDevIcons::class.java)
6464

6565
@JvmField
6666
val TOOLCHAIN: Icon = IconLoader.getIcon("/icons/toolchain.svg", AutoDevIcons::class.java)

‎core/src/main/kotlin/cc/unitmesh/devti/actions/rename/CustomRenameLookupElement.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CustomRenameLookupElement(val name: String) : LookupElement() {
1919
}
2020

2121
override fun renderElement(presentation: LookupElementPresentation) {
22-
presentation.icon = AutoDevIcons.Idea
22+
presentation.icon = AutoDevIcons.IDEA
2323
super.renderElement(presentation)
2424
}
2525
}

‎core/src/main/kotlin/cc/unitmesh/devti/devin/dataprovider/BuiltinCommand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ enum class BuiltinCommand(
7777
REFACTOR(
7878
"refactor",
7979
"Refactor the content of a file, only support for rename, safeDelete and move.",
80-
AutoDevIcons.Idea,
80+
AutoDevIcons.IDEA,
8181
true,
8282
true
8383
),

‎core/src/main/kotlin/cc/unitmesh/devti/gui/chat/ui/AutoDevInputSection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class AutoDevInputSection(private val project: Project, val disposable: Disposab
107107
this.sendButtonPresentation = sendButtonPresentation
108108

109109
val stopButtonPresentation = Presentation("Stop")
110-
stopButtonPresentation.icon = AutoDevIcons.Stop
110+
stopButtonPresentation.icon = AutoDevIcons.STOP
111111
this.stopButtonPresentation = stopButtonPresentation
112112

113113
sendButton = ActionButton(

‎core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/PlanToolbarFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class PlanToolbarFactory(private val project: Project) {
7575
}
7676
}
7777

78-
val copyAction = object : AnAction("Copy", "Copy plan to clipboard", AutoDevIcons.Copy) {
78+
val copyAction = object : AnAction("Copy", "Copy plan to clipboard", AutoDevIcons.COPY) {
7979
override fun actionPerformed(e: AnActionEvent) {
8080
val agentStateService = project.getService(AgentStateService::class.java)
8181
val currentPlan = agentStateService.getPlan()

‎core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/TaskSectionPanel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class TaskSectionPanel(
9999
TaskStatus.COMPLETED -> JLabel(AutoDevIcons.CHECKED)
100100
TaskStatus.FAILED -> JLabel(AutoDevIcons.ERROR)
101101
TaskStatus.IN_PROGRESS -> JLabel(AutoDevIcons.InProgress)
102-
TaskStatus.TODO -> JLabel(AutoDevIcons.Build)
102+
TaskStatus.TODO -> JLabel(AutoDevIcons.BUILD)
103103
}
104104
leftPanel.add(statusIcon)
105105

‎core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/plan/TaskStepPanel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class TaskStepPanel(
117117
border = JBUI.Borders.empty()
118118
}
119119

120-
TaskStatus.IN_PROGRESS -> JLabel(AutoDevIcons.Build).apply {
120+
TaskStatus.IN_PROGRESS -> JLabel(AutoDevIcons.BUILD).apply {
121121
preferredSize = Dimension(20, 16)
122122
border = JBUI.Borders.empty()
123123
}

‎exts/ext-terminal/src/main/kotlin/cc/unitmesh/terminal/sketch/TerminalExecuteAction.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class TerminalExecuteAction(
2323
override fun update(e: AnActionEvent) {
2424
super.update(e)
2525
if (sketch.isExecuting) {
26-
e.presentation.icon = AllIcons.Actions.Suspend
26+
e.presentation.icon = AutoDevIcons.STOP
2727
e.presentation.text = "Stop"
2828
e.presentation.description = AutoDevBundle.message("sketch.terminal.stop")
2929
} else {

‎exts/ext-terminal/src/main/kotlin/cc/unitmesh/terminal/sketch/TerminalSketchProvider.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,14 @@ class TerminalLangSketch(val project: Project, var content: String) : ExtensionL
188188
executeAction = TerminalExecuteAction(this)
189189

190190
val showText = AutoDevBundle.message("sketch.terminal.show.hide")
191-
val showTerminalAction = object : AnAction(showText, showText, AutoDevIcons.Terminal) {
191+
val showTerminalAction = object : AnAction(showText, showText, AutoDevIcons.TERMINAL) {
192192
override fun actionPerformed(e: AnActionEvent) {
193193
toggleTerminalAction()
194194
}
195195
}
196196

197197
val copyText = AutoDevBundle.message("sketch.terminal.copy.text")
198-
val copyAction = object : AnAction(copyText, copyText, AutoDevIcons.Copy) {
198+
val copyAction = object : AnAction(copyText, copyText, AutoDevIcons.COPY) {
199199
override fun actionPerformed(e: AnActionEvent) {
200200
val clipboard = Toolkit.getDefaultToolkit().systemClipboard
201201
val textToCopy = if (hasExecutionResults) {

0 commit comments

Comments
 (0)