MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[terminal] IJPL-157400 Refactoring in ShellCommandEndMarkerListener

Browse Source 
GitOrigin-RevId: 56be41bacc0bb3ce46eab6e398c71d44a5943e4f
This commit is contained in:
Vladimir Shefer
2024-08-09 17:32:44 +02:00
committed by intellij-monorepo-bot
parent 7ffdfe2186
commit 93d762d303
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/terminal/src/org/jetbrains/plugins/terminal/block/session/ShellCommandEndMarkerListener.kt
View File

@@ -6,6 +6,10 @@ import com.intellij.openapi.util.Disposer
import com.jediterm.terminal.model.TerminalTextBuffer
import org.jetbrains.plugins.terminal.TerminalUtil
import org.jetbrains.plugins.terminal.block.session.TerminalModel.Companion.withLock
import org.jetbrains.plugins.terminal.block.session.scraper.CommandEndMarkerListeningStringCollector
import org.jetbrains.plugins.terminal.block.session.scraper.SimpleStringCollector
import org.jetbrains.plugins.terminal.block.session.scraper.SimpleTerminalLinesCollector
import org.jetbrains.plugins.terminal.block.session.scraper.StringCollector
import java.util.concurrent.atomic.AtomicBoolean
internal class ShellCommandEndMarkerListener(
@@ -43,8 +47,15 @@ internal class ShellCommandEndMarkerListener(
}
private fun findCommandEndMarker(): Boolean {
val output = terminalTextBuffer.withLock { ShellCommandOutputScraperImpl.scrapeOutput(terminalTextBuffer, commandEndMarker) }
if (output.commandEndMarkerFound && found.compareAndSet(false, true)) {
var commandEndMarkerFound = false
terminalTextBuffer.withLock {
val stringCollector: StringCollector = CommandEndMarkerListeningStringCollector(SimpleStringCollector(), commandEndMarker) {
commandEndMarkerFound = true
}
// TODO no real need to collect all lines. Last lines of the screen must be enough.
terminalTextBuffer.collectLines(SimpleTerminalLinesCollector(stringCollector))
}
if (commandEndMarkerFound && found.compareAndSet(false, true)) {
Disposer.dispose(disposable)
onFound()
return true