From 6edc93935b3e4cdd09188627a755fd13fbaca36f Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Wed, 19 Aug 2020 07:56:11 +0300 Subject: [PATCH] IDEA-247635 ProcessOutput NlsSafe IDEA-CR-66127 GitOrigin-RevId: 7d767dbc3fb550c237512410193d02db23baaed3 --- .../intellij/execution/process/ProcessOutput.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/platform-util-io/src/com/intellij/execution/process/ProcessOutput.java b/platform/platform-util-io/src/com/intellij/execution/process/ProcessOutput.java index c9e1523816f7..65c5d0c5570b 100644 --- a/platform/platform-util-io/src/com/intellij/execution/process/ProcessOutput.java +++ b/platform/platform-util-io/src/com/intellij/execution/process/ProcessOutput.java @@ -2,6 +2,7 @@ package com.intellij.execution.process; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,27 +30,27 @@ public class ProcessOutput { myStderrBuilder.append(text); } - public @NotNull String getStdout() { + public @NotNull @NlsSafe String getStdout() { return myStdoutBuilder.toString(); } - public @NotNull String getStderr() { + public @NotNull @NlsSafe String getStderr() { return myStderrBuilder.toString(); } - public @NotNull List getStdoutLines() { + public @NotNull List<@NlsSafe String> getStdoutLines() { return getStdoutLines(true); } - public @NotNull List getStdoutLines(boolean excludeEmptyLines) { + public @NotNull List<@NlsSafe String> getStdoutLines(boolean excludeEmptyLines) { return splitLines(getStdout(), excludeEmptyLines); } - public @NotNull List getStderrLines() { + public @NotNull List<@NlsSafe String> getStderrLines() { return getStderrLines(true); } - public @NotNull List getStderrLines(boolean excludeEmptyLines) { + public @NotNull List<@NlsSafe String> getStderrLines(boolean excludeEmptyLines) { return splitLines(getStderr(), excludeEmptyLines); }