Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not append \n for PROCESS since that output has all of the delim… #7146

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Do not append \n for PROCESS since that output has all of the delim… #7146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions base/src/com/google/idea/blaze/base/toolwindow/ConsoleView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,19 +237,17 @@ void println(PrintOutput output) {
}

private void println(String text, OutputType outputType) {
if (outputType == OutputType.PROCESS) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was an attempt to not have extra \n and there are few reasons to trim the output of the process otherwise.

text = text.stripTrailing();
}

ansiEscapeDecoder.escapeText(
text,
outputType == OutputType.ERROR ? ProcessOutputTypes.STDERR : ProcessOutputTypes.STDOUT,
(t, k) -> consoleView.print(t, ConsoleViewContentType.getConsoleViewType(k)));
consoleView.print(
"\n",
outputType == OutputType.ERROR
? ConsoleViewContentType.ERROR_OUTPUT
: ConsoleViewContentType.NORMAL_OUTPUT);
if (outputType != OutputType.PROCESS) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using separators "as is" for the process and adding potentially omitted ones for other output types.

consoleView.print(
"\n",
outputType == OutputType.ERROR
? ConsoleViewContentType.ERROR_OUTPUT
: ConsoleViewContentType.NORMAL_OUTPUT);
}
}

public void printHyperlink(String text, HyperlinkInfo hyperlinkInfo) {
Expand Down
Loading