diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java index bcbd76ee4703..8237bade6245 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java @@ -67,7 +67,7 @@ public class GlobalInspectionContextBase extends UserDataHolderBase implements G protected final Map, GlobalInspectionContextExtension> myExtensions = new HashMap<>(); - final Map myTools = new HashMap<>(); + private final Map myTools = new HashMap<>(); @NonNls public static final String PROBLEMS_TAG_NAME = "problems"; @NonNls public static final String LOCAL_TOOL_ATTRIBUTE = "is_local_tool"; @@ -459,7 +459,7 @@ public class GlobalInspectionContextBase extends UserDataHolderBase implements G } public static void assertUnderDaemonProgress() { - ProgressIndicator indicator = ProgressManager.getGlobalProgressIndicator(); + ProgressIndicator indicator = ProgressIndicatorProvider.getGlobalProgressIndicator(); ProgressIndicator original = indicator == null ? null : ProgressWrapper.unwrapAll(indicator); if (!(original instanceof DaemonProgressIndicator)) { throw new IllegalStateException("must be run under DaemonProgressIndicator, but got: " + (original == null ? "null" : ": " +original.getClass()) + ": "+ original); diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextEx.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextEx.java index 669a9ed9521e..2d8c77df62bf 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextEx.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextEx.java @@ -53,8 +53,8 @@ public class GlobalInspectionContextEx extends GlobalInspectionContextBase { protected volatile Path myOutputDir; protected GlobalReportedProblemFilter myGlobalReportedProblemFilter; private ReportedProblemFilter myReportedProblemFilter; - Map myProfile; - protected InspectionProblemConsumer myProblemConsumer = null; + private Map myProfile; + protected InspectionProblemConsumer myProblemConsumer; public GlobalInspectionContextEx(@NotNull Project project) {super(project);} diff --git a/platform/core-ui/src/util/IconUtil.java b/platform/core-ui/src/util/IconUtil.java index e3a153b8cb8a..544d0809bc85 100644 --- a/platform/core-ui/src/util/IconUtil.java +++ b/platform/core-ui/src/util/IconUtil.java @@ -69,7 +69,7 @@ public class IconUtil { return icon; } - double scale = 1f; + double scale = 1.0f; if (image instanceof JBHiDPIScaledImage) { scale = ((JBHiDPIScaledImage)image).getScale(); image = ((JBHiDPIScaledImage)image).getDelegate(); @@ -137,9 +137,7 @@ public class IconUtil { }; } - private static final Function ICON_NULLABLE_FUNCTION = key -> { - return computeFileIcon(key.getFile(), key.getFlags(), key.getProject()); - }; + private static final Function ICON_NULLABLE_FUNCTION = key -> computeFileIcon(key.getFile(), key.getFlags(), key.getProject()); /** * @return a deferred icon for the file, taking into account {@link FileIconProvider} and {@link FileIconPatcher} extensions. @@ -522,7 +520,7 @@ public class IconUtil { } private static double clampScale(double _scale) { - return MathUtil.clamp(_scale, .1, 32); + return MathUtil.clamp(_scale, 0.1, 32); } private static void paintScaled(@Nullable Component c, @NotNull Graphics g, int x, int y, double scale, @NotNull Icon source) { @@ -628,7 +626,6 @@ public class IconUtil { * @see #scale(Icon, Component, float) * @param icon the icon to scale * @param ctx the scale context to apply - * @param scale the scale factor * @return the scaled icon */ @NotNull @@ -767,7 +764,7 @@ public class IconUtil { int b = rgba & 0xff; float[] hsb = new float[3]; Color.RGBtoHSB(r, g, b, hsb); - int rgb = Color.HSBtoRGB(myBase[0], myBase[1] * (myKeepGray ? hsb[1] : 1f), myBase[2] * hsb[2]); + int rgb = Color.HSBtoRGB(myBase[0], myBase[1] * (myKeepGray ? hsb[1] : 1.0f), myBase[2] * hsb[2]); return (rgba & 0xff000000) | (rgb & 0xffffff); } } @@ -909,7 +906,7 @@ public class IconUtil { public static Icon addText(@NotNull Icon base, @NotNull String text) { LayeredIcon icon = new LayeredIcon(2); icon.setIcon(base, 0); - icon.setIcon(textToIcon(text, new JLabel(), JBUIScale.scale(6f)), 1, SwingConstants.SOUTH_EAST); + icon.setIcon(textToIcon(text, new JLabel(), JBUIScale.scale(6.0f)), 1, SwingConstants.SOUTH_EAST); return icon; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java index c6acaca9c73a..d9c49b8914a5 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java @@ -104,7 +104,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { private volatile boolean myViewClosed = true; private long myInspectionStartedTimestamp; private final ConcurrentMap, InspectionToolPresentation> myPresentationMap = new ConcurrentHashMap<>(); - private boolean forceInspectAllScope = false; + private boolean forceInspectAllScope; public GlobalInspectionContextImpl(@NotNull Project project, @NotNull NotNullLazyValue contentManager) { super(project); @@ -175,9 +175,9 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } public void resolveElement(@NotNull InspectionProfileEntry tool, @NotNull PsiElement element) { - final RefElement refElement = getRefManager().getReference(element); + RefElement refElement = getRefManager().getReference(element); if (refElement == null) return; - final Tools tools = getTools().get(tool.getShortName()); + Tools tools = getTools().get(tool.getShortName()); if (tools != null){ for (ScopeToolState state : tools.getTools()) { InspectionToolWrapper toolWrapper = state.getTool(); @@ -203,7 +203,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { private static void resolveElementRecursively(@NotNull InspectionToolResultExporter presentation, @NotNull RefEntity refElement) { presentation.suppressProblem(refElement); - final List children = refElement.getChildren(); + List children = refElement.getChildren(); for (RefEntity child : children) { resolveElementRecursively(presentation, child); } @@ -213,7 +213,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { return AnalysisUIOptions.getInstance(getProject()); } - public void setSplitterProportion(final float proportion) { + public void setSplitterProportion(float proportion) { getUIOptions().SPLITTER_PROPORTION = proportion; } @@ -222,7 +222,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } @Override - protected void launchInspections(final @NotNull AnalysisScope scope) { + protected void launchInspections(@NotNull AnalysisScope scope) { myViewClosed = false; super.launchInspections(scope); } @@ -233,7 +233,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } @Override - protected void notifyInspectionsFinished(final @NotNull AnalysisScope scope) { + protected void notifyInspectionsFinished(@NotNull AnalysisScope scope) { //noinspection TestOnlyProblems if (ApplicationManager.getApplication().isUnitTestMode() && !TESTING_VIEW) return; LOG.assertTrue(ApplicationManager.getApplication().isDispatchThread()); @@ -255,7 +255,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { if (!(myView == null ? newView : myView).hasProblems()) { int totalFiles = getStdJobDescriptors().BUILD_GRAPH.getTotalAmount(); // do not use invalidated scope - final var notification = NOTIFICATION_GROUP.createNotification(InspectionsBundle.message("inspection.no.problems.message", + var notification = NOTIFICATION_GROUP.createNotification(InspectionsBundle.message("inspection.no.problems.message", totalFiles, scope.getShortenName()), MessageType.INFO); if (!scope.isIncludeTestSource()) addRepeatWithTestsAction(scope, notification, () -> doInspections(scope)); @@ -276,9 +276,9 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } @Override - protected void runTools(final @NotNull AnalysisScope scope, boolean runGlobalToolsOnly, boolean isOfflineInspections) { + protected void runTools(@NotNull AnalysisScope scope, boolean runGlobalToolsOnly, boolean isOfflineInspections) { myInspectionStartedTimestamp = System.currentTimeMillis(); - final ProgressIndicator progressIndicator = ProgressIndicatorProvider.getGlobalProgressIndicator(); + ProgressIndicator progressIndicator = ProgressIndicatorProvider.getGlobalProgressIndicator(); if (progressIndicator == null) { throw new IncorrectOperationException("Must be run under progress"); } @@ -292,11 +292,11 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { if (!isOfflineInspections && ApplicationManager.getApplication().isReadAccessAllowed()) { throw new IncorrectOperationException("Must not start inspections from within global read action"); } - final InspectionManager inspectionManager = InspectionManager.getInstance(getProject()); + InspectionManager inspectionManager = InspectionManager.getInstance(getProject()); ((RefManagerImpl)getRefManager()).initializeAnnotators(); - final List globalTools = new ArrayList<>(); - final List localTools = new ArrayList<>(); - final List globalSimpleTools = new ArrayList<>(); + List globalTools = new ArrayList<>(); + List localTools = new ArrayList<>(); + List globalSimpleTools = new ArrayList<>(); initializeTools(globalTools, localTools, globalSimpleTools); appendPairedInspectionsForUnfairTools(globalTools, globalSimpleTools, localTools); runGlobalTools(scope, inspectionManager, globalTools, isOfflineInspections); @@ -304,19 +304,19 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { if (runGlobalToolsOnly || localTools.isEmpty() && globalSimpleTools.isEmpty()) return; SearchScope searchScope = ReadAction.compute(scope::toSearchScope); - final Set localScopeFiles = searchScope instanceof LocalSearchScope ? new HashSet<>() : null; + Set localScopeFiles = searchScope instanceof LocalSearchScope ? new HashSet<>() : null; for (Tools tools : globalSimpleTools) { GlobalInspectionToolWrapper toolWrapper = (GlobalInspectionToolWrapper)tools.getTool(); GlobalSimpleInspectionTool tool = (GlobalSimpleInspectionTool)toolWrapper.getTool(); tool.inspectionStarted(inspectionManager, this, getPresentation(toolWrapper)); } - final boolean headlessEnvironment = ApplicationManager.getApplication().isHeadlessEnvironment(); - final boolean inspectInjectedPsi = Registry.is("idea.batch.inspections.inspect.injected.psi", true); + boolean headlessEnvironment = ApplicationManager.getApplication().isHeadlessEnvironment(); + boolean inspectInjectedPsi = Registry.is("idea.batch.inspections.inspect.injected.psi", true); - final Map> map = getInspectionWrappersMap(localTools); + Map> map = getInspectionWrappersMap(localTools); - final BlockingQueue filesToInspect = new ArrayBlockingQueue<>(1000); + BlockingQueue filesToInspect = new ArrayBlockingQueue<>(1000); // use original progress indicator here since we don't want it to cancel on write action start ProgressIndicator iteratingIndicator = new SensitiveProgressWrapper(progressIndicator); Future future = startIterateScopeInBackground(scope, localScopeFiles, headlessEnvironment, filesToInspect, iteratingIndicator); @@ -325,7 +325,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { Processor processor = virtualFile -> { ProgressManager.checkCanceled(); Boolean readActionSuccess = DumbService.getInstance(getProject()).tryRunReadActionInSmartMode(() -> { - long start = myProfile == null ? 0 : System.currentTimeMillis(); + long start = getPathProfile() == null ? 0 : System.currentTimeMillis(); PsiFile file = virtualFile.isValid() ? psiManager.findFile(virtualFile) : null; if (file == null) { return true; @@ -369,7 +369,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { return true; }; try { - final Queue filesFailedToInspect = new LinkedBlockingQueue<>(); + Queue filesFailedToInspect = new LinkedBlockingQueue<>(); while (true) { Disposable disposable = Disposer.newDisposable(); ProgressIndicator wrapper = new DaemonProgressIndicator(); @@ -456,10 +456,10 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { dependentIndicators.forEach(ProgressIndicator::cancel); } - private void inspectFile(final @NotNull PsiFile file, - final @NotNull TextRange range, - final @NotNull InspectionManager inspectionManager, - final @NotNull Map> wrappersMap, + private void inspectFile(@NotNull PsiFile file, + @NotNull TextRange range, + @NotNull InspectionManager inspectionManager, + @NotNull Map> wrappersMap, @NotNull List globalSimpleTools, @NotNull List localTools, boolean inspectInjectedPsi) { @@ -509,22 +509,22 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } } - protected boolean includeDoNotShow(final InspectionProfile profile) { + protected boolean includeDoNotShow(InspectionProfile profile) { return profile.getSingleTool() != null; } private static final VirtualFile TOMBSTONE = new LightVirtualFile("TOMBSTONE"); - private @NotNull Future startIterateScopeInBackground(final @NotNull AnalysisScope scope, - final @Nullable Collection localScopeFiles, - final boolean headlessEnvironment, - final @NotNull BlockingQueue outFilesToInspect, - final @NotNull ProgressIndicator progressIndicator) { + private @NotNull Future startIterateScopeInBackground(@NotNull AnalysisScope scope, + @Nullable Collection localScopeFiles, + boolean headlessEnvironment, + @NotNull BlockingQueue outFilesToInspect, + @NotNull ProgressIndicator progressIndicator) { Task.Backgroundable task = new Task.Backgroundable(getProject(), InspectionsBundle.message("scanning.files.to.inspect.progress.text")) { @Override public void run(@NotNull ProgressIndicator indicator) { try { - final FileIndex fileIndex = ProjectRootManager.getInstance(getProject()).getFileIndex(); + FileIndex fileIndex = ProjectRootManager.getInstance(getProject()).getFileIndex(); scope.accept(file -> { ProgressManager.checkCanceled(); if (!forceInspectAllScope && (ProjectUtil.isProjectOrWorkspaceFile(file) || !fileIndex.isInContent(file))) return true; @@ -571,7 +571,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } private Document shouldProcess(@NotNull PsiFile file, boolean headlessEnvironment, @Nullable Collection localScopeFiles) { - final VirtualFile virtualFile = file.getVirtualFile(); + VirtualFile virtualFile = file.getVirtualFile(); if (virtualFile == null) return null; if (isBinary(file)) return null; //do not inspect binary files @@ -590,15 +590,15 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { return PsiDocumentManager.getInstance(getProject()).getDocument(file); } - private void runGlobalTools(final @NotNull AnalysisScope scope, - final @NotNull InspectionManager inspectionManager, + private void runGlobalTools(@NotNull AnalysisScope scope, + @NotNull InspectionManager inspectionManager, @NotNull List globalTools, boolean isOfflineInspections) { LOG.assertTrue(!ApplicationManager.getApplication().isReadAccessAllowed() || isOfflineInspections, "Must not run under read action, too unresponsive"); - final List> needRepeatSearchRequest = new ArrayList<>(); + List> needRepeatSearchRequest = new ArrayList<>(); SearchScope initialSearchScope = ReadAction.compute(scope::toSearchScope); - final boolean canBeExternalUsages = !(scope.getScopeType() == AnalysisScope.PROJECT && scope.isIncludeTestSource()); + boolean canBeExternalUsages = !(scope.getScopeType() == AnalysisScope.PROJECT && scope.isIncludeTestSource()); InspectListener eventPublisher = getEventPublisher(); for (Tools tools : globalTools) { for (ScopeToolState state : tools.getTools()) { @@ -608,9 +608,9 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { AnalysisScope scopeForState = new AnalysisScope(GlobalSearchScopesCore.filterScope(getProject(), stateScope) .intersectWith(initialSearchScope), getProject()); - final InspectionToolWrapper toolWrapper = state.getTool(); - final GlobalInspectionTool tool = (GlobalInspectionTool)toolWrapper.getTool(); - final InspectionToolResultExporter toolPresentation = getPresentation(toolWrapper); + InspectionToolWrapper toolWrapper = state.getTool(); + GlobalInspectionTool tool = (GlobalInspectionTool)toolWrapper.getTool(); + InspectionToolResultExporter toolPresentation = getPresentation(toolWrapper); try { if (tool.isGraphNeeded()) { try { @@ -618,9 +618,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { eventPublisher, InspectListener.ActivityKind.REFERENCE_SEARCH, getProject(), - () -> { - ((RefManagerImpl)getRefManager()).findAllDeclarations(); - }); + () -> ((RefManagerImpl)getRefManager()).findAllDeclarations()); } catch (Throwable e) { getStdJobDescriptors().BUILD_GRAPH.setDoneAmount(0); @@ -663,9 +661,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { eventPublisher, InspectListener.ActivityKind.GLOBAL_POST_RUN_ACTIVITIES, getProject(), - () -> { - processPostRunActivities(needRepeatSearchRequest); - }); + () -> processPostRunActivities(needRepeatSearchRequest)); addProblemsToView(globalTools); } @@ -710,15 +706,15 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { String batchShortName = ((PairedUnfairLocalInspectionTool)localTool).getInspectionForBatchShortName(); InspectionProfile currentProfile = getCurrentProfile(); InspectionToolWrapper batchInspection; - final InspectionToolWrapper pairedWrapper = currentProfile.getInspectionTool(batchShortName, getProject()); + InspectionToolWrapper pairedWrapper = currentProfile.getInspectionTool(batchShortName, getProject()); batchInspection = pairedWrapper != null ? pairedWrapper.createCopy() : null; if (batchInspection != null && !getTools().containsKey(batchShortName)) { // add to existing inspections to run InspectionProfileEntry batchTool = batchInspection.getTool(); - final ScopeToolState defaultState = tool.getDefaultState(); + ScopeToolState defaultState = tool.getDefaultState(); ToolsImpl newTool = new ToolsImpl(batchInspection, defaultState.getLevel(), true, defaultState.isEnabled()); for (ScopeToolState state : tool.getTools()) { - final NamedScope scope = state.getScope(getProject()); + NamedScope scope = state.getScope(getProject()); if (scope != null) { newTool.addTool(scope, batchInspection, state.isEnabled(), state.getLevel()); } @@ -727,7 +723,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { else if (batchTool instanceof GlobalSimpleInspectionTool) globalSimpleTools.add(newTool); else if (batchTool instanceof GlobalInspectionTool) globalTools.add(newTool); else throw new AssertionError(batchTool); - myTools.put(batchShortName, newTool); + getTools().put(batchShortName, newTool); batchInspection.initialize(this); } } @@ -746,8 +742,8 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { }); } - private @NotNull ProblemDescriptionsProcessor getProblemDescriptionProcessor(final @NotNull GlobalInspectionToolWrapper toolWrapper, - final @NotNull Map> wrappersMap) { + private @NotNull ProblemDescriptionsProcessor getProblemDescriptionProcessor(@NotNull GlobalInspectionToolWrapper toolWrapper, + @NotNull Map> wrappersMap) { return new ProblemDescriptionsProcessor() { @Override public void addProblemElement(@Nullable RefEntity refEntity, CommonProblemDescriptor @NotNull ... commonProblemDescriptors) { @@ -804,7 +800,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } } if (myContent != null) { - final ContentManager contentManager = getContentManager(); + ContentManager contentManager = getContentManager(); contentManager.removeContent(myContent, true); } myViewClosed = true; @@ -836,11 +832,11 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } @Override - public void codeCleanup(final @NotNull AnalysisScope scope, - final @NotNull InspectionProfile profile, - final @Nullable String commandName, - final @Nullable Runnable postRunnable, - final boolean modal, + public void codeCleanup(@NotNull AnalysisScope scope, + @NotNull InspectionProfile profile, + @Nullable String commandName, + @Nullable Runnable postRunnable, + boolean modal, @NotNull Predicate shouldApplyFix) { String title = LangBundle.message("progress.title.inspect.code"); Task task = modal ? new Task.Modal(getProject(), title, true) { @@ -876,12 +872,12 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { @NotNull ProgressIndicator progressIndicator, @NotNull Predicate shouldApplyFix) { setCurrentScope(scope); - final int fileCount = scope.getFileCount(); + int fileCount = scope.getFileCount(); progressIndicator.setIndeterminate(false); - final SearchScope searchScope = ReadAction.compute(scope::toSearchScope); - final TextRange range; + SearchScope searchScope = ReadAction.compute(scope::toSearchScope); + TextRange range; if (searchScope instanceof LocalSearchScope) { - final PsiElement[] elements = ((LocalSearchScope)searchScope).getScope(); + PsiElement[] elements = ((LocalSearchScope)searchScope).getScope(); range = elements.length == 1 ? ReadAction.compute(elements[0]::getTextRange) : null; } else { @@ -892,7 +888,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { return tools.getTool().isCleanupTool(); }); boolean includeDoNotShow = includeDoNotShow(profile); - final RefManagerImpl refManager = (RefManagerImpl)getRefManager(); + RefManagerImpl refManager = (RefManagerImpl)getRefManager(); refManager.inspectionReadActionStarted(); List descriptors = new ArrayList<>(); Set files = new HashSet<>(); @@ -905,8 +901,8 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { progressIndicator.setFraction((double)++myCount / fileCount); if (isBinary(file)) return; - final List lTools = new ArrayList<>(); - for (final Tools tools : inspectionTools) { + List lTools = new ArrayList<>(); + for (Tools tools : inspectionTools) { InspectionToolWrapper tool = tools.getEnabledTool(file, includeDoNotShow); if (tool instanceof GlobalInspectionToolWrapper) { tool = ((GlobalInspectionToolWrapper)tool).getSharedLocalInspectionToolWrapper(); @@ -926,7 +922,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { Runnable runnable = () -> pass.doInspectInBatch(GlobalInspectionContextImpl.this, InspectionManager.getInstance(getProject()), lTools); ApplicationManager.getApplication().runReadAction(runnable); - final Set localDescriptors = new TreeSet<>(CommonProblemDescriptor.DESCRIPTOR_COMPARATOR); + Set localDescriptors = new TreeSet<>(CommonProblemDescriptor.DESCRIPTOR_COMPARATOR); for (LocalInspectionToolWrapper tool : lTools) { InspectionToolResultExporter toolPresentation = getPresentation(tool); for (CommonProblemDescriptor descriptor : toolPresentation.getProblemDescriptors()) { @@ -938,8 +934,8 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { if (searchScope instanceof LocalSearchScope) { for (Iterator iterator = localDescriptors.iterator(); iterator.hasNext(); ) { - final ProblemDescriptor descriptor = iterator.next(); - final TextRange infoRange = descriptor instanceof ProblemDescriptorBase ? ((ProblemDescriptorBase)descriptor).getTextRange() : null; + ProblemDescriptor descriptor = iterator.next(); + TextRange infoRange = descriptor instanceof ProblemDescriptorBase ? ((ProblemDescriptorBase)descriptor).getTextRange() : null; if (infoRange != null && !((LocalSearchScope)searchScope).containsRange(file, infoRange)) { iterator.remove(); } @@ -973,8 +969,8 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { @NotNull CleanupProblems problems, @Nullable String commandName, @Nullable Runnable postRunnable, - final @NotNull InspectionProfile profile, - final boolean modal, + @NotNull InspectionProfile profile, + boolean modal, @NotNull Predicate shouldApplyFix) { if (problems.getFiles().isEmpty()) { if (commandName != null) { @@ -1030,7 +1026,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextEx { } @Override - public @NotNull InspectionToolPresentation getPresentation(@NotNull InspectionToolWrapper toolWrapper) { + public @NotNull InspectionToolPresentation getPresentation(@NotNull InspectionToolWrapper toolWrapper) { return myPresentationMap.computeIfAbsent(toolWrapper, __ -> { String presentationClass = toolWrapper.myEP == null ? null : toolWrapper.myEP.presentation; if (StringUtil.isEmpty(presentationClass)) { diff --git a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java index 60500bf6b7c0..25a983e1268e 100644 --- a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java +++ b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java @@ -259,7 +259,7 @@ public final class JobLauncherImpl extends JobLauncher { * Process all elements from the {@code failedToProcess} and then {@code things} concurrently in the underlying pool. * Processing happens concurrently maintaining {@code JobSchedulerImpl.CORES_COUNT} parallelism. * Stop when {@code tombStone} element is occurred. - * If was unable to process some element, add it back to the {@code failedToProcess} queue. + * If was unable to process some element (an exception occurred during {@code thingProcessor.process()} call), add it back to the {@code failedToProcess} queue. * @return true if all elements processed successfully, false if at least one processor returned false or exception occurred */ public boolean processQueue(@NotNull final BlockingQueue things,