Skip to content

Make console stack traces expandable #5777

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.

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

Merged
merged 1 commit into from
Sep 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,9 @@

<applicationService serviceImplementation="io.flutter.jxbrowser.EmbeddedBrowserEngine" overrides="false" />
<applicationService serviceImplementation="io.flutter.font.FontPreviewProcessor"/>
<console.folding implementation="io.flutter.console.FlutterConsoleFolding"/>
<console.folding implementation="io.flutter.logging.FlutterConsoleLogFolding"/>
<console.folding implementation="io.flutter.console.FlutterConsoleFolding" id="1"/>
<console.folding implementation="io.flutter.console.FlutterConsoleExceptionFolding" order="after 1"/>
<console.folding implementation="io.flutter.logging.FlutterConsoleLogFolding" order="last"/>

<projectConfigurable groupId="language" instance="io.flutter.sdk.FlutterSettingsConfigurable"
id="flutter.settings" key="flutter.title" bundle="io.flutter.FlutterBundle" nonDefaultProject="true"/>
Expand Down
5 changes: 3 additions & 2 deletions resources/META-INF/plugin_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,9 @@

<applicationService serviceImplementation="io.flutter.jxbrowser.EmbeddedBrowserEngine" overrides="false" />
<applicationService serviceImplementation="io.flutter.font.FontPreviewProcessor"/>
<console.folding implementation="io.flutter.console.FlutterConsoleFolding"/>
<console.folding implementation="io.flutter.logging.FlutterConsoleLogFolding"/>
<console.folding implementation="io.flutter.console.FlutterConsoleFolding" id="1"/>
<console.folding implementation="io.flutter.console.FlutterConsoleExceptionFolding" order="after 1"/>
<console.folding implementation="io.flutter.logging.FlutterConsoleLogFolding" order="last"/>

<projectConfigurable groupId="language" instance="io.flutter.sdk.FlutterSettingsConfigurable"
id="flutter.settings" key="flutter.title" bundle="io.flutter.FlutterBundle" nonDefaultProject="true"/>
Expand Down
47 changes: 47 additions & 0 deletions src/io/flutter/console/FlutterConsoleExceptionFolding.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright 2021 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
package io.flutter.console;

import com.intellij.execution.ConsoleFolding;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import io.flutter.settings.FlutterSettings;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.List;

public class FlutterConsoleExceptionFolding extends ConsoleFolding {
private static final String EXCEPTION_PREFIX = "=======";
private boolean foldLines = false;
private boolean foldingInProgress = false;

@Override
public boolean shouldFoldLine(@NotNull Project project, @NotNull String line) {
final FlutterSettings settings = FlutterSettings.getInstance();
if (line.startsWith(EXCEPTION_PREFIX) && settings.isShowStructuredErrors() && !settings.isIncludeAllStackTraces()) {
foldingInProgress = true;
foldLines = !foldLines;
return true;
}
return foldLines;
}

@Override
public boolean shouldBeAttachedToThePreviousLine() {
return false;
}

@Nullable
@Override
public String getPlaceholderText(@NotNull Project project, @NotNull List<String> lines) {
if (foldingInProgress) {
foldingInProgress = false;
return lines.size() == 0 ? null : lines.get(0); // Newlines are removed, so we can only show one line.
}
return null;
}
}