Skip to content

Commit d65fed7

Browse files
authored
[CQ][perf] remove unused LOG instances (#8164)
Removes unused `LOG` instances. --- - [x] I’ve reviewed the contributor guide and applied the relevant portions to this PR. <details> <summary>Contribution guidelines:</summary><br> - See our [contributor guide]([https://github.com/dart-lang/sdk/blob/main/CONTRIBUTING.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview) for general expectations for PRs. - Larger or significant changes should be discussed in an issue before creating a PR. - Dart contributions to our repos should follow the [Dart style guide](https://dart.dev/guides/language/effective-dart) and use `dart format`. - Java and Kotlin contributions should strive to follow Java and Kotlin best practices ([discussion](#8098)). </details>
1 parent 7bae52b commit d65fed7

18 files changed

+11
-43
lines changed

flutter-idea/src/io/flutter/FlutterUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.intellij.openapi.project.Project;
1717
import com.intellij.openapi.project.ProjectManager;
1818
import com.intellij.openapi.roots.*;
19-
import com.intellij.openapi.util.text.StringUtil;
2019
import com.intellij.openapi.vfs.LocalFileSystem;
2120
import com.intellij.openapi.vfs.VfsUtil;
2221
import com.intellij.openapi.vfs.VirtualFile;
@@ -560,7 +559,8 @@ public static EmbeddedBrowser embeddedBrowser(Project project) {
560559
}
561560

562561
public static boolean embeddedBrowserAvailable(JxBrowserStatus status) {
563-
return Objects.equals(status, JxBrowserStatus.INSTALLED) || status.equals(JxBrowserStatus.INSTALLATION_SKIPPED) && FlutterSettings.getInstance()
564-
.isEnableJcefBrowser();
562+
return Objects.equals(status, JxBrowserStatus.INSTALLED) ||
563+
status.equals(JxBrowserStatus.INSTALLATION_SKIPPED) && FlutterSettings.getInstance()
564+
.isEnableJcefBrowser();
565565
}
566566
}

flutter-idea/src/io/flutter/ProjectOpenActivity.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.intellij.openapi.actionSystem.AnAction;
1616
import com.intellij.openapi.actionSystem.AnActionEvent;
1717
import com.intellij.openapi.application.ApplicationManager;
18-
import com.intellij.openapi.diagnostic.Logger;
1918
import com.intellij.openapi.extensions.PluginId;
2019
import com.intellij.openapi.project.DumbAware;
2120
import com.intellij.openapi.project.Project;
@@ -43,7 +42,6 @@
4342
*/
4443
public class ProjectOpenActivity implements StartupActivity, DumbAware {
4544
public static final ProjectType FLUTTER_PROJECT_TYPE = new ProjectType("io.flutter");
46-
private static final Logger LOG = Logger.getInstance(ProjectOpenActivity.class);
4745

4846
public ProjectOpenActivity() {
4947
}
@@ -125,7 +123,7 @@ public PackagesOutOfDateNotification(@NotNull Project project, @NotNull PubRoot
125123
super("Flutter Packages", "The pubspec.yaml file has been modified since " +
126124
"the last time 'flutter pub get' was run.", NotificationType.INFORMATION);
127125
setIcon(FlutterIcons.Flutter);
128-
126+
129127
myProject = project;
130128
myRoot = root;
131129

flutter-idea/src/io/flutter/actions/FlutterSdkAction.java

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import com.intellij.openapi.actionSystem.AnActionEvent;
99
import com.intellij.openapi.actionSystem.DataContext;
10-
import com.intellij.openapi.diagnostic.Logger;
1110
import com.intellij.openapi.fileEditor.FileDocumentManager;
1211
import com.intellij.openapi.project.DumbAwareAction;
1312
import com.intellij.openapi.project.Project;
@@ -29,8 +28,6 @@
2928
*/
3029
public abstract class FlutterSdkAction extends DumbAwareAction {
3130

32-
private static final Logger LOG = Logger.getInstance(FlutterSdkAction.class);
33-
3431
@Override
3532
public void actionPerformed(@NotNull AnActionEvent event) {
3633
final Project project = DumbAwareAction.getEventProject(event);

flutter-idea/src/io/flutter/actions/OpenInAndroidStudioAction.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.intellij.execution.process.ProcessEvent;
1313
import com.intellij.openapi.actionSystem.*;
1414
import com.intellij.openapi.application.ApplicationManager;
15-
import com.intellij.openapi.diagnostic.Logger;
1615
import com.intellij.openapi.editor.CaretModel;
1716
import com.intellij.openapi.editor.Editor;
1817
import com.intellij.openapi.fileEditor.FileEditor;
@@ -43,7 +42,6 @@ public class OpenInAndroidStudioAction extends AnAction {
4342
private static final String DESCR_FILE = FlutterBundle.message("flutter.androidstudio.open.file.description");
4443
private static final String LABEL_MODULE = FlutterBundle.message("flutter.androidstudio.open.module.text");
4544
private static final String DESCR_MODULE = FlutterBundle.message("flutter.androidstudio.open.module.description");
46-
private static final Logger LOG = Logger.getInstance(OpenInAndroidStudioAction.class);
4745

4846
@Override
4947
public void update(@NotNull AnActionEvent event) {
@@ -112,7 +110,7 @@ private static Editor getCurrentEditor(@NotNull Project project, @Nullable Virtu
112110
return null;
113111
}
114112
final FileEditorManager fileEditorManager = FileEditorManager.getInstance(project);
115-
if(fileEditorManager == null) {
113+
if (fileEditorManager == null) {
116114
return null;
117115
}
118116
final FileEditor fileEditor = fileEditorManager.getSelectedEditor(file);

flutter-idea/src/io/flutter/android/IntelliJAndroidSdk.java

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.flutter.android;
77

88
import com.intellij.openapi.application.ApplicationManager;
9-
import com.intellij.openapi.diagnostic.Logger;
109
import com.intellij.openapi.project.Project;
1110
import com.intellij.openapi.projectRoots.ProjectJdkTable;
1211
import com.intellij.openapi.projectRoots.Sdk;
@@ -26,7 +25,6 @@
2625
* An Android SDK and its home directory; this references an IntelliJ @{@link Sdk} instance.
2726
*/
2827
public class IntelliJAndroidSdk {
29-
private static final Logger LOG = Logger.getInstance(IntelliJAndroidSdk.class);
3028

3129
@NotNull
3230
private final Sdk sdk;

flutter-idea/src/io/flutter/bazel/Workspace.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.google.common.base.Joiner;
1010
import com.google.common.base.Objects;
1111
import com.google.common.collect.ImmutableSet;
12-
import com.intellij.openapi.diagnostic.Logger;
1312
import com.intellij.openapi.module.Module;
1413
import com.intellij.openapi.project.Project;
1514
import com.intellij.openapi.roots.ProjectRootManager;
@@ -309,7 +308,8 @@ static Workspace loadUncached(@NotNull Project project) {
309308

310309
final String updatedIosRunMessage = config == null ? null : config.getUpdatedIosRunMessage();
311310

312-
return new Workspace(root, config, daemonScript, devToolsScript, doctorScript, testScript, runScript, syncScript, toolsScript, sdkHome, requiredIJPluginID, requiredIJPluginMessage, configWarningPrefix, updatedIosRunMessage);
311+
return new Workspace(root, config, daemonScript, devToolsScript, doctorScript, testScript, runScript, syncScript, toolsScript, sdkHome,
312+
requiredIJPluginID, requiredIJPluginMessage, configWarningPrefix, updatedIosRunMessage);
313313
}
314314

315315
@VisibleForTesting
@@ -393,7 +393,8 @@ private static VirtualFile findContainingWorkspaceFile(@NotNull VirtualFile dir)
393393
return child;
394394
}
395395
dir = dir.getParent();
396-
} catch (InvalidVirtualFileAccessException ex) {
396+
}
397+
catch (InvalidVirtualFileAccessException ex) {
397398
// The VFS is out of sync.
398399
return null;
399400
}
@@ -403,8 +404,6 @@ private static VirtualFile findContainingWorkspaceFile(@NotNull VirtualFile dir)
403404
return null;
404405
}
405406

406-
private static final Logger LOG = Logger.getInstance(Workspace.class);
407-
408407
public String convertPath(String path) {
409408
if (path.startsWith(Workspace.BAZEL_URI_SCHEME)) {
410409
return getRoot().getPath() + path.substring(Workspace.BAZEL_URI_SCHEME.length());

flutter-idea/src/io/flutter/editor/FlutterSaveActionsManager.java

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import com.intellij.application.options.CodeStyle;
99
import com.intellij.openapi.command.WriteCommandAction;
10-
import com.intellij.openapi.diagnostic.Logger;
1110
import com.intellij.openapi.editor.Document;
1211
import com.intellij.openapi.fileEditor.FileDocumentManager;
1312
import com.intellij.openapi.fileEditor.FileDocumentManagerListener;
@@ -40,7 +39,6 @@
4039
* A manager class to run actions on save (formatting, organize imports, ...).
4140
*/
4241
public class FlutterSaveActionsManager {
43-
private static final Logger LOG = Logger.getInstance(FlutterSaveActionsManager.class);
4442

4543
/**
4644
* Initialize the save actions manager for the given project.

flutter-idea/src/io/flutter/inspections/SdkConfigurationNotificationProvider.java

-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package io.flutter.inspections;
77

8-
import com.intellij.openapi.diagnostic.Logger;
98
import com.intellij.openapi.fileEditor.FileEditor;
109
import com.intellij.openapi.module.Module;
1110
import com.intellij.openapi.module.ModuleUtilCore;
@@ -15,7 +14,6 @@
1514
import com.intellij.psi.PsiManager;
1615
import com.intellij.ui.EditorNotificationPanel;
1716
import com.intellij.ui.EditorNotificationProvider;
18-
import com.jetbrains.lang.dart.DartFileType;
1917
import com.jetbrains.lang.dart.DartLanguage;
2018
import icons.FlutterIcons;
2119
import io.flutter.FlutterBundle;
@@ -29,7 +27,6 @@
2927
import java.util.function.Function;
3028

3129
public class SdkConfigurationNotificationProvider implements EditorNotificationProvider {
32-
private static final Logger LOG = Logger.getInstance(SdkConfigurationNotificationProvider.class);
3330

3431
@NotNull
3532
private final Project project;

flutter-idea/src/io/flutter/project/FlutterProjectOpenProcessor.java

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.flutter.project;
77

88
import com.intellij.openapi.application.ApplicationInfo;
9-
import com.intellij.openapi.diagnostic.Logger;
109
import com.intellij.openapi.module.Module;
1110
import com.intellij.openapi.project.Project;
1211
import com.intellij.openapi.vfs.VirtualFile;
@@ -24,7 +23,6 @@
2423
import java.util.Objects;
2524

2625
public class FlutterProjectOpenProcessor extends ProjectOpenProcessor {
27-
private static final Logger LOG = Logger.getInstance(FlutterProjectOpenProcessor.class);
2826

2927
@Override
3028
public @NotNull String getName() {

flutter-idea/src/io/flutter/project/FlutterProjectStructureDetector.java

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.intellij.ide.util.projectWizard.importSources.ProjectFromSourcesBuilder;
1212
import com.intellij.ide.util.projectWizard.importSources.ProjectStructureDetector;
1313
import com.intellij.openapi.application.ApplicationManager;
14-
import com.intellij.openapi.diagnostic.Logger;
1514
import com.intellij.openapi.module.Module;
1615
import com.intellij.openapi.project.DumbService;
1716
import com.intellij.openapi.project.Project;
@@ -32,7 +31,6 @@
3231
import java.util.*;
3332

3433
public class FlutterProjectStructureDetector extends ProjectStructureDetector {
35-
private static final Logger LOG = Logger.getInstance(ProjectStructureDetector.class);
3634

3735
@NotNull
3836
@Override

flutter-idea/src/io/flutter/run/MainFile.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.intellij.psi.PsiFile;
1616
import com.intellij.psi.PsiManager;
1717
import com.intellij.psi.util.PsiTreeUtil;
18-
import com.jetbrains.lang.dart.DartFileType;
1918
import com.jetbrains.lang.dart.psi.DartFile;
2019
import com.jetbrains.lang.dart.psi.DartImportStatement;
2120
import com.jetbrains.lang.dart.util.DartResolveUtil;
@@ -124,7 +123,7 @@ public static MainFile.Result verify(@Nullable String path, Project project) {
124123
private static VirtualFile findAppDir(@Nullable VirtualFile file, @NotNull Project project) {
125124
if (WorkspaceCache.getInstance(project).isBazel()) {
126125
final Workspace workspace = WorkspaceCache.getInstance(project).get();
127-
assert(workspace != null);
126+
assert (workspace != null);
128127
return workspace.getRoot();
129128
}
130129

@@ -135,7 +134,7 @@ private static VirtualFile findAppDir(@Nullable VirtualFile file, @NotNull Proje
135134
}
136135

137136
private static boolean isAppDir(@NotNull VirtualFile dir, @NotNull Project project) {
138-
assert(!WorkspaceCache.getInstance(project).isBazel());
137+
assert (!WorkspaceCache.getInstance(project).isBazel());
139138
return dir.isDirectory() && (
140139
dir.findChild(PubRoot.PUBSPEC_YAML) != null ||
141140
dir.findChild(PubRoot.DOT_DART_TOOL) != null ||

flutter-idea/src/io/flutter/run/coverage/LcovInfo.java

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package io.flutter.run.coverage;
77

8-
import com.intellij.openapi.diagnostic.Logger;
98
import com.intellij.openapi.util.SystemInfo;
109
import com.intellij.rt.coverage.data.ClassData;
1110
import com.intellij.rt.coverage.data.LineData;
@@ -25,7 +24,6 @@
2524
import java.util.stream.Stream;
2625

2726
public class LcovInfo {
28-
private static final Logger LOG = Logger.getInstance(LcovInfo.class.getName());
2927

3028
private static final String FILE_LABEL = "SF:";
3129
private static final String DATA_LABEL = "DA:";

flutter-idea/src/io/flutter/sdk/FlutterSdkUtil.java

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.intellij.ide.util.PropertiesComponent;
1515
import com.intellij.openapi.application.ApplicationManager;
1616
import com.intellij.openapi.application.ApplicationNamesInfo;
17-
import com.intellij.openapi.diagnostic.Logger;
1817
import com.intellij.openapi.module.Module;
1918
import com.intellij.openapi.project.Project;
2019
import com.intellij.openapi.project.ProjectManager;
@@ -51,7 +50,6 @@ public class FlutterSdkUtil {
5150
public static final String FLUTTER_HOST_ENV = "FLUTTER_HOST";
5251

5352
private static final String FLUTTER_SDK_KNOWN_PATHS = "FLUTTER_SDK_KNOWN_PATHS";
54-
private static final Logger LOG = Logger.getInstance(FlutterSdkUtil.class);
5553
private static final String FLUTTER_SNAP_SDK_PATH = "/snap/flutter/common/flutter";
5654

5755
public FlutterSdkUtil() {

flutter-idea/src/io/flutter/survey/FlutterSurveyNotifications.java

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.intellij.openapi.fileEditor.FileEditorManagerListener;
1818
import com.intellij.openapi.project.Project;
1919
import com.intellij.openapi.vfs.VirtualFile;
20-
import com.jetbrains.lang.dart.DartFileType;
2120
import icons.FlutterIcons;
2221
import io.flutter.FlutterMessages;
2322
import io.flutter.FlutterUtils;

flutter-idea/src/io/flutter/survey/FlutterSurveyService.java

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.google.gson.JsonSyntaxException;
1010
import com.intellij.ide.util.PropertiesComponent;
1111
import com.intellij.openapi.application.ApplicationManager;
12-
import com.intellij.openapi.diagnostic.Logger;
1312
import com.intellij.util.io.HttpRequests;
1413
import io.flutter.utils.JsonUtils;
1514
import org.jetbrains.annotations.Nullable;
@@ -21,7 +20,6 @@ public class FlutterSurveyService {
2120
private static final String FLUTTER_LAST_SURVEY_CONTENT_CHECK_KEY = "FLUTTER_LAST_SURVEY_CONTENT_CHECK_KEY";
2221
private static final long CHECK_INTERVAL_IN_MS = TimeUnit.HOURS.toMillis(40);
2322
private static final String CONTENT_URL = "https://storage.googleapis.com/flutter-uxr/surveys/flutter-survey-metadata.json";
24-
private static final Logger LOG = Logger.getInstance(FlutterSurveyService.class);
2523
private static @Nullable FlutterSurvey cachedSurvey;
2624

2725
private static boolean timeToUpdateCachedContent() {

flutter-idea/src/io/flutter/utils/FlutterModuleUtils.java

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.intellij.psi.PsiElement;
2424
import com.intellij.serviceContainer.AlreadyDisposedException;
2525
import com.intellij.ui.EditorNotifications;
26-
import com.jetbrains.lang.dart.DartFileType;
2726
import com.jetbrains.lang.dart.sdk.DartSdk;
2827
import com.jetbrains.lang.dart.util.PubspecYamlUtil;
2928
import io.flutter.FlutterUtils;

flutter-idea/src/io/flutter/vmService/HeapMonitor.java

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package io.flutter.vmService;
77

8-
import com.intellij.openapi.diagnostic.Logger;
98
import org.dartlang.vm.service.consumer.GetMemoryUsageConsumer;
109
import org.dartlang.vm.service.element.IsolateRef;
1110
import org.dartlang.vm.service.element.MemoryUsage;
@@ -18,7 +17,6 @@
1817
import java.util.concurrent.*;
1918

2019
public class HeapMonitor {
21-
private static final Logger LOG = Logger.getInstance(HeapMonitor.class);
2220

2321
private static final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
2422

flutter-idea/src/io/flutter/vmService/VMServiceManager.java

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.google.gson.JsonElement;
1010
import com.google.gson.JsonObject;
1111
import com.intellij.openapi.Disposable;
12-
import com.intellij.openapi.diagnostic.Logger;
1312
import com.intellij.openapi.util.Disposer;
1413
import com.intellij.openapi.util.text.StringUtil;
1514
import io.flutter.run.daemon.FlutterApp;
@@ -33,7 +32,6 @@
3332
import static io.flutter.vmService.ServiceExtensions.enableOnDeviceInspector;
3433

3534
public class VMServiceManager implements FlutterApp.FlutterAppListener, Disposable {
36-
private static final Logger LOG = Logger.getInstance(VMServiceManager.class);
3735

3836
@NotNull private final FlutterApp app;
3937
@NotNull private final HeapMonitor heapMonitor;

0 commit comments

Comments
 (0)