Skip to content

Remove performance tool window #7631

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

Closed
wants to merge 5 commits into from
Closed
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
4 changes: 0 additions & 4 deletions flutter-idea/src/io/flutter/FlutterInitializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,12 @@
import io.flutter.analytics.UnifiedAnalytics;
import io.flutter.android.IntelliJAndroidSdk;
import io.flutter.bazel.WorkspaceCache;
import io.flutter.deeplinks.DeepLinksViewFactory;
import io.flutter.devtools.DevToolsExtensionsViewFactory;
import io.flutter.devtools.DevToolsExtensionsViewService;
import io.flutter.devtools.RemainingDevToolsViewFactory;
import io.flutter.editor.FlutterSaveActionsManager;
import io.flutter.logging.FlutterConsoleLogManager;
import io.flutter.module.FlutterModuleBuilder;
import io.flutter.perf.FlutterWidgetPerfManager;
import io.flutter.performance.FlutterPerformanceViewFactory;
import io.flutter.preview.PreviewViewFactory;
import io.flutter.pub.PubRoot;
import io.flutter.pub.PubRoots;
Expand Down Expand Up @@ -263,7 +260,6 @@ private static void enableAnalytics(@NotNull Project project) {
private void initializeToolWindows(@NotNull Project project) {
// Start watching for Flutter debug active events.
FlutterViewFactory.init(project);
FlutterPerformanceViewFactory.init(project);
PreviewViewFactory.init(project);
RemainingDevToolsViewFactory.init(project);
DevToolsExtensionsViewFactory.init(project);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,19 @@
*/
package io.flutter.deeplinks;

import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.wm.ToolWindow;
import com.intellij.openapi.wm.ToolWindowFactory;
import com.intellij.openapi.wm.ToolWindowManager;
import com.intellij.ui.content.ContentManager;
import icons.FlutterIcons;
import io.flutter.FlutterUtils;
import io.flutter.bazel.WorkspaceCache;
import io.flutter.devtools.DevToolsIdeFeature;
import io.flutter.devtools.DevToolsUrl;
import io.flutter.performance.FlutterPerformanceView;
import io.flutter.run.daemon.DevToolsService;
import io.flutter.sdk.FlutterSdk;
import io.flutter.sdk.FlutterSdkVersion;
import io.flutter.utils.AsyncUtils;
import io.flutter.utils.UIUtils;
import io.flutter.view.FlutterViewMessages;
import kotlin.coroutines.Continuation;
import org.jetbrains.annotations.NotNull;

Expand Down
56 changes: 0 additions & 56 deletions flutter-idea/src/io/flutter/perf/EditorPerfDecorations.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
*/
package io.flutter.perf;

import com.intellij.codeInsight.hint.HintManager;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.event.EditorMouseEvent;
Expand All @@ -18,16 +15,10 @@
import com.intellij.openapi.editor.markup.*;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.wm.ToolWindow;
import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
import com.intellij.ui.ColorUtil;
import com.intellij.ui.JBColor;
import com.intellij.xdebugger.XSourcePosition;
import io.flutter.performance.FlutterPerformanceView;
import io.flutter.run.daemon.FlutterApp;
import io.flutter.utils.AsyncUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import javax.swing.*;
import java.awt.*;
Expand Down Expand Up @@ -340,53 +331,6 @@ RangeHighlighter getHighlighter() {
return highlighter;
}

/**
* Returns the action executed when the icon is left-clicked.
*
* @return the action instance, or null if no action is required.
*/
@Nullable
public AnAction getClickAction() {
return new AnAction() {
@Override
public void actionPerformed(@NotNull AnActionEvent event) {
if (isActive()) {

final ToolWindowManagerEx toolWindowManager = ToolWindowManagerEx.getInstanceEx(getApp().getProject());
final ToolWindow flutterPerfToolWindow = toolWindowManager.getToolWindow(FlutterPerformanceView.TOOL_WINDOW_ID);
if (flutterPerfToolWindow == null) {
return;
}

if (flutterPerfToolWindow.isVisible()) {
showPerfViewMessage();
return;
}
flutterPerfToolWindow.show(() -> showPerfViewMessage());
}
}
};
}

private void showPerfViewMessage() {
final FlutterPerformanceView flutterPerfView = getApp().getProject().getService(FlutterPerformanceView.class);
flutterPerfView.showForAppRebuildCounts(getApp());
final String message = "<html><body>" +
getTooltipHtmlFragment() +
"</body></html>";
final Iterable<SummaryStats> current = perfModelForFile.getStats().getRangeStats(range);
if (current.iterator().hasNext()) {
final SummaryStats first = current.iterator().next();
final XSourcePosition position = first.getLocation().getXSourcePosition();
if (position != null) {
AsyncUtils.invokeLater(() -> {
position.createNavigatable(getApp().getProject()).navigate(true);
HintManager.getInstance().showInformationHint(perfModelForFile.getTextEditor().getEditor(), message);
});
}
}
}

@NotNull
@Override
public Alignment getAlignment() {
Expand Down
Loading