diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/highlight/DartHighlightingErrorFilter.java b/third_party/src/main/java/com/jetbrains/lang/dart/highlight/DartHighlightingErrorFilter.java index 78ec1a74e..33b7acadb 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/highlight/DartHighlightingErrorFilter.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/highlight/DartHighlightingErrorFilter.java @@ -15,10 +15,6 @@ public boolean shouldHighlightErrorElement(final @NotNull PsiErrorElement elemen if (!(element.getLanguage() == DartLanguage.INSTANCE)) return true; final VirtualFile file = DartResolveUtil.getRealVirtualFile(element.getContainingFile()); - if (file != null && file.isInLocalFileSystem() && ProjectFileIndex.getInstance(element.getProject()).isInContent(file)) { - return false; - } - - return true; + return file == null || !file.isInLocalFileSystem() || !ProjectFileIndex.getInstance(element.getProject()).isInContent(file); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/DartBraceMatcher.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/DartBraceMatcher.java index 56ee7fd73..0e3f45265 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/DartBraceMatcher.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/DartBraceMatcher.java @@ -24,7 +24,7 @@ public final class DartBraceMatcher implements PairedBraceMatcher { @Override public boolean isPairedBracesAllowedBeforeType(@NotNull IElementType lbraceType, @Nullable IElementType contextType) { - return contextType == null || !DartTokenTypesSets.STRINGS.contains(contextType); + return !DartTokenTypesSets.STRINGS.contains(contextType); } @Override diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/AbstractDartFileProcessingAction.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/AbstractDartFileProcessingAction.java index 4be754e5c..6693aa00c 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/AbstractDartFileProcessingAction.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/AbstractDartFileProcessingAction.java @@ -164,9 +164,7 @@ private static boolean isApplicableFile(final @NotNull Project project, final @N final Module module = ModuleUtilCore.findModuleForFile(file, project); if (module == null) return false; - if (!DartSdkLibUtil.isDartSdkEnabled(module)) return false; - - return true; + return DartSdkLibUtil.isDartSdkEnabled(module); } private static boolean mayHaveApplicableDartFiles(final @NotNull Project project, diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/annotator/DartProblemGroup.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/annotator/DartProblemGroup.java index 7aca510bc..b0538879e 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/annotator/DartProblemGroup.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/annotator/DartProblemGroup.java @@ -193,9 +193,7 @@ private static boolean hasIgnoreCommentOnPrevLine(@NotNull Document document, in case '/' -> { if (prevLine.length() > index + 1 && prevLine.charAt(index + 1) == '/') { final String comment = prevLine.subSequence(index + 2, prevLine.length()).toString(); - if (StringUtil.trimLeading(comment, ' ').startsWith(IGNORE_PREFIX)) { - return true; - } + return StringUtil.trimLeading(comment, ' ').startsWith(IGNORE_PREFIX); } return false; } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartLineWrapPositionStrategy.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartLineWrapPositionStrategy.java index 8dc74795c..e30aa8935 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartLineWrapPositionStrategy.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartLineWrapPositionStrategy.java @@ -41,9 +41,7 @@ protected boolean canUseOffset(@NotNull Document document, int offset, boolean v if (charAtOffset == '.') { // Do not split the cascade token, but allow wrapping in front of it. - if (offset > 0 && chars.charAt(offset - 1) == '.') { - return false; - } + return offset <= 0 || chars.charAt(offset - 1) != '.'; } return true; } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartQuoteHandler.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartQuoteHandler.java index 7bd2066dc..948e63dca 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartQuoteHandler.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartQuoteHandler.java @@ -18,12 +18,8 @@ public boolean isOpeningQuote(final HighlighterIterator iterator, final int offs if (type == DartTokenTypes.OPEN_QUOTE) return true; - if (type == DartTokenTypes.RAW_SINGLE_QUOTED_STRING && offset == iterator.getStart() + 1) { // start of the raw string like r' - return true; - } - - return false; + return type == DartTokenTypes.RAW_SINGLE_QUOTED_STRING && offset == iterator.getStart() + 1; } @Override diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartSelectionFilter.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartSelectionFilter.java index eb10f3c19..07dadb15d 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartSelectionFilter.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/editor/DartSelectionFilter.java @@ -13,10 +13,7 @@ public final class DartSelectionFilter implements Condition { @Override public boolean value(final @NotNull PsiElement psiElement) { - if (getSiblingSemicolonIfExpression(psiElement) != null) { - return false; // DartWordSelectionHandler will select this expression with the following semicolon - } - return true; + return getSiblingSemicolonIfExpression(psiElement) == null; // DartWordSelectionHandler will select this expression with the following semicolon } public static @Nullable PsiElement getSiblingSemicolonIfExpression(final @NotNull PsiElement psiElement) { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartAnalysisServerSettingsForm.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartAnalysisServerSettingsForm.java index 24a3e4f42..c08ad1452 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartAnalysisServerSettingsForm.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartAnalysisServerSettingsForm.java @@ -47,12 +47,7 @@ protected void hyperlinkActivated(final @NotNull HyperlinkEvent e) { } public void reset(final @NotNull DartProblemsPresentationHelper presentationHelper) { - if (presentationHelper.getScopedAnalysisMode() == DartProblemsViewSettings.ScopedAnalysisMode.DartPackage) { - packageScopedAnalysisCheckbox.setSelected(true); - } - else { - packageScopedAnalysisCheckbox.setSelected(false); - } + packageScopedAnalysisCheckbox.setSelected(presentationHelper.getScopedAnalysisMode() == DartProblemsViewSettings.ScopedAnalysisMode.DartPackage); } public void addListener(final @NotNull ServerSettingsListener serverSettingsListener) { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsPresentationHelper.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsPresentationHelper.java index 307431657..6fb71209c 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsPresentationHelper.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/errorTreeView/DartProblemsPresentationHelper.java @@ -74,9 +74,7 @@ boolean areFiltersApplied() { if (mySettings.showErrors != DartProblemsViewSettings.SHOW_ERRORS_DEFAULT) return true; if (mySettings.showWarnings != DartProblemsViewSettings.SHOW_WARNINGS_DEFAULT) return true; if (mySettings.showHints != DartProblemsViewSettings.SHOW_HINTS_DEFAULT) return true; - if (mySettings.fileFilterMode != DartProblemsViewSettings.FILE_FILTER_MODE_DEFAULT) return true; - - return false; + return mySettings.fileFilterMode != DartProblemsViewSettings.FILE_FILTER_MODE_DEFAULT; } boolean setCurrentFile(@Nullable VirtualFile file) { @@ -160,9 +158,7 @@ boolean shouldShowProblem(@NotNull DartProblem problem) { if (getFileFilterMode() == DartProblemsViewSettings.FileFilterMode.ContentRoot) { ensureContentRootUpToDate(); - if (myCurrentContentRoot == null || !myCurrentContentRoot.equals(problem.getContentRoot())) { - return false; - } + return myCurrentContentRoot != null && myCurrentContentRoot.equals(problem.getContentRoot()); } return true; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartPostFormatProcessor.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartPostFormatProcessor.java index 1d33fced2..72e0202df 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartPostFormatProcessor.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartPostFormatProcessor.java @@ -40,8 +40,6 @@ private static boolean isApplicable(final @NotNull PsiFile psiFile) { final Module module = ModuleUtilCore.findModuleForPsiElement(psiFile); if (module == null || !DartSdkLibUtil.isDartSdkEnabled(module)) return false; if (!ProjectFileIndex.getInstance(project).isInContent(vFile)) return false; - if (!DartAnalysisServerService.getInstance(project).serverReadyForRequest()) return false; - - return true; + return DartAnalysisServerService.getInstance(project).serverReadyForRequest(); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartSpacingProcessor.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartSpacingProcessor.java index 49c71a098..a02c87336 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartSpacingProcessor.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/formatter/DartSpacingProcessor.java @@ -1027,9 +1027,7 @@ private static boolean cascadesAreSameMethod(ASTNode child1, ASTNode child2) { String name1 = getImmediateCallName(call1); if (name1 != null) { String name2 = getImmediateCallName(call2); - if (name1.equals(name2)) { - return true; - } + return name1.equals(name2); } } } @@ -1150,9 +1148,7 @@ private static boolean hasEmptyBlock(ASTNode node) { next = FormatterUtil.getPreviousNonWhitespaceSibling(next); if (next != null && DartIndentProcessor.EXPRESSIONS.contains(next.getElementType())) { ASTNode arrow = FormatterUtil.getPreviousNonWhitespaceSibling(next); - if (arrow != null && arrow.getElementType() == EXPRESSION_BODY_DEF) { - return true; - } + return arrow != null && arrow.getElementType() == EXPRESSION_BODY_DEF; } return false; } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java index 094fc50d9..06fb4ddfc 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartComponentInfo.java @@ -31,9 +31,7 @@ public boolean equals(Object o) { DartComponentInfo info = (DartComponentInfo)o; if (myComponentType != info.myComponentType) return false; - if (!Objects.equals(myLibraryName, info.myLibraryName)) return false; - - return true; + return Objects.equals(myLibraryName, info.myLibraryName); } @Override diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java index 14e201360..77ab4090c 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/index/DartImportOrExportInfo.java @@ -61,9 +61,7 @@ public boolean equals(Object o) { if (!myUri.equals(info.myUri)) return false; if (!Objects.equals(myImportPrefix, info.myImportPrefix)) return false; if (!myShowComponents.equals(info.myShowComponents)) return false; - if (!myHideComponents.equals(info.myHideComponents)) return false; - - return true; + return myHideComponents.equals(info.myHideComponents); } @Override diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/info/DartOptionalParameterDescription.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/info/DartOptionalParameterDescription.java index a6d82be48..64a38229c 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/info/DartOptionalParameterDescription.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/info/DartOptionalParameterDescription.java @@ -73,9 +73,7 @@ public boolean equals(Object o) { DartOptionalParameterDescription that = (DartOptionalParameterDescription)o; - if (myText.equals(that.myText)) return false; - - return true; + return !myText.equals(that.myText); } @Override diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/moveCode/DartComponentMover.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/moveCode/DartComponentMover.java index 9a0683fff..f6631b73d 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/moveCode/DartComponentMover.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/moveCode/DartComponentMover.java @@ -327,8 +327,7 @@ private static boolean crossesHeaderBoundary(PsiElement base, PsiElement sibling // Having two library statements is not legal but could happen while editing. if (baseType instanceof DartLibraryStatement && sibType instanceof DartLibraryStatement) return false; // Having mixed library and import is also possible but not allowed in this context. - if (baseType instanceof DartLibraryStatement || sibType instanceof DartLibraryStatement) return true; - return false; // both uri-based -- allow moving part & import + return baseType instanceof DartLibraryStatement || sibType instanceof DartLibraryStatement;// both uri-based -- allow moving part & import } private static PsiElement getHeaderParent(PsiElement element) { diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/ide/moveCode/DartStatementMover.java b/third_party/src/main/java/com/jetbrains/lang/dart/ide/moveCode/DartStatementMover.java index 2bbecb2a6..4912c96d7 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/ide/moveCode/DartStatementMover.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/ide/moveCode/DartStatementMover.java @@ -468,9 +468,7 @@ private static boolean statementCanBePlacedAlong(final PsiElement element) { } if (parent instanceof DartForStatement) { PsiElement body = DartPsiImplUtil.getForBody((DartForStatement)parent); - if (isSameStatement(element, body)) { - return true; - } + return isSameStatement(element, body); } return false; } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/resolve/DartPsiScopeProcessor.java b/third_party/src/main/java/com/jetbrains/lang/dart/resolve/DartPsiScopeProcessor.java index 85ff4a6e3..d0a8c7aad 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/resolve/DartPsiScopeProcessor.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/resolve/DartPsiScopeProcessor.java @@ -76,7 +76,6 @@ protected boolean isFilteredOut(final String name) { private static boolean isFilteredOut(final @Nullable String name, final @NotNull DartShowHideInfo showHideInfo) { if (showHideInfo.getHideComponents().contains(name)) return true; - if (!showHideInfo.getShowComponents().isEmpty() && !showHideInfo.getShowComponents().contains(name)) return true; - return false; + return !showHideInfo.getShowComponents().isEmpty() && !showHideInfo.getShowComponents().contains(name); } } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartConfigurable.java b/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartConfigurable.java index 97d7b349b..b5dbe3d09 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartConfigurable.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/sdk/DartConfigurable.java @@ -249,7 +249,7 @@ public boolean isModified() { } } else { - if (myDartSupportEnabledInitial != myEnableDartSupportCheckBox.isSelected()) return true; + return myDartSupportEnabledInitial != myEnableDartSupportCheckBox.isSelected(); } return false; diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartRefactoringUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartRefactoringUtil.java index bd7339b57..b9745f5d8 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartRefactoringUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartRefactoringUtil.java @@ -86,7 +86,7 @@ public void visitElement(final @NotNull PsiElement element) { } final DartStatements statements = PsiTreeUtil.getParentOfType(element1, DartStatements.class); - if (statements == null || element2 == null || !PsiTreeUtil.isAncestor(statements, element2, true)) { + if (element2 == null || !PsiTreeUtil.isAncestor(statements, element2, true)) { return PsiElement.EMPTY_ARRAY; } diff --git a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java index 6cf9289f2..e67a18099 100644 --- a/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java +++ b/third_party/src/main/java/com/jetbrains/lang/dart/util/DartResolveUtil.java @@ -262,9 +262,7 @@ private static boolean processTopLevelDeclarationsImpl(final @NotNull PsiElement processTopLevelDeclarationsImpl(context, processor, dartCoreLib, filesOfInterest, alreadyProcessed, false); processor.importedFileProcessingFinished(dartCoreLib); - if (!continueProcessing) { - return false; - } + return continueProcessing; } }