From b9f5769366806ba48462a169282df79f052f1c46 Mon Sep 17 00:00:00 2001 From: Andrey Vokin Date: Thu, 1 Aug 2019 09:42:00 +0200 Subject: [PATCH] [platform] RUBY-24477, RUBY-24639: Handle NewLine Symbols before #[teamcity...] only in stdout [IDEA-CR-50393] GitOrigin-RevId: 5648155b9d58842074b22bf273da0bfd8cce4817 --- .../execution/testframework/sm/runner/OutputEventSplitter.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputEventSplitter.kt b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputEventSplitter.kt index febc1659ace8..15d2a723d828 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputEventSplitter.kt +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputEventSplitter.kt @@ -148,10 +148,8 @@ abstract class OutputEventSplitter(private val bufferTextUntilNewLine: Boolean = } } - private fun flushInternal(text: String, key: Key<*>, lastFlush: Boolean = false) { - - if (cutNewLineBeforeServiceMessage) { + if (cutNewLineBeforeServiceMessage && key is ProcessOutputType && key.isStdout) { if (newLinePending) { //Prev. flush was "\n". if (!text.startsWith(SERVICE_MESSAGE_START) || (lastFlush)) { onTextAvailable("\n", key) @@ -164,7 +162,6 @@ abstract class OutputEventSplitter(private val bufferTextUntilNewLine: Boolean = } } - val textToAdd = if (USE_CYCLE_BUFFER) cutLineIfTooLong(text) else text onTextAvailable(textToAdd, key) }