diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/DartFileListener.java b/third_party/src/main/java/com/jetbrains/lang/dart/DartFileListener.java index 5df3e29e4..288ac2a3b 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/DartFileListener.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/DartFileListener.java @@ -20,6 +20,7 @@ import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.registry.Registry; +import com.intellij.openapi.util.text.Strings; import com.intellij.openapi.vfs.AsyncFileListener; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtilCore; @@ -295,7 +296,7 @@ private static boolean isPathOutsideProjectContent(final @NotNull ProjectFileInd return true; } - while (!path.isEmpty()) { + while (Strings.isNotEmpty(path)) { final VirtualFile file = LocalFileSystem.getInstance().findFileByPath(path); if (file == null) { path = PathUtil.getParentPath(path); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java index cf91066a5..2194b663b 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java @@ -40,6 +40,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.util.text.Strings; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; @@ -2450,7 +2451,7 @@ private void logError(final @NonNls @NotNull String methodName, final @Nullable } final String trace = error.getStackTrace(); - final String partialTrace = trace == null || trace.isEmpty() ? "" : trace.substring(0, Math.min(trace.length(), 1000)); + final String partialTrace = Strings.isEmpty(trace) ? "" : trace.substring(0, Math.min(trace.length(), 1000)); final String message = getShortErrorMessage(methodName, filePath, error) + "\n" + partialTrace + "..."; LOG.error(message); } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerData.java b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerData.java index 22c9e4c4a..8295cca67 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerData.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/analyzer/DartServerData.java @@ -12,6 +12,7 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; +import com.intellij.openapi.util.text.Strings; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.impl.source.resolve.ResolveCache; import com.intellij.psi.search.SearchScope; @@ -251,7 +252,7 @@ void textDocumentContentDidChange(@NotNull String fileUri) { ApplicationManager.getApplication().executeOnPooledThread(() -> { String contents = myService.lspMessage_dart_textDocumentContent(fileUri); - if (contents == null || contents.isEmpty()) { + if (Strings.isEmpty(contents)) { myNotLocalFileUriToVirtualFileMap.remove(fileUri); return; } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/DartNamedElementNode.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/DartNamedElementNode.java index fd12ee54d..06eec6b38 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/DartNamedElementNode.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/DartNamedElementNode.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.generation.PsiElementMemberChooserObject; import com.intellij.navigation.ItemPresentation; import com.intellij.openapi.util.Iconable; +import com.intellij.openapi.util.text.Strings; import com.intellij.psi.util.PsiTreeUtil; import com.jetbrains.lang.dart.psi.DartClass; import com.jetbrains.lang.dart.psi.DartComponent; @@ -24,7 +25,7 @@ public DartNamedElementNode(final DartComponent dartComponent) { } if (dartComponent instanceof DartClass) { final String location = presentation.getLocationString(); - if (location != null && !location.isEmpty()) { + if (Strings.isNotEmpty(location)) { return dartComponent.getName() + " " + location; } return dartComponent.getName(); diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/info/DartParameterInfoHandler.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/info/DartParameterInfoHandler.java index e29e3a63d..1e6c3eb16 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/info/DartParameterInfoHandler.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/info/DartParameterInfoHandler.java @@ -7,6 +7,7 @@ import com.intellij.lang.parameterInfo.ParameterInfoUIContext; import com.intellij.lang.parameterInfo.UpdateParameterInfoContext; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.util.text.Strings; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.containers.ContainerUtil; @@ -104,7 +105,7 @@ public void updateUI(DartFunctionDescription p, @NotNull ParameterInfoUIContext return; } myParametersListPresentableText = p.getParametersListPresentableText(); - if (myParametersListPresentableText != null && myParametersListPresentableText.isEmpty()) { + if (Strings.isEmpty(myParametersListPresentableText)) { myParametersListPresentableText = CodeInsightBundle.message("parameter.info.no.parameters"); } context.setupUIComponentPresentation( diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartDaemonParserUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartDaemonParserUtil.java index de11e358d..d14ad4569 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartDaemonParserUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartDaemonParserUtil.java @@ -2,6 +2,7 @@ package com.jetbrains.lang.dart.ide.runner.server.webdev; import com.google.gson.*; +import com.intellij.openapi.util.text.Strings; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -106,7 +107,7 @@ public final class DartDaemonParserUtil { final JsonPrimitive primLog = params.getAsJsonPrimitive("log"); if (primLog != null) { String primLogAsString = primLog.getAsString(); - if (primLogAsString != null && !primLogAsString.isEmpty()) { + if (Strings.isNotEmpty(primLogAsString)) { return primLogAsString.trim(); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartWebdevConsoleView.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartWebdevConsoleView.java index fc4b677a1..537decfbd 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartWebdevConsoleView.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/server/webdev/DartWebdevConsoleView.java @@ -8,6 +8,7 @@ import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.text.Strings; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; @@ -42,7 +43,7 @@ public void print(@NotNull String text, @NotNull ConsoleViewContentType contentT super.print(text, contentType); } final String logMessage = DartDaemonParserUtil.getLogMessage(text.trim()); - if (logMessage != null && !logMessage.isEmpty()) { + if (Strings.isNotEmpty(logMessage)) { super.print(logMessage + "\n", contentType); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunningState.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunningState.java index edc241f29..c48a287e1 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunningState.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/runner/test/DartTestRunningState.java @@ -27,6 +27,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.util.text.Strings; import com.intellij.openapi.vfs.VirtualFile; import com.jetbrains.lang.dart.DartBundle; import com.jetbrains.lang.dart.ide.actions.DartPubActionBase; @@ -115,14 +116,14 @@ private static ConsoleView createConsole(@NotNull ExecutionEnvironment env) { targetName != null && !targetName.isEmpty()) { builder.append(" ").append(":").append(targetName).append(" ").append(EXPANDED_REPORTER_OPTION); - if (testRunnerOptions != null && !testRunnerOptions.isEmpty()) { + if (Strings.isNotEmpty(testRunnerOptions)) { builder.append(" ").append(testRunnerOptions); } } else { builder.append(' ').append(TEST_PACKAGE_SPEC); builder.append(' ').append(EXPANDED_REPORTER_OPTION); - if (testRunnerOptions != null && !testRunnerOptions.isEmpty()) { + if (Strings.isNotEmpty(testRunnerOptions)) { builder.append(" ").append(testRunnerOptions); } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java index 9abb59b0c..810f3aac4 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartSdkUtil.java @@ -11,6 +11,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.Strings; import com.intellij.ui.ComboboxWithBrowseButton; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.components.JBLabel; @@ -68,7 +69,7 @@ private static String readVersionFile(final String sdkHomePath) { @Contract("null->false") public static boolean isDartSdkHome(final @Nullable String path) { - return path != null && !path.isEmpty() && new File(path + "/lib/core/core.dart").isFile(); + return Strings.isNotEmpty(path) && new File(path + "/lib/core/core.dart").isFile(); } public static void initDartSdkControls(final @Nullable Project project,