flik/termora
1
0
Fork 0
mirror of https://github.com/TermoraDev/termora.git synced 2026-01-16 10:22:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: snippet unescape (#474)

Browse Source
This commit is contained in:
hstyi
2025-04-09 13:30:57 +08:00
committed by GitHub
parent b5207e56c1
commit 95846ab135
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/app/termora/snippet/SnippetAction.kt
View File

@@ -7,6 +7,7 @@ import app.termora.actions.AnAction
import app.termora.actions.AnActionEvent import app.termora.actions.AnActionEvent
import app.termora.terminal.ControlCharacters import app.termora.terminal.ControlCharacters
import app.termora.terminal.panel.TerminalWriter import app.termora.terminal.panel.TerminalWriter
import org.apache.commons.text.StringEscapeUtils
class SnippetAction private constructor() : AnAction(I18n.getString("termora.snippet.title"), Icons.codeSpan) { class SnippetAction private constructor() : AnAction(I18n.getString("termora.snippet.title"), Icons.codeSpan) {
companion object { companion object {
@@ -25,15 +26,15 @@ class SnippetAction private constructor() : AnAction(I18n.getString("termora.sni
fun runSnippet(snippet: Snippet, writer: TerminalWriter) { fun runSnippet(snippet: Snippet, writer: TerminalWriter) {
if (snippet.type != SnippetType.Snippet) return if (snippet.type != SnippetType.Snippet) return
val map = mapOf( val map = mapOf(
"\\r" to ControlCharacters.CR, "\n" to ControlCharacters.LF,
"\\n" to ControlCharacters.LF, "\r" to ControlCharacters.CR,
"\\t" to ControlCharacters.TAB, "\t" to ControlCharacters.TAB,
"\b" to ControlCharacters.BS,
"\\a" to ControlCharacters.BEL, "\\a" to ControlCharacters.BEL,
"\\e" to ControlCharacters.ESC, "\\e" to ControlCharacters.ESC,
"\\b" to ControlCharacters.BS,
) )
var text = snippet.snippet var text = StringEscapeUtils.unescapeJava(snippet.snippet)
for (e in map.entries) { for (e in map.entries) {
text = text.replace(e.key, e.value.toString()) text = text.replace(e.key, e.value.toString())
} }

1
src/main/kotlin/app/termora/snippet/SnippetPanel.kt
View File

@@ -51,6 +51,7 @@ class SnippetPanel : JPanel(BorderLayout()), Disposable {
properties.getString("SnippetPanel.LeftPanel.width", "180").toIntOrNull() ?: 180, properties.getString("SnippetPanel.LeftPanel.width", "180").toIntOrNull() ?: 180,
-1 -1
) )
leftPanel.minimumSize = Dimension(leftPanel.preferredSize.width, leftPanel.preferredSize.height)
rightPanel.border = BorderFactory.createCompoundBorder( rightPanel.border = BorderFactory.createCompoundBorder(
BorderFactory.createMatteBorder(0, 1, 0, 0, DynamicColor.BorderColor), BorderFactory.createMatteBorder(0, 1, 0, 0, DynamicColor.BorderColor),