From a034472ce4f69300d3b04894bc74525a4f02fe17 Mon Sep 17 00:00:00 2001 From: Jaime Wren Date: Sat, 16 Aug 2025 00:38:11 -0700 Subject: [PATCH] [cq] Java cleanup, remove constant values --- .../flutter/FlutterErrorReportSubmitter.java | 17 ++++++------- src/io/flutter/FlutterInitializer.java | 4 ++-- .../flutter/FlutterStudioStartupActivity.java | 3 +-- src/io/flutter/FlutterUtils.java | 3 --- .../actions/OpenInAndroidStudioAction.java | 1 - .../flutter/console/FlutterConsoleFilter.java | 24 +++++++++---------- .../flutter/dart/FlutterRequestUtilities.java | 2 +- .../editor/FlutterIconLineMarkerProvider.java | 3 --- .../flutter/jxbrowser/EmbeddedJxBrowser.java | 1 - src/io/flutter/run/FlutterReloadManager.java | 4 +--- .../run/bazelTest/BazelTestFields.java | 1 - .../run/daemon/DevToolsServerTask.java | 2 +- .../flutter/run/daemon/DevToolsService.java | 7 ++---- .../sdk/FlutterPluginsLibraryManager.java | 1 - src/io/flutter/sdk/FlutterSdk.java | 2 +- src/io/flutter/utils/AddToAppUtils.java | 10 ++++---- src/io/flutter/utils/FlutterModuleUtils.java | 1 - .../vmService/DartVmServiceDebugProcess.java | 5 +++- .../flutter/vmService/VmServiceWrapper.java | 11 ++++----- 19 files changed, 39 insertions(+), 63 deletions(-) diff --git a/src/io/flutter/FlutterErrorReportSubmitter.java b/src/io/flutter/FlutterErrorReportSubmitter.java index 23b4544a72..7a0a1c8345 100644 --- a/src/io/flutter/FlutterErrorReportSubmitter.java +++ b/src/io/flutter/FlutterErrorReportSubmitter.java @@ -72,23 +72,20 @@ public boolean submit(@NotNull IdeaLoggingEvent @NotNull [] events, if (stackTraceText.startsWith(DaemonApi.FLUTTER_ERROR_PREFIX)) { final String message = stackTraceText.substring(DaemonApi.FLUTTER_ERROR_PREFIX.length()); final int start = message.indexOf(": ") + 2; - if (start == 0) continue; int end = message.indexOf('\n'); if (end < 0) end = message.length(); final String error = message.substring(start, end); stackTrace = message.substring(end + 1); for (String err : KNOWN_ERRORS) { if (error.contains(err)) { - if (end != message.length()) { - // Dart stack trace included so extract it and set the issue target to the Flutter repo. - errorMessage = err; - final int endOfDartStack = stackTrace.indexOf("\\n\"\n"); - if (endOfDartStack > 0) { - // Get only the part between quotes. If the format is wrong just use the whole thing. - stackTrace = stackTrace.substring(1, endOfDartStack); - } - break; + // Dart stack trace included so extract it and set the issue target to the Flutter repo. + errorMessage = err; + final int endOfDartStack = stackTrace.indexOf("\\n\"\n"); + if (endOfDartStack > 0) { + // Get only the part between quotes. If the format is wrong just use the whole thing. + stackTrace = stackTrace.substring(1, endOfDartStack); } + break; } } } diff --git a/src/io/flutter/FlutterInitializer.java b/src/io/flutter/FlutterInitializer.java index 2a0b5b2a4a..886621ce70 100644 --- a/src/io/flutter/FlutterInitializer.java +++ b/src/io/flutter/FlutterInitializer.java @@ -314,7 +314,7 @@ private void checkSdkVersionNotification(@NotNull Project project) { // See FlutterSdkVersion.MIN_SDK_SUPPORTED. if (version.isValid() && !version.isSDKSupported()) { final FlutterSettings settings = FlutterSettings.getInstance(); - if (settings == null || settings.isSdkVersionOutdatedWarningAcknowledged(version.getVersionText(), false)) return; + if (settings.isSdkVersionOutdatedWarningAcknowledged(version.getVersionText(), false)) return; OpenApiUtils.safeInvokeLater(() -> { final Notification notification = new Notification(FlutterMessages.FLUTTER_NOTIFICATION_GROUP_ID, "Flutter SDK requires update", @@ -339,7 +339,7 @@ public void actionPerformed(@NotNull AnActionEvent event) { // See FlutterSdkVersion.MIN_SDK_WITHOUT_SUNSET_WARNING. if (version.isValid() && version.isSDKAboutToSunset()) { final FlutterSettings settings = FlutterSettings.getInstance(); - if (settings == null || settings.isSdkVersionOutdatedWarningAcknowledged(version.getVersionText(), true)) return; + if (settings.isSdkVersionOutdatedWarningAcknowledged(version.getVersionText(), true)) return; OpenApiUtils.safeInvokeLater(() -> { final Notification notification = new Notification(FlutterMessages.FLUTTER_NOTIFICATION_GROUP_ID, diff --git a/src/io/flutter/FlutterStudioStartupActivity.java b/src/io/flutter/FlutterStudioStartupActivity.java index ef534be48e..b1ba7d6ede 100644 --- a/src/io/flutter/FlutterStudioStartupActivity.java +++ b/src/io/flutter/FlutterStudioStartupActivity.java @@ -29,8 +29,7 @@ private static Void doNonBlockingStartup(@NotNull Project project) { //FlutterProjectCreator.disableUserConfig(project); // Monitor Android dependencies. FlutterSettings flutterSettings = FlutterSettings.getInstance(); - if (flutterSettings != null && flutterSettings.isSyncingAndroidLibraries() || - System.getProperty("flutter.android.library.sync", null) != null) { + if (flutterSettings.isSyncingAndroidLibraries() || System.getProperty("flutter.android.library.sync", null) != null) { // TODO(messick): Remove the flag once this sync mechanism is stable. AndroidModuleLibraryManager.startWatching(project); } diff --git a/src/io/flutter/FlutterUtils.java b/src/io/flutter/FlutterUtils.java index 114e6ad00e..766f8dda5b 100644 --- a/src/io/flutter/FlutterUtils.java +++ b/src/io/flutter/FlutterUtils.java @@ -578,9 +578,6 @@ public static EmbeddedBrowser embeddedBrowser(Project project) { } FlutterSettings settings = FlutterSettings.getInstance(); - if (settings == null) { - return null; - } return settings.isEnableJcefBrowser() ? EmbeddedJcefBrowser.getInstance(project) diff --git a/src/io/flutter/actions/OpenInAndroidStudioAction.java b/src/io/flutter/actions/OpenInAndroidStudioAction.java index bee655d0bc..f3c7446a49 100644 --- a/src/io/flutter/actions/OpenInAndroidStudioAction.java +++ b/src/io/flutter/actions/OpenInAndroidStudioAction.java @@ -178,7 +178,6 @@ protected static boolean isProjectFileName(@NotNull String name) { for (PubRoot root : PubRoots.forProject(project)) { if (root.isFlutterPlugin()) { final VirtualFile rootFile = root.getRoot(); - if (rootFile == null) continue; VirtualFile aFile = file; while (aFile != null) { if (aFile.equals(rootFile)) { diff --git a/src/io/flutter/console/FlutterConsoleFilter.java b/src/io/flutter/console/FlutterConsoleFilter.java index a95795e04b..963941dd8f 100644 --- a/src/io/flutter/console/FlutterConsoleFilter.java +++ b/src/io/flutter/console/FlutterConsoleFilter.java @@ -94,19 +94,17 @@ public VirtualFile fileAtPath(@NotNull String pathPart) { final VirtualFile[] roots = OpenApiUtils.getContentRoots(module); for (VirtualFile root : roots) { if (root == null) continue; - if (!pathPart.isEmpty()) { - final String baseDirPath = root.getPath(); - final String path = baseDirPath + "/" + pathPart; - VirtualFile file = findFile(path); - if (file == null) { - // check example dir too - // TODO(pq): remove when `example` is a content root: https://github.com/flutter/flutter-intellij/issues/2519 - final String exampleDirRelativePath = baseDirPath + "/example/" + pathPart; - file = findFile(exampleDirRelativePath); - } - if (file != null) { - return file; - } + final String baseDirPath = root.getPath(); + final String path = baseDirPath + "/" + pathPart; + VirtualFile file = findFile(path); + if (file == null) { + // check example dir too + // TODO(pq): remove when `example` is a content root: https://github.com/flutter/flutter-intellij/issues/2519 + final String exampleDirRelativePath = baseDirPath + "/example/" + pathPart; + file = findFile(exampleDirRelativePath); + } + if (file != null) { + return file; } } diff --git a/src/io/flutter/dart/FlutterRequestUtilities.java b/src/io/flutter/dart/FlutterRequestUtilities.java index d840eff115..4a4a53ca21 100644 --- a/src/io/flutter/dart/FlutterRequestUtilities.java +++ b/src/io/flutter/dart/FlutterRequestUtilities.java @@ -113,6 +113,6 @@ private static JsonObject buildJsonObjectRequest(String idValue, String methodVa */ @NotNull private static String getClassName(@Nullable Object object) { - return object != null && object.getClass().getName() != null ? object.getClass().getName() : "null"; + return object != null ? object.getClass().getName() : "null"; } } diff --git a/src/io/flutter/editor/FlutterIconLineMarkerProvider.java b/src/io/flutter/editor/FlutterIconLineMarkerProvider.java index d426f51a00..793daab5b2 100644 --- a/src/io/flutter/editor/FlutterIconLineMarkerProvider.java +++ b/src/io/flutter/editor/FlutterIconLineMarkerProvider.java @@ -239,7 +239,6 @@ private IconInfo findStandardDefinition(@NotNull String className, @Nullable private Icon findStandardIconFromDef(@NotNull String name, @NotNull IconInfo iconDef, @NotNull String path) { - assert LocalFileSystem.getInstance() != null; final VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(path); if (virtualFile == null) return null; final IconPreviewGenerator generator = new IconPreviewGenerator(virtualFile.getPath()); @@ -310,7 +309,6 @@ private LineMarkerInfo createLineMarker(@Nullable PsiElement element @Nullable private IconInfo findDefinition(@NotNull String className, @NotNull String iconName, @NotNull Project project, @NotNull String path) { - assert LocalFileSystem.getInstance() != null; final VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(path); if (virtualFile == null) return null; final PsiFile psiFile = PsiManager.getInstance(project).findFile(virtualFile); @@ -324,7 +322,6 @@ private IconInfo findDefinition(@NotNull String className, @NotNull String iconN @Nullable private Icon findIconFromDef(@NotNull String iconClassName, @NotNull IconInfo iconDef, @NotNull String path) { - assert LocalFileSystem.getInstance() != null; final VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(path); if (virtualFile == null) return null; VirtualFile parent = virtualFile; diff --git a/src/io/flutter/jxbrowser/EmbeddedJxBrowser.java b/src/io/flutter/jxbrowser/EmbeddedJxBrowser.java index 1470ef74f4..c1d4847390 100644 --- a/src/io/flutter/jxbrowser/EmbeddedJxBrowser.java +++ b/src/io/flutter/jxbrowser/EmbeddedJxBrowser.java @@ -212,7 +212,6 @@ private EmbeddedJxBrowser(@NotNull Project project) { private @Nullable String jxBrowserErrorFromFailedReason(@Nullable InstallationFailedReason failedReason) { if (failedReason == null) return null; final FailureType failureType = failedReason.failureType; - if (failureType == null) return null; return switch (failureType) { case SYSTEM_INCOMPATIBLE -> "System is incompatible with JX Browser"; case FILE_DOWNLOAD_FAILED -> "JX Browser file download failed"; diff --git a/src/io/flutter/run/FlutterReloadManager.java b/src/io/flutter/run/FlutterReloadManager.java index 74c2c6d6e9..e1e2521d6f 100644 --- a/src/io/flutter/run/FlutterReloadManager.java +++ b/src/io/flutter/run/FlutterReloadManager.java @@ -372,9 +372,7 @@ private void restartApp(@NotNull FlutterApp app, @NotNull String reason) { }); final FlutterDevice device = app.device(); - if (device != null) { - device.bringToFront(); - } + device.bringToFront(); } } diff --git a/src/io/flutter/run/bazelTest/BazelTestFields.java b/src/io/flutter/run/bazelTest/BazelTestFields.java index 45e3348ce2..cd287d732a 100644 --- a/src/io/flutter/run/bazelTest/BazelTestFields.java +++ b/src/io/flutter/run/bazelTest/BazelTestFields.java @@ -185,7 +185,6 @@ GeneralCommandLine getLaunchCommand(@NotNull final Project project, final Workspace workspace = getWorkspace(project); final String launchingScript = getTestScriptFromWorkspace(project); - assert launchingScript != null; // already checked final GeneralCommandLine commandLine = new GeneralCommandLine().withWorkDirectory(workspace.getRoot().getPath()); commandLine.setCharset(StandardCharsets.UTF_8); diff --git a/src/io/flutter/run/daemon/DevToolsServerTask.java b/src/io/flutter/run/daemon/DevToolsServerTask.java index c271a72474..0ad8aa65b5 100644 --- a/src/io/flutter/run/daemon/DevToolsServerTask.java +++ b/src/io/flutter/run/daemon/DevToolsServerTask.java @@ -217,7 +217,7 @@ private CompletableFuture checkForDartPluginInitiatedDevToolsW String[] parts = dartPluginUri.split(":"); String host = parts[0]; Integer port = Integer.parseInt(parts[1]); - if (host == null || port == null) { + if (host == null) { return null; } diff --git a/src/io/flutter/run/daemon/DevToolsService.java b/src/io/flutter/run/daemon/DevToolsService.java index 97073065ad..cc2794a443 100644 --- a/src/io/flutter/run/daemon/DevToolsService.java +++ b/src/io/flutter/run/daemon/DevToolsService.java @@ -120,11 +120,8 @@ private void startServer(boolean forceRestart) { } private boolean devToolsInstanceExists() { - if (devToolsFutureRef != null) { - final CompletableFuture devToolsFuture = devToolsFutureRef.get(); - return devToolsFuture != null && devToolsFuture.isDone() && !devToolsFuture.isCompletedExceptionally(); - } - return false; + final CompletableFuture devToolsFuture = devToolsFutureRef.get(); + return devToolsFuture != null && devToolsFuture.isDone() && !devToolsFuture.isCompletedExceptionally(); } private CompletableFuture pubActivateDevTools(FlutterSdk sdk) { diff --git a/src/io/flutter/sdk/FlutterPluginsLibraryManager.java b/src/io/flutter/sdk/FlutterPluginsLibraryManager.java index 62bef57e5a..42bb8235d1 100644 --- a/src/io/flutter/sdk/FlutterPluginsLibraryManager.java +++ b/src/io/flutter/sdk/FlutterPluginsLibraryManager.java @@ -125,7 +125,6 @@ private void updateFlutterPluginsImpl() { ReadAction.nonBlocking(() -> getFlutterPluginPaths(PubRoots.forProject(project))) .expireWith(FlutterDartAnalysisServer.getInstance(project)) .finishOnUiThread(ModalityState.nonModal(), flutterPluginPaths -> { - if (flutterPluginPaths == null) return; final Set flutterPluginUrls = new HashSet<>(); for (String path : flutterPluginPaths) { flutterPluginUrls.add(VfsUtilCore.pathToUrl(path)); diff --git a/src/io/flutter/sdk/FlutterSdk.java b/src/io/flutter/sdk/FlutterSdk.java index a7c05d01cb..70072412f0 100644 --- a/src/io/flutter/sdk/FlutterSdk.java +++ b/src/io/flutter/sdk/FlutterSdk.java @@ -295,7 +295,7 @@ public FlutterCommand flutterRun(@NotNull PubRoot root, final List args = new ArrayList<>(); args.add("--machine"); FlutterSettings settings = FlutterSettings.getInstance(); - if (settings != null && settings.isVerboseLogging()) { + if (settings.isVerboseLogging()) { args.add("--verbose"); } diff --git a/src/io/flutter/utils/AddToAppUtils.java b/src/io/flutter/utils/AddToAppUtils.java index 664006d7b3..93938a079d 100644 --- a/src/io/flutter/utils/AddToAppUtils.java +++ b/src/io/flutter/utils/AddToAppUtils.java @@ -69,12 +69,10 @@ public void modulesAdded(@NotNull Project proj, @NotNull List } else { Collection projectTypes = ProjectTypeService.getProjectTypes(project); - if (projectTypes != null) { - for (ProjectType projectType : projectTypes) { - if (projectType != null && "Android".equals(projectType.getId())) { - // This is an add-to-app project. - connection.subscribe(DebuggerManagerListener.TOPIC, makeAddToAppAttachListener(project)); - } + for (ProjectType projectType : projectTypes) { + if (projectType != null && "Android".equals(projectType.getId())) { + // This is an add-to-app project. + connection.subscribe(DebuggerManagerListener.TOPIC, makeAddToAppAttachListener(project)); } } } diff --git a/src/io/flutter/utils/FlutterModuleUtils.java b/src/io/flutter/utils/FlutterModuleUtils.java index 1705860fcd..61ffbfefb3 100644 --- a/src/io/flutter/utils/FlutterModuleUtils.java +++ b/src/io/flutter/utils/FlutterModuleUtils.java @@ -342,7 +342,6 @@ public static List findModulesWithFlutterContents(@NotNull Project proje // Return true if there is a module with the same name as the project plus the Android suffix. public static boolean hasAndroidModule(@NotNull Project project) { for (PubRoot root : PubRoots.forProject(project)) { - assert root != null; String name = PubspecYamlUtil.getDartProjectName(root.getPubspec()); String moduleName = name + "_android"; for (Module module : FlutterModuleUtils.getModules(project)) { diff --git a/src/io/flutter/vmService/DartVmServiceDebugProcess.java b/src/io/flutter/vmService/DartVmServiceDebugProcess.java index 3619d2c1a1..eed64ad611 100644 --- a/src/io/flutter/vmService/DartVmServiceDebugProcess.java +++ b/src/io/flutter/vmService/DartVmServiceDebugProcess.java @@ -185,9 +185,12 @@ public void logError(final String message) { @Override public void logError(final String message, final Throwable exception) { - if (!getVmConnected() || getSession() == null) { + if (!getVmConnected()) { return; } + else { + getSession(); + } if (message != null) { getSession().getConsoleView().print(message.trim() + "\n", ConsoleViewContentType.ERROR_OUTPUT); } diff --git a/src/io/flutter/vmService/VmServiceWrapper.java b/src/io/flutter/vmService/VmServiceWrapper.java index 51d3e8862a..5d0c21f2e5 100644 --- a/src/io/flutter/vmService/VmServiceWrapper.java +++ b/src/io/flutter/vmService/VmServiceWrapper.java @@ -176,11 +176,10 @@ public void received(final Isolate isolate) { }); FlutterSdkVersion flutterSdkVersion = null; - if (myDebugProcess.getSession() != null) { - final FlutterSdk flutterSdk = FlutterSdk.getFlutterSdk(myDebugProcess.getSession().getProject()); - if (flutterSdk != null) { - flutterSdkVersion = flutterSdk.getVersion(); - } + myDebugProcess.getSession(); + final FlutterSdk flutterSdk = FlutterSdk.getFlutterSdk(myDebugProcess.getSession().getProject()); + if (flutterSdk != null) { + flutterSdkVersion = flutterSdk.getVersion(); } if (flutterSdkVersion != null && flutterSdkVersion.canUseToolEventStream()) { @@ -407,7 +406,6 @@ public void received(Isolate response) { } Set mappedCanonicalBreakpoints = new HashSet<>(); - assert breakpoints != null; for (Breakpoint breakpoint : breakpoints) { Object location = breakpoint.getLocation(); // In JIT mode, locations will be unresolved at this time since files aren't compiled until they are used. @@ -613,7 +611,6 @@ public void onError(RPCError error) { private String getResolvedUri(@NotNull XSourcePosition position) { XDebugSession session = myDebugProcess.getSession(); - assert session != null; VirtualFile file = WorkspaceCache.getInstance(session.getProject()).isBazel() ? position.getFile() : position.getFile().getCanonicalFile(); assert file != null;