cleanup (final, visibility)

GitOrigin-RevId: 8faa58a751c19a553c1ba09763e56795cb36ed38

grid/core-impl/src/extractors/ScriptDataExtractor.java

@@ -228,7 +228,7 @@ public void complete() {
       }
     }
 
-    class DataStreamImpl extends DataStream<DataRowImpl> {
+    final class DataStreamImpl extends DataStream<DataRowImpl> {
       final AtomicReference<Iterator<DataRowImpl>> iterator = new AtomicReference<>(new Iterator<>() {
         @Override
         public boolean hasNext() {
@@ -255,7 +255,6 @@ void close(@Nullable Throwable error) {
       }
     }
 
-
     private final Queue<RowUpdate> myRowsQueue = new ArrayDeque<>();
     private boolean myRowsDequeued;
     private boolean myAllRowsLoaded;
@@ -365,7 +364,7 @@ private synchronized void doWait() {
       }
     }
 
-    static class RowUpdate {
+    static final class RowUpdate {
       final GridRow myRow;
       final List<? extends DataColumn> myAllColumnsUpdate;
 

idea/customization/base/src/IntelliJIdeaExternalResourceUrls.kt

@@ -1,7 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.idea.customization.base
 
-import com.intellij.openapi.util.SystemInfo
+import com.intellij.openapi.util.SystemInfoRt
 import com.intellij.platform.ide.impl.customization.BaseJetBrainsExternalProductResourceUrls
 import com.intellij.util.Url
 import com.intellij.util.Urls
@@ -30,7 +30,7 @@ class IntelliJIdeaExternalResourceUrls : BaseJetBrainsExternalProductResourceUrl
 
   override val keyboardShortcutsPdfUrl: Url
     get() {
-      val suffix = if (SystemInfo.isMac) "_Mac" else ""
+      val suffix = if (SystemInfoRt.isMac) "_Mac" else ""
       return Urls.newFromEncoded("https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard$suffix.pdf")
     }
 

java/compiler/charts/src/com/intellij/java/compiler/charts/jps/CompilationChartsBuildEvent.kt

@@ -13,7 +13,7 @@ import com.intellij.openapi.actionSystem.ActionGroup
 import javax.swing.Icon
 import javax.swing.JComponent
 
-class CompilationChartsBuildEvent(val view: BuildViewManager,
+internal class CompilationChartsBuildEvent(val view: BuildViewManager,
                                   val buildId: Any,
                                   val chart: CompilationCharts) :
   AbstractBuildEvent(Any(), buildId, System.currentTimeMillis(), CompilationChartsBundle.message("charts.tab.name")),

java/compiler/impl/src/com/intellij/compiler/impl/CompileDriverNotifications.kt

@@ -1,4 +1,4 @@
-// Copyright 2000-2021 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.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.compiler.impl
 
 import com.intellij.notification.Notification
@@ -25,7 +25,7 @@ class CompileDriverNotifications(
 
   companion object {
     @JvmStatic
-    fun getInstance(project: Project) = project.service<CompileDriverNotifications>()
+    fun getInstance(project: Project): CompileDriverNotifications = project.service<CompileDriverNotifications>()
   }
 
   override fun dispose() {
@@ -45,13 +45,15 @@ class CompileDriverNotifications(
       .setImportant(true)
 
     fun withExpiringAction(@NotificationContent title : String,
-                           handler: () -> Unit) = apply {
-      baseNotification.addAction(NotificationAction.createSimpleExpiring(title, handler))
+                           handler: () -> Unit): LightNotification {
+      return apply {
+        baseNotification.addAction(NotificationAction.createSimpleExpiring(title, handler))
+      }
     }
 
     @JvmOverloads
-    fun withOpenSettingsAction(moduleNameToSelect: String? = null, tabNameToSelect: String? = null) =
-      withExpiringAction(JavaCompilerBundle.message("notification.action.jps.open.configuration.dialog")) {
+    fun withOpenSettingsAction(moduleNameToSelect: String? = null, tabNameToSelect: String? = null): LightNotification {
+      return withExpiringAction(JavaCompilerBundle.message("notification.action.jps.open.configuration.dialog")) {
         val service = ProjectSettingsService.getInstance(project)
         if (moduleNameToSelect != null) {
           service.showModuleConfigurationDialog(moduleNameToSelect, tabNameToSelect)
@@ -60,6 +62,7 @@ class CompileDriverNotifications(
           service.openProjectSettings()
         }
       }
+    }
 
     fun withContent(@NotificationContent content: String): LightNotification = apply {
       baseNotification.setContent(content)

java/compiler/impl/src/com/intellij/compiler/inspection/ChangeSuperClassFix.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.compiler.inspection;
 
 import com.intellij.CommonBundle;
@@ -32,7 +32,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class ChangeSuperClassFix implements LocalQuickFix, HighPriorityAction {
+public final class ChangeSuperClassFix implements LocalQuickFix, HighPriorityAction {
   private final @NotNull SmartPsiElementPointer<PsiClass> myNewSuperClass;
   private final @NotNull SmartPsiElementPointer<PsiClass> myOldSuperClass;
   private final int myInheritorCount;

java/compiler/impl/src/com/intellij/openapi/compiler/util/InspectionValidatorWrapper.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.compiler.util;
 
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
@@ -40,7 +40,7 @@
 import java.io.IOException;
 import java.util.*;
 
-public class InspectionValidatorWrapper implements Validator {
+public final class InspectionValidatorWrapper implements Validator {
   private final InspectionValidator myValidator;
   private final PsiManager myPsiManager;
   private final CompilerManager myCompilerManager;

java/compiler/openapi/src/com/intellij/compiler/JavaCompilerConfiguration.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.compiler;
 
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
@@ -7,7 +7,7 @@
 import com.intellij.codeInspection.options.OptionControllerProvider;
 import com.intellij.openapi.compiler.JavaCompilerBundle;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.JavaCompilerConfigurationProxy;
 import com.intellij.psi.PsiElement;
@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.Objects;
 
-public final class JavaCompilerConfiguration extends JavaCompilerConfigurationProxy {
+final class JavaCompilerConfiguration extends JavaCompilerConfigurationProxy {
   @Override
   public @NotNull List<String> getAdditionalOptionsImpl(@NotNull Project project, @NotNull Module module) {
     return CompilerConfiguration.getInstance(project).getAdditionalOptions(module);
@@ -31,12 +31,12 @@ public void setAdditionalOptionsImpl(@NotNull Project project, @NotNull Module m
   /**
    * Provides an option "JavaCompilerConfiguration.additionalOptions" to change module-specific compiler options 
    */
-  public static final class Provider implements OptionControllerProvider {
+  static final class Provider implements OptionControllerProvider {
 
     @SuppressWarnings({"InjectedReferences", "LanguageMismatch"})
     @Override
     public @NotNull OptionController forContext(@NotNull PsiElement context) {
-      Module module = Objects.requireNonNull(ModuleUtil.findModuleForFile(context.getContainingFile()));
+      Module module = Objects.requireNonNull(ModuleUtilCore.findModuleForFile(context.getContainingFile()));
       Project project = module.getProject();
       String bindId = "additionalOptions";
       return OptionController.empty()

java/execution/openapi/src/com/intellij/execution/filters/NavigateToExceptionClassFilter.java

@@ -1,20 +1,19 @@
-// Copyright 2000-2020 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.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.execution.filters;
 
 import com.intellij.execution.filters.Filter.ResultItem;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiClass;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 public final class NavigateToExceptionClassFilter implements JvmExceptionOccurrenceFilter {
   @Override
-  public @Nullable ResultItem applyFilter(@NotNull String exceptionClassName,
-                                                 @NotNull List<PsiClass> classes,
-                                                 int exceptionStartOffset) {
+  public @NotNull ResultItem applyFilter(@NotNull String exceptionClassName,
+                                         @NotNull List<PsiClass> classes,
+                                         int exceptionStartOffset) {
     PsiClass psiClass = classes.get(0);
     boolean inContent =
       ProjectRootManager.getInstance(psiClass.getProject()).getFileIndex().isInContent(psiClass.getContainingFile().getVirtualFile());

java/ide-customization/src/com/intellij/ide/java/training/JavaOnboardingTourPromoter.kt

@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.java.training
 
 import com.intellij.java.ift.JavaLessonsBundle
@@ -9,7 +9,7 @@ import com.intellij.util.PlatformUtils
 import training.ui.welcomeScreen.OnboardingLessonPromoter
 import javax.swing.Icon
 
-class JavaOnboardingTourPromoter : OnboardingLessonPromoter(
+private class JavaOnboardingTourPromoter : OnboardingLessonPromoter(
   ideaOnboardingLessonId, javaLanguageId, JavaLessonsBundle.message("java.onboarding.lesson.name")
 ) {
   override val promoImage: Icon

java/java-impl-inspections/src/com/intellij/codeInspection/java19api/ModuleNode.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInspection.java19api;
 
 import com.intellij.codeInsight.daemon.impl.analysis.JavaModuleGraphUtil;
@@ -16,13 +16,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.java.JavaSourceRootProperties;
+import org.jetbrains.jps.model.java.JavaSourceRootType;
 import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
 
 import java.util.*;
 
-import static org.jetbrains.jps.model.java.JavaSourceRootType.SOURCE;
-
-class ModuleNode implements Comparable<ModuleNode> {
+final class ModuleNode implements Comparable<ModuleNode> {
   private final @Nullable Module myModule;
   private final @NotNull Set<String> myDeclaredPackages;
   private final @NotNull Set<String> myRequiredPackages;
@@ -146,7 +145,7 @@ PsiDirectory getRootDir() {
 
   private static boolean isSourceFolder(@NotNull SourceFolder folder) {
     final JpsModuleSourceRoot sourceRoot = folder.getJpsElement();
-    if (sourceRoot.getRootType() != SOURCE) return false;
+    if (sourceRoot.getRootType() != JavaSourceRootType.SOURCE) return false;
     if (!(sourceRoot.getProperties() instanceof JavaSourceRootProperties javaProperties)) return false;
     return !javaProperties.isForGeneratedSources();
   }

java/java-impl-refactorings/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java

@@ -1,8 +1,7 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.refactoring.changeSignature;
 
 import com.intellij.lang.java.JavaLanguage;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.light.LightRecordCanonicalConstructor;
@@ -32,9 +31,8 @@
 /**
  * @author Maxim.Medvedev
  */
-class JavaChangeSignatureUsageSearcher {
+final class JavaChangeSignatureUsageSearcher {
   private final JavaChangeInfo myChangeInfo;
-  private static final Logger LOG = Logger.getInstance(JavaChangeSignatureUsageSearcher.class);
 
   JavaChangeSignatureUsageSearcher(JavaChangeInfo changeInfo) {
     this.myChangeInfo = changeInfo;

java/java-impl-refactorings/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationTreeStructure.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.refactoring.typeMigration.ui;
 
 import com.intellij.ide.projectView.TreeStructureProvider;
@@ -9,10 +9,7 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author anna
- */
-public class TypeMigrationTreeStructure extends AbstractTreeStructureBase {
+public final class TypeMigrationTreeStructure extends AbstractTreeStructureBase {
   private MigrationRootNode myRoot;
 
   public TypeMigrationTreeStructure(final Project project) {
@@ -35,7 +32,6 @@ public List<TreeStructureProvider> getProviders() {
 
   @Override
   public void commit() {
-
   }
 
   @Override

java/java-impl/src/com/intellij/codeInsight/completion/commands/impl/DirectErrorFixCompletionCommand.kt

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInsight.completion.commands.impl
 
 import com.intellij.analysis.AnalysisBundle.message
@@ -21,7 +21,7 @@ import kotlinx.coroutines.job
 import org.jetbrains.annotations.Nls
 import javax.swing.Icon
 
-class DirectErrorFixCompletionCommand(
+internal class DirectErrorFixCompletionCommand(
   override val name: @Nls String,
   override val priority: Int?,
   override val icon: Icon?,

java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCollapseBlockHandler.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInsight.folding.impl;
 
 import com.intellij.psi.JavaTokenType;
@@ -8,7 +8,7 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.Nullable;
 
-public final class JavaCollapseBlockHandler extends CollapseBlockHandlerImpl {
+final class JavaCollapseBlockHandler extends CollapseBlockHandlerImpl {
   @Override
   protected @Nullable PsiElement findParentBlock(@Nullable PsiElement element) {
     return PsiTreeUtil.getParentOfType(element, PsiCodeBlock.class);

java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java

@@ -12,7 +12,6 @@
 
 import java.util.*;
 
-
 public final class JavaUsageTypeProvider implements UsageTypeProviderEx {
   @Override
   public UsageType getUsageType(final @NotNull PsiElement element) {
@@ -35,10 +34,9 @@ public UsageType getUsageType(@NotNull PsiElement element, UsageTarget @NotNull
   }
 
   private static @Nullable UsageType getMethodUsageType(PsiElement element) {
-    if (element instanceof PsiReferenceExpression) {
+    if (element instanceof PsiReferenceExpression referenceExpression) {
       final PsiMethod containerMethod = PsiTreeUtil.getParentOfType(element, PsiMethod.class);
       if (containerMethod != null) {
-        final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)element;
         final PsiExpression qualifier = referenceExpression.getQualifierExpression();
         final PsiElement p = referenceExpression.getParent();
         if (p instanceof PsiMethodCallExpression callExpression) {

java/java-impl/src/com/intellij/util/xml/JvmPsiTypeConverterImpl.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.util.xml;
 
 import com.intellij.psi.*;
@@ -11,7 +11,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class JvmPsiTypeConverterImpl extends JvmPsiTypeConverter implements CustomReferenceConverter<PsiType> {
+public final class JvmPsiTypeConverterImpl extends JvmPsiTypeConverter implements CustomReferenceConverter<PsiType> {
 
   private static final BidirectionalMap<PsiType, Character> ourPrimitiveTypes = new BidirectionalMap<>();
 

java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaInheritedMembersNodeProvider.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.structureView.impl.java;
 
 import com.intellij.ide.util.InheritedMembersNodeProvider;
@@ -12,7 +12,7 @@
 /**
  * @author Konstantin Bulenkov
  */
-public class JavaInheritedMembersNodeProvider extends InheritedMembersNodeProvider {
+public final class JavaInheritedMembersNodeProvider extends InheritedMembersNodeProvider {
   @Override
   public @NotNull Collection<TreeElement> provideNodes(@NotNull TreeElement node) {
     if (!(node instanceof JavaClassTreeElement classNode)) return Collections.emptyList();

java/java-tests/testSrc/com/intellij/openapi/command/undo/UndoTestCase.java

@@ -1,4 +1,4 @@
-// Copyright 2000-2020 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.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.command.undo;
 
 import com.intellij.codeInsight.JavaCodeInsightTestCase;
@@ -16,7 +16,6 @@
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
-import com.intellij.openapi.fileEditor.impl.CurrentEditorProvider;
 import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
 import com.intellij.openapi.util.ThrowableComputable;
 import com.intellij.openapi.vfs.VirtualFile;

java/jsp-base-openapi/src/com/intellij/openapi/editor/JspHighlighterColors.java

@@ -1,9 +1,8 @@
-// Copyright 2000-2021 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.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.openapi.editor;
 
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 
-
 public final class JspHighlighterColors {
   private JspHighlighterColors() { }