Skip to content

Trim console output before processing it in console document #2462

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

Open
trancexpress wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Trim console output before processing it in console document #2462

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
36 changes: 32 additions & 4 deletions debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ public boolean shouldRun() {
* update partitioning.
*/
private void processPendingPartitions() {
final List<PendingPartition> pendingCopy = new ArrayList<>();
List<PendingPartition> pendingCopy = new ArrayList<>();
// draining the whole buffer here is important - this way we get as much data as
// available and may skip to draw text that exceeds the Console buffer size
// anyway (see checkBufferSize()).
Expand All @@ -793,12 +793,40 @@ private void processPendingPartitions() {
if (pendingCopy.isEmpty()) {
return;
}
int pendingSize = 0;
IOConsoleOutputStream stream = pendingCopy.get(0).stream;
for (PendingPartition p : pendingCopy) {
if (p.stream != stream) {
break;
if (p.stream == stream) {
sizeHint += p.text.length();
}
pendingSize += p.text.length();
}
/*
* Check if the output we want to process is over the console limit. If so, trim
* the output before passing it to SWT.
*/
int limit = highWaterMark;
if (limit > 0 && pendingSize > limit) {
sizeHint = Math.min(sizeHint, limit);
int n = pendingCopy.size();
// check at which pending change we need to cut the output, to comply with the character limit
int index = 0;
int characters = 0;
for (int i = n - 1; i >= 0; --i) {
PendingPartition p = pendingCopy.get(i);
characters += p.text.length();
index = i;
if (characters > limit) {
break;
}
}
// copy from that index onward
List<PendingPartition> trimmedCopy = new ArrayList<>(n - index);
for (int i = index; i < n; ++i) {
PendingPartition p = pendingCopy.get(i);
trimmedCopy.add(p);
}
sizeHint += p.text.length();
pendingCopy = trimmedCopy;
}
synchronized (partitions) {
if (document != null) {
Expand Down
Loading