From 00d481ab9b1f4aed5b0dd4b69362c4c1960c6d61 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 28 Nov 2018 19:59:46 +0300 Subject: [PATCH] cleanup --- .../src/com/intellij/compiler/impl/CompositeScope.java | 2 +- .../com/intellij/compiler/impl/FileSetCompileScope.java | 4 ++-- .../com/intellij/compiler/impl/ModuleCompileScope.java | 2 +- .../compiler/impl/OneProjectItemCompileScope.java | 2 +- .../com/intellij/compiler/impl/ProjectCompileScope.java | 2 +- .../com/intellij/compiler/options/JavaCompilersTab.java | 2 -- .../src/com/intellij/openapi/compiler/CompileScope.java | 2 +- .../cyclicDependencies/CyclicDependenciesBuilder.java | 4 +++- .../ide/projectView/impl/nodes/PackageElement.java | 7 ++++--- .../com/intellij/psi/search/GlobalSearchScopesCore.java | 1 + .../src/com/intellij/psi/search/GlobalSearchScope.java | 2 +- .../src/com/intellij/psi/search/LocalSearchScope.java | 9 ++++----- .../src/com/intellij/psi/impl/source/PsiFileImpl.java | 6 +++--- .../actions/AnalyzeDependenciesHandler.java | 3 ++- .../actions/BackwardDependenciesHandler.java | 5 +++-- 15 files changed, 28 insertions(+), 25 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java index b9882d3df577..f168726d9c38 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java @@ -72,7 +72,7 @@ public class CompositeScope extends ExportableUserDataHolderBase implements Comp } @Override - public boolean belongs(String url) { + public boolean belongs(@NotNull String url) { for (CompileScope scope : myScopes) { if (scope.belongs(url)) { return true; diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/FileSetCompileScope.java b/java/compiler/impl/src/com/intellij/compiler/impl/FileSetCompileScope.java index 1e06f08ec223..f91e2b937571 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/FileSetCompileScope.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/FileSetCompileScope.java @@ -34,7 +34,7 @@ import java.util.*; public class FileSetCompileScope extends ExportableUserDataHolderBase implements CompileScope { private final Set myRootFiles = new HashSet<>(); private final Set myDirectoryUrls = new HashSet<>(); - private Set myUrls = null; // urls caching + private Set myUrls; // urls caching private final Module[] myAffectedModules; public FileSetCompileScope(final Collection files, Module[] modules) { @@ -82,7 +82,7 @@ public class FileSetCompileScope extends ExportableUserDataHolderBase implements } @Override - public boolean belongs(String url) { + public boolean belongs(@NotNull String url) { //url = CompilerUtil.normalizePath(url, '/'); if (getUrls().contains(url)) { return true; diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/ModuleCompileScope.java b/java/compiler/impl/src/com/intellij/compiler/impl/ModuleCompileScope.java index 73535145826a..47a26739a95c 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/ModuleCompileScope.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/ModuleCompileScope.java @@ -97,7 +97,7 @@ public class ModuleCompileScope extends FileIndexCompileScope { } @Override - public boolean belongs(final String url) { + public boolean belongs(@NotNull final String url) { if (myScopeModules.isEmpty() && myIncludedUnloadedModules.isEmpty()) { return false; // optimization } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/OneProjectItemCompileScope.java b/java/compiler/impl/src/com/intellij/compiler/impl/OneProjectItemCompileScope.java index 1767a5699f57..84a65ce04e11 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/OneProjectItemCompileScope.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/OneProjectItemCompileScope.java @@ -62,7 +62,7 @@ public class OneProjectItemCompileScope extends ExportableUserDataHolderBase imp } @Override - public boolean belongs(String url) { + public boolean belongs(@NotNull String url) { if (myFile.isDirectory()){ return FileUtil.startsWith(url, myUrl); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/ProjectCompileScope.java b/java/compiler/impl/src/com/intellij/compiler/impl/ProjectCompileScope.java index f6f060d2b9ee..cbf4ab145123 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/ProjectCompileScope.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/ProjectCompileScope.java @@ -42,7 +42,7 @@ public class ProjectCompileScope extends FileIndexCompileScope { } @Override - public boolean belongs(String url) { + public boolean belongs(@NotNull String url) { final VirtualFile file = VirtualFileManager.getInstance().findFileByUrl(url); if (file != null) { for (FileIndex index : getFileIndices()) { diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java index b78268f35ba1..4f532a05e7a6 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java @@ -1,7 +1,6 @@ // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.compiler.options; -import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.compiler.CompilerConfiguration; import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; @@ -149,7 +148,6 @@ public class JavaCompilersTab implements SearchableConfigurable, Configurable.No finally { BuildManager.getInstance().clearState(myProject); PsiManager.getInstance(myProject).dropPsiCaches(); - DaemonCodeAnalyzer.getInstance(myProject).restart(); } } diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompileScope.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompileScope.java index 1517120bce6c..9c8766e5c5cd 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompileScope.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompileScope.java @@ -50,7 +50,7 @@ public interface CompileScope extends ExportableUserDataHolder { * @return true if the url specified belongs to the scope, false otherwise. * Note: the method may be time-consuming. */ - boolean belongs(String url); + boolean belongs(@NotNull String url); /** * Returns the list of modules files in which belong to the scope. diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/CyclicDependenciesBuilder.java b/java/java-impl/src/com/intellij/cyclicDependencies/CyclicDependenciesBuilder.java index dec004093f05..aec2bfc91b29 100644 --- a/java/java-impl/src/com/intellij/cyclicDependencies/CyclicDependenciesBuilder.java +++ b/java/java-impl/src/com/intellij/cyclicDependencies/CyclicDependenciesBuilder.java @@ -32,6 +32,7 @@ import org.jetbrains.annotations.NotNull; import java.util.*; public class CyclicDependenciesBuilder{ + @NotNull private final Project myProject; private final AnalysisScope myScope; private final Map myPackages = new HashMap<>(); @@ -45,7 +46,7 @@ public class CyclicDependenciesBuilder{ private String myRootNodeNameInUsageView; - public CyclicDependenciesBuilder(final Project project, final AnalysisScope scope) { + public CyclicDependenciesBuilder(@NotNull Project project, final AnalysisScope scope) { myProject = project; myScope = scope; myForwardBuilder = new ForwardDependenciesBuilder(myProject, myScope){ @@ -69,6 +70,7 @@ public class CyclicDependenciesBuilder{ myRootNodeNameInUsageView = rootNodeNameInUsageView; } + @NotNull public Project getProject() { return myProject; } diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java index 837f6f7c922d..c3a1ee1f75f6 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java @@ -67,6 +67,7 @@ public final class PackageElement implements Queryable, RootsProvider { return roots; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof PackageElement)) return false; @@ -80,10 +81,10 @@ public final class PackageElement implements Queryable, RootsProvider { return true; } + @Override public int hashCode() { - int result; - result = (myModule != null ? myModule.hashCode() : 0); - result = 29 * result + (myElement.hashCode()); + int result = myModule != null ? myModule.hashCode() : 0; + result = 29 * result + myElement.hashCode(); result = 29 * result + (myIsLibraryElement ? 1 : 0); return result; } diff --git a/platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java b/platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java index 18274ca81b0f..1fb5b95fe020 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java +++ b/platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java @@ -287,6 +287,7 @@ public class GlobalSearchScopesCore { return super.uniteWith(scope); } + @NotNull private static Set union(boolean addDir1, @NotNull VirtualFile dir1, boolean addDir2, @NotNull VirtualFile dir2) { if (addDir1 && addDir2) return ContainerUtil.newHashSet(dir1, dir2); if (addDir1) return Collections.singleton(dir1); diff --git a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java index 4ae7d6f54b43..af1383f19842 100644 --- a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java +++ b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java @@ -839,7 +839,7 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw Project project = getProject(); myHasFilesOutOfProjectRoots = result = project != null && !project.isDefault() && - myFiles.stream().anyMatch(file -> FileIndexFacade.getInstance(project).getModuleForFile(file) == null); + ContainerUtil.find(myFiles, file -> FileIndexFacade.getInstance(project).getModuleForFile(file) != null) == null; } return result; } diff --git a/platform/core-api/src/com/intellij/psi/search/LocalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/LocalSearchScope.java index ef88b50be324..14ab5985fc19 100644 --- a/platform/core-api/src/com/intellij/psi/search/LocalSearchScope.java +++ b/platform/core-api/src/com/intellij/psi/search/LocalSearchScope.java @@ -111,6 +111,7 @@ public class LocalSearchScope extends SearchScope { return myVirtualFiles; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof LocalSearchScope)) return false; @@ -195,6 +196,7 @@ public class LocalSearchScope extends SearchScope { return null; } + @Override public String toString() { StringBuilder result = new StringBuilder(); for (int i = 0; i < myScope.length; i++) { @@ -257,11 +259,11 @@ public class LocalSearchScope extends SearchScope { return commonParent; } - public boolean isInScope(VirtualFile file) { + public boolean isInScope(@NotNull VirtualFile file) { return ArrayUtil.indexOf(myVirtualFiles, file) != -1; } - public boolean containsRange(PsiFile file, @NotNull TextRange range) { + public boolean containsRange(@NotNull PsiFile file, @NotNull TextRange range) { for (PsiElement element : getScope()) { if (file == element.getContainingFile() && element.getTextRange().contains(range)) { return true; @@ -291,8 +293,5 @@ public class LocalSearchScope extends SearchScope { ? EMPTY : new LocalSearchScope(PsiUtilCore.toPsiElementArray(result), scope.getDisplayName(), scope.isIgnoreInjectedPsi()); }); - - - } } diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java index 80f14807e108..22fcf376eaeb 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java @@ -115,7 +115,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF return null; } - protected FileElement derefTreeElement() { + FileElement derefTreeElement() { return myTrees.derefTreeElement(); } @@ -337,7 +337,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF } @Override - @SuppressWarnings({"CloneDoesntCallSuperClone"}) + @SuppressWarnings("CloneDoesntCallSuperClone") protected PsiFileImpl clone() { FileViewProvider viewProvider = getViewProvider(); FileViewProvider providerCopy = viewProvider.clone(); @@ -990,7 +990,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF putInfo(this, info); } - public static void putInfo(PsiFile psiFile, Map info) { + public static void putInfo(@NotNull PsiFile psiFile, @NotNull Map info) { info.put("fileName", psiFile.getName()); info.put("fileType", psiFile.getFileType().toString()); } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/actions/AnalyzeDependenciesHandler.java b/platform/lang-impl/src/com/intellij/packageDependencies/actions/AnalyzeDependenciesHandler.java index efa5a9fa4b01..a817fa823a56 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/actions/AnalyzeDependenciesHandler.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/actions/AnalyzeDependenciesHandler.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.packageDependencies.DependenciesBuilder; import com.intellij.packageDependencies.ForwardDependenciesBuilder; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.HashSet; @@ -31,7 +32,7 @@ import java.util.Set; public class AnalyzeDependenciesHandler extends DependenciesHandlerBase { private final int myTransitiveBorder; - public AnalyzeDependenciesHandler(Project project, List scopes, int transitiveBorder, Set excluded) { + public AnalyzeDependenciesHandler(@NotNull Project project, List scopes, int transitiveBorder, Set excluded) { super(project, scopes, excluded); myTransitiveBorder = transitiveBorder; } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/actions/BackwardDependenciesHandler.java b/platform/lang-impl/src/com/intellij/packageDependencies/actions/BackwardDependenciesHandler.java index c04aeed4d854..9ea5463604f8 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/actions/BackwardDependenciesHandler.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/actions/BackwardDependenciesHandler.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.packageDependencies.BackwardDependenciesBuilder; import com.intellij.packageDependencies.DependenciesBuilder; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Collections; @@ -32,11 +33,11 @@ import java.util.Set; public class BackwardDependenciesHandler extends DependenciesHandlerBase { private final AnalysisScope myScopeOfInterest; - public BackwardDependenciesHandler(Project project, AnalysisScope scope, final AnalysisScope selectedScope) { + public BackwardDependenciesHandler(@NotNull Project project, AnalysisScope scope, final AnalysisScope selectedScope) { this(project, Collections.singletonList(scope), selectedScope, new HashSet<>()); } - public BackwardDependenciesHandler(final Project project, final List scopes, final @Nullable AnalysisScope scopeOfInterest, Set excluded) { + public BackwardDependenciesHandler(@NotNull Project project, final List scopes, @Nullable final AnalysisScope scopeOfInterest, Set excluded) { super(project, scopes, excluded); myScopeOfInterest = scopeOfInterest; }