From 6f1d4a96a409f27cacdc7f4bcaec02e85b08ea8e Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 10 Jun 2024 10:02:29 +0200 Subject: [PATCH] Zero-tolerance warnings fixed GitOrigin-RevId: c663e0eeb78e4cabd6400d7ed26a5c7f5f215f67 --- .../com/intellij/lang/parser/GeneratedParserUtilBase.java | 6 +++--- .../core-api/src/com/intellij/lang/SyntaxTreeBuilder.java | 4 ++-- .../service/internal/ExternalSystemProcessingManager.java | 2 +- .../externalSystem/service/project/ProjectRenameAware.java | 3 +-- .../codeInsight/daemon/impl/PassExecutorService.java | 6 ++---- .../ide/actions/searcheverywhere/SearchEverywhereUI.java | 2 +- .../util/indexing/UnindexedFilesScannerExecutorImpl.kt | 2 +- .../src/com/intellij/ide/gdpr/ConsentSettingsUi.java | 3 +-- .../src/com/intellij/ui/popup/AbstractPopup.java | 2 +- 9 files changed, 13 insertions(+), 17 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java b/platform/analysis-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java index 99b6e6e5f496..4f6c71786e78 100644 --- a/platform/analysis-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java +++ b/platform/analysis-impl/src/com/intellij/lang/parser/GeneratedParserUtilBase.java @@ -588,7 +588,7 @@ public class GeneratedParserUtilBase { if (latestDoneMarker != null && frame.position >= latestDoneMarker.getStartIndex() && frame.position <= latestDoneMarker.getEndIndex()) { - extend_marker_impl((PsiBuilder.Marker)latestDoneMarker); + extend_marker_impl(latestDoneMarker); } state.suppressErrors = false; if (errorReported || result) { @@ -644,7 +644,7 @@ public class GeneratedParserUtilBase { state.typeExtends(last.getTokenType(), elementType) && wasAutoSkipped(builder, builder.rawTokenIndex() - last.getEndIndex())) { elementType = last.getTokenType(); - ((PsiBuilder.Marker)last).drop(); + last.drop(); } } if ((frame.modifiers & _UPPER_) != 0) { @@ -792,7 +792,7 @@ public class GeneratedParserUtilBase { if (latestDoneMarker != null && frame.position >= latestDoneMarker.getStartIndex() && frame.position <= latestDoneMarker.getEndIndex()) { - extend_marker_impl((PsiBuilder.Marker)latestDoneMarker); + extend_marker_impl(latestDoneMarker); } } else { diff --git a/platform/core-api/src/com/intellij/lang/SyntaxTreeBuilder.java b/platform/core-api/src/com/intellij/lang/SyntaxTreeBuilder.java index ea3dc36accec..e96bc36f14d8 100644 --- a/platform/core-api/src/com/intellij/lang/SyntaxTreeBuilder.java +++ b/platform/core-api/src/com/intellij/lang/SyntaxTreeBuilder.java @@ -191,7 +191,7 @@ public interface SyntaxTreeBuilder { default int getStartIndex() { throw new UnsupportedOperationException("not implemented for this kind of markers"); - }; + } default int getEndIndex() { throw new UnsupportedOperationException("not implemented for this kind of markers"); @@ -200,7 +200,7 @@ public interface SyntaxTreeBuilder { @NlsContexts.DetailedDescription @Nullable default String getErrorMessage() { return null; - }; + } default boolean isCollapsed() { return false; diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java index 46eddf79583c..e568e9225727 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemProcessingManager.java @@ -57,7 +57,7 @@ public final class ExternalSystemProcessingManager implements ExternalSystemTask public ExternalSystemProcessingManager() { Application app = ApplicationManager.getApplication(); - myFacadeManager = app.getService(ExternalSystemFacadeManager.class); + myFacadeManager = ExternalSystemFacadeManager.getInstance(); if (app.isUnitTestMode()) { return; } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/ProjectRenameAware.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/ProjectRenameAware.java index bcb687dda6bb..568be0856146 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/ProjectRenameAware.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/ProjectRenameAware.java @@ -1,7 +1,6 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.externalSystem.service.project; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.externalSystem.ExternalSystemManager; import com.intellij.openapi.externalSystem.service.ExternalSystemFacadeManager; import com.intellij.openapi.externalSystem.settings.AbstractExternalSystemSettings; @@ -15,7 +14,7 @@ import org.jetbrains.annotations.NotNull; */ public final class ProjectRenameAware { public static void beAware(@NotNull Project project) { - final ExternalSystemFacadeManager facadeManager = ApplicationManager.getApplication().getService(ExternalSystemFacadeManager.class); + final ExternalSystemFacadeManager facadeManager = ExternalSystemFacadeManager.getInstance(); for (ExternalSystemManager manager : ExternalSystemApiUtil.getAllManagers()) { AbstractExternalSystemSettings settings = manager.getSettingsProvider().fun(project); //noinspection unchecked diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java index 5f8620ebbcd4..5af94fdb66eb 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java @@ -374,10 +374,8 @@ final class PassExecutorService implements Disposable { @Override public void run() { ((ApplicationImpl)ApplicationManager.getApplication()).executeByImpatientReader(() -> { - try { - try (AccessToken ignored = ThreadContext.installThreadContext(myContext, true)) { - ((FileTypeManagerImpl)FileTypeManager.getInstance()).cacheFileTypesInside(() -> doRun()); - }; + try (AccessToken ignored = ThreadContext.installThreadContext(myContext, true)) { + ((FileTypeManagerImpl)FileTypeManager.getInstance()).cacheFileTypesInside(() -> doRun()); } catch (ApplicationUtil.CannotRunReadActionException e) { myUpdateProgress.cancel(); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java index a15810553b6c..9ff3d3e64cf3 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java @@ -519,7 +519,7 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider SearchEverywhereFoundElementInfo info = ContainerUtil.getOnlyItem(selection); return info == null ? null : info.getElement(); } - if (PlatformCoreDataKeys.SELECTED_ITEMS.is(dataId)) { ; + if (PlatformCoreDataKeys.SELECTED_ITEMS.is(dataId)) { if (selection.isEmpty()) return null; return ContainerUtil.map2Array(selection, Object.class, SearchEverywhereFoundElementInfo::getElement); } diff --git a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScannerExecutorImpl.kt b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScannerExecutorImpl.kt index 70f6eb82dbe0..8e6002a17e78 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScannerExecutorImpl.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesScannerExecutorImpl.kt @@ -326,6 +326,6 @@ class UnindexedFilesScannerExecutorImpl(private val project: Project, cs: Corout private val LOG = Logger.getInstance(UnindexedFilesScannerExecutor::class.java) @JvmStatic - fun getInstance(project: Project): UnindexedFilesScannerExecutorImpl = project.service() as UnindexedFilesScannerExecutorImpl + fun getInstance(project: Project): UnindexedFilesScannerExecutorImpl = UnindexedFilesScannerExecutor.getInstance(project) as UnindexedFilesScannerExecutorImpl } } diff --git a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentSettingsUi.java b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentSettingsUi.java index a1746b21097e..7ac8aa9ca443 100644 --- a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentSettingsUi.java +++ b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentSettingsUi.java @@ -120,8 +120,7 @@ public class ConsentSettingsUi extends JPanel implements ConfigurableUi consent.isAccepted()); cb.setEnabled(false); - if (dataSharingDisabledExternally) cb.setSelected(false); - else if (dataSharingEnabledByFreeLicense) cb.setSelected(true); + cb.setSelected(!dataSharingDisabledExternally); } else { stateSupplier = new ConsentStateSupplier(consent, () -> cb.isSelected()); diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java index 4c3c432ff623..f8e9a632a678 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -1690,7 +1690,7 @@ public class AbstractPopup implements JBPopup, ScreenAreaConsumer, AlignedPopup if (size == null) return; final Window window = getContentWindow(myContent); - if (window != null && size != null) { + if (window != null) { window.setSize(size); } }