IJPL-212791 IJ-MR-179029 Refactor code visibility modifiers

develar · intellij-monorepo-bot · commit dd21c53b1938 · 2025-10-18T09:39:49.000Z
Add appropriate visibility modifiers (private, internal, final) to classes and constants

GitOrigin-RevId: 9ce78688b9a8c0280b63b33c38ea4d40c68aba79
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpDialog.kt b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpDialog.kt
@@ -41,7 +41,7 @@ import javax.swing.JLabel
 import javax.swing.JList
 import javax.swing.border.CompoundBorder
 
-class RegExpDialog(val project: Project?, val editConfiguration: Boolean, defaultPattern: InspectionPattern? = null) : DialogWrapper(project, true) {
+internal class RegExpDialog(val project: Project?, val editConfiguration: Boolean, defaultPattern: InspectionPattern? = null) : DialogWrapper(project, true) {
   private var searchContext: FindModel.SearchContext = FindModel.SearchContext.ANY
   private var flags: Int = RegExpFlag.UNICODE_CASE.id
   private var replace: Boolean = false
diff --git a/images/src/org/intellij/images/fileTypes/impl/SvgParserDefinition.kt b/images/src/org/intellij/images/fileTypes/impl/SvgParserDefinition.kt
@@ -8,8 +8,7 @@ import com.intellij.psi.impl.source.xml.XmlFileImpl
 import com.intellij.psi.tree.IFileElementType
 import org.jetbrains.annotations.NotNull
 
-internal class SvgParserDefinition : XMLParserDefinition() {
-
+private class SvgParserDefinition : XMLParserDefinition() {
   override fun getFileNodeType(): IFileElementType = SVG_FILE
 
   override fun createFile(viewProvider: @NotNull FileViewProvider): @NotNull PsiFile = XmlFileImpl(viewProvider, SVG_FILE)
diff --git a/platform/code-style-impl/src/com/intellij/formatting/VirtualFormattingImpl.kt b/platform/code-style-impl/src/com/intellij/formatting/VirtualFormattingImpl.kt
@@ -12,7 +12,6 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.formatter.FormattingDocumentModelImpl
 import org.jetbrains.annotations.ApiStatus
 
-
 private val formattingListenerKey = Key.create<VirtualFormattingListener?>("VIRTUAL_FORMATTING_CHANGE_LISTENER")
 
 var PsiElement.virtualFormattingListener: VirtualFormattingListener?
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/events/FileBasedIndexTreeChangePreprocessor.kt b/platform/lang-impl/src/com/intellij/util/indexing/events/FileBasedIndexTreeChangePreprocessor.kt
@@ -6,10 +6,8 @@ import com.intellij.psi.impl.PsiTreeChangeEventImpl
 import com.intellij.psi.impl.PsiTreeChangePreprocessor
 import com.intellij.util.indexing.FileBasedIndex
 import com.intellij.util.indexing.FileBasedIndexImpl
-import org.jetbrains.annotations.ApiStatus
 
-@ApiStatus.Internal
-class FileBasedIndexTreeChangePreprocessor : PsiTreeChangePreprocessor {
+private class FileBasedIndexTreeChangePreprocessor : PsiTreeChangePreprocessor {
   private val vfsEventsMerger by lazy {
     val fileBasedIndex = FileBasedIndex.getInstance()
     if (fileBasedIndex !is FileBasedIndexImpl) return@lazy null
diff --git a/platform/platform-impl/ui-inspector/src/com/intellij/internal/inspector/UiInspectorImpl.kt b/platform/platform-impl/ui-inspector/src/com/intellij/internal/inspector/UiInspectorImpl.kt
@@ -7,10 +7,8 @@ import com.intellij.pom.Navigatable
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.PsiNavigateUtil
-import org.jetbrains.annotations.ApiStatus
 
-@ApiStatus.Internal
-object UiInspectorImpl {
+internal object UiInspectorImpl {
   @JvmStatic
   fun openClassByFqn(project: Project?, jvmFqn: String, requestFocus: Boolean) {
     val classElement = findClassByFqn(project, jvmFqn) ?: return
diff --git a/platform/polySymbols/backend/src/com/intellij/polySymbols/highlighting/impl/PolySymbolHighlightingAnnotator.kt b/platform/polySymbols/backend/src/com/intellij/polySymbols/highlighting/impl/PolySymbolHighlightingAnnotator.kt
@@ -53,7 +53,7 @@ import java.util.*
 
 private val INSPECTION_TOOL_INFO_CACHE = Key.create<MutableMap<String, InspectionToolInfo>>("polySymbols.inspectionTools")
 
-class PolySymbolHighlightingAnnotator : Annotator {
+private class PolySymbolHighlightingAnnotator : Annotator {
 
   private val symbolReferencesProvider = PsiPolySymbolReferenceProviderImpl()
 
diff --git a/platform/vcs-impl/src/com/intellij/vcs/shelf/ShelfTreeHolder.kt b/platform/vcs-impl/src/com/intellij/vcs/shelf/ShelfTreeHolder.kt
@@ -14,22 +14,15 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode
 import com.intellij.openapi.vcs.changes.ui.ChangesGroupingSupport
 import com.intellij.openapi.vcs.changes.ui.GroupingPolicyFactoryHolder
 import com.intellij.platform.project.asEntity
+import com.intellij.platform.vcs.impl.shared.changes.GroupingUpdatePlaces
+import com.intellij.platform.vcs.impl.shared.changes.PreviewDiffSplitterComponent
+import com.intellij.platform.vcs.impl.shared.rhizome.*
+import com.intellij.platform.vcs.impl.shared.rpc.ChangeListRpc
 import com.intellij.util.ui.tree.TreeUtil
 import com.intellij.vcs.shelf.diff.BackendShelveEditorDiffPreview
 import com.intellij.vcs.shelf.diff.ShelfDiffChangesProvider
 import com.intellij.vcs.shelf.diff.ShelfDiffChangesState
 import com.intellij.vcs.shelf.diff.ShelvedPreviewProcessor
-import com.intellij.platform.vcs.impl.shared.changes.GroupingUpdatePlaces
-import com.intellij.platform.vcs.impl.shared.changes.PreviewDiffSplitterComponent
-import com.intellij.platform.vcs.impl.shared.rhizome.DiffSplitterEntity
-import com.intellij.platform.vcs.impl.shared.rhizome.GroupingItemEntity
-import com.intellij.platform.vcs.impl.shared.rhizome.GroupingItemsEntity
-import com.intellij.platform.vcs.impl.shared.rhizome.NodeEntity
-import com.intellij.platform.vcs.impl.shared.rhizome.SelectShelveChangeEntity
-import com.intellij.platform.vcs.impl.shared.rhizome.ShelfTreeEntity
-import com.intellij.platform.vcs.impl.shared.rhizome.ShelvedChangeListEntity
-import com.intellij.platform.vcs.impl.shared.rhizome.ShelvesTreeRootEntity
-import com.intellij.platform.vcs.impl.shared.rpc.ChangeListRpc
 import com.jetbrains.rhizomedb.entity
 import fleet.kernel.*
 import fleet.kernel.rete.Rete
@@ -38,16 +31,13 @@ import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
-import org.jetbrains.annotations.ApiStatus
 import javax.swing.tree.DefaultTreeModel
-import kotlin.collections.iterator
 
 private const val UPDATE_DEBOUNCE_TIMEOUT = 200L
 
-@ApiStatus.Internal
 @OptIn(FlowPreview::class)
 @Service(Service.Level.PROJECT)
-class ShelfTreeHolder(val project: Project, val cs: CoroutineScope) {
+internal class ShelfTreeHolder(val project: Project, val cs: CoroutineScope) {
 
   private val postUpdateActivities = mutableListOf<suspend () -> Unit>()
   private val updateFlow = MutableSharedFlow<Unit>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReference.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReference.java
@@ -7,9 +7,8 @@
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-public class AntDomFileReference extends FileReference implements AntDomReference{
+public final class AntDomFileReference extends FileReference implements AntDomReference{
 
   private boolean mySkipByAnnotator;
 
@@ -18,7 +17,7 @@ public AntDomFileReference(final AntDomFileReferenceSet set, final TextRange ran
   }
 
   @Override
-  public @Nullable @NlsSafe String getText() {
+  public @NlsSafe @NotNull String getText() {
     final AntDomFileReferenceSet refSet = getFileReferenceSet();
     final String _path = AntStringResolver.computeString(refSet.getAttributeValue(), super.getText());
     final String text = FileUtil.toSystemIndependentName(_path);
@@ -35,7 +34,7 @@ public AntDomFileReference(final AntDomFileReferenceSet set, final TextRange ran
     return AntBundle.message("file.doesnt.exist", getCanonicalRepresentationText());
   }
 
-  public @Nullable String getCanonicalRepresentationText() {
+  public @NotNull String getCanonicalRepresentationText() {
     final String value = getCanonicalText();
     return AntStringResolver.computeString(getFileReferenceSet().getAttributeValue(), value);
   }
diff --git a/plugins/compose/intellij.compose.ide.plugin.resources/src/com/intellij/compose/ide/plugin/resources/ComposeResourcesUsageTypeProvider.kt b/plugins/compose/intellij.compose.ide.plugin.resources/src/com/intellij/compose/ide/plugin/resources/ComposeResourcesUsageTypeProvider.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.psi.KtProperty
 
 private val COMPOSE_RESOURCE_USAGE_TYPE = UsageType { ComposeIdeBundle.message("compose.resources.usage.type") }
 
-class ComposeResourcesUsageTypeProvider : UsageTypeProviderEx {
+private class ComposeResourcesUsageTypeProvider : UsageTypeProviderEx {
   override fun getUsageType(element: PsiElement, targets: Array<out UsageTarget>): UsageType? {
     val isComposeResourceProperty = (element.reference?.resolve() as? KtProperty)?.isComposeResourceProperty
     return if (isComposeResourceProperty == true) COMPOSE_RESOURCE_USAGE_TYPE else null
diff --git a/plugins/editorconfig/backend/src/language/codeinsight/actions/navigation/EditorConfigGotoTargetRendererProvider.kt b/plugins/editorconfig/backend/src/language/codeinsight/actions/navigation/EditorConfigGotoTargetRendererProvider.kt
@@ -10,7 +10,7 @@ import com.intellij.ide.util.PsiElementListCellRenderer
 import com.intellij.psi.PsiElement
 import org.editorconfig.language.util.EditorConfigPresentationUtil
 
-class EditorConfigGotoTargetRendererProvider : GotoTargetRendererProvider {
+private class EditorConfigGotoTargetRendererProvider : GotoTargetRendererProvider {
   override fun getRenderer(element: PsiElement, gotoData: GotoTargetHandler.GotoData): PsiElementListCellRenderer<*>? {
     if (element !is EditorConfigHeader && element !is EditorConfigFlatOptionKey) return null
     return object : PsiElementListCellRenderer<PsiElement?>() {
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExternalSettingsImporter.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExternalSettingsImporter.kt
@@ -29,7 +29,7 @@ import java.nio.file.Files
 import kotlin.io.path.invariantSeparatorsPathString
 import kotlin.io.path.isDirectory
 
-class GradleBeforeRunTaskImporter: BeforeRunTaskImporter {
+private class GradleBeforeRunTaskImporter: BeforeRunTaskImporter {
   override fun process(project: Project,
                        modelsProvider: IdeModifiableModelsProvider,
                        runConfiguration: RunConfiguration,
@@ -169,7 +169,7 @@ class IDEAProjectFilesPostProcessor: ConfigurationHandler {
   class ProjectLayout(val ideaDirPath: String, val modulesMap: Map<String, String>)
 }
 
-class GenerateImlFilesSettings: ConfigurationHandler {
+private class GenerateImlFilesSettings: ConfigurationHandler {
   override fun onSuccessImport(project: Project,
                                projectData: ProjectData?,
                                modelsProvider: IdeModelsProvider,
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineGroovyFieldDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineGroovyFieldDialog.java
@@ -14,10 +14,7 @@
 
 import static org.jetbrains.annotations.Nls.Capitalization.Title;
 
-/**
-* @author Max Medvedev
-*/
-class InlineGroovyFieldDialog extends InlineOptionsDialog {
+final class InlineGroovyFieldDialog extends InlineOptionsDialog {
   private final PsiField myField;
 
   InlineGroovyFieldDialog(Project project, PsiField field, boolean invokedOnReference) {
diff --git a/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/editor/KotlinEnterAfterUnmatchedBraceHandler.kt b/plugins/kotlin/base/code-insight/minimal/src/org/jetbrains/kotlin/idea/editor/KotlinEnterAfterUnmatchedBraceHandler.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.getNextSiblingIgnoringWhitespace
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
-import kotlin.collections.firstOrNull
 
 internal fun getElementAtOffsetIgnoreWhitespaceAfter(file: PsiFile, offset: Int): PsiElement? {
     val element = file.findElementAt(offset - 1)
@@ -26,7 +25,7 @@ internal fun getElementAtOffsetIgnoreWhitespaceAfter(file: PsiFile, offset: Int)
     return element
 }
 
-class KotlinEnterAfterUnmatchedBraceHandler : EnterAfterUnmatchedBraceHandler() {
+private class KotlinEnterAfterUnmatchedBraceHandler : EnterAfterUnmatchedBraceHandler() {
     override fun preprocessEnter(
         file: PsiFile,
         editor: Editor,
diff --git a/plugins/kotlin/features-trainer/src/org/jetbrains/kotlin/training/ifs/KotlinSuggesterSupport.kt b/plugins/kotlin/features-trainer/src/org/jetbrains/kotlin/training/ifs/KotlinSuggesterSupport.kt
@@ -11,7 +11,7 @@ import training.featuresSuggester.SuggesterSupport
 import training.featuresSuggester.getParentByPredicate
 import training.featuresSuggester.getParentOfType
 
-class KotlinSuggesterSupport : SuggesterSupport {
+private class KotlinSuggesterSupport : SuggesterSupport {
     override fun isLoadedSourceFile(file: PsiFile): Boolean {
         return file is KtFile && !file.isCompiled && file.isContentsLoaded
     }
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReplaceBrowser.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/ReplaceBrowser.kt
@@ -9,10 +9,7 @@ import com.intellij.openapi.ui.playback.commands.PlaybackCommandCoroutineAdapter
 import com.intellij.openapi.util.Disposer
 import com.jetbrains.performancePlugin.FakeBrowser
 
-/**
- *
- */
-class ReplaceBrowser(text: String, line: Int) : PerformanceCommandCoroutineAdapter(text, line) {
+internal class ReplaceBrowser(text: String, line: Int) : PerformanceCommandCoroutineAdapter(text, line) {
   companion object {
     const val PREFIX: String = PlaybackCommandCoroutineAdapter.CMD_PREFIX + "replaceBrowser"
     val browser = FakeBrowser()
diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitJpsBuildCommand.kt b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/WaitJpsBuildCommand.kt
@@ -20,7 +20,7 @@ import java.time.temporal.ChronoUnit
  * Example: %waitJpsBuild 4s    - seconds
  * Example: %waitJpsBuild 4m    - minutes
  */
-class WaitJpsBuildCommand(text: String, line: Int) : PerformanceCommandCoroutineAdapter(text, line) {
+internal class WaitJpsBuildCommand(text: String, line: Int) : PerformanceCommandCoroutineAdapter(text, line) {
 
   companion object {
     const val NAME = "waitJpsBuild"
diff --git a/plugins/restructuredtext/src/com/intellij/restructuredtext/lexer/RestFlexLexer.java b/plugins/restructuredtext/src/com/intellij/restructuredtext/lexer/RestFlexLexer.java
@@ -6,10 +6,7 @@
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.restructuredtext.RestTokenTypes;
 
-/**
- * User : catherine
- */
-public class RestFlexLexer extends MergingLexerAdapter {
+public final class RestFlexLexer extends MergingLexerAdapter {
   public static final TokenSet TOKENS_TO_MERGE = TokenSet.create(RestTokenTypes.ITALIC, RestTokenTypes.BOLD, RestTokenTypes.FIXED,
                                                                  RestTokenTypes.LINE, RestTokenTypes.PYTHON_LINE,
                                                                  RestTokenTypes.COMMENT, RestTokenTypes.INLINE_LINE,
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/XPathCharFilter.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/XPathCharFilter.java
@@ -7,7 +7,7 @@
 import org.intellij.lang.xpath.XPathFile;
 import org.jetbrains.annotations.Nullable;
 
-public class XPathCharFilter extends CharFilter {
+public final class XPathCharFilter extends CharFilter {
   @Override
   public @Nullable CharFilter.Result acceptChar(char c, int prefixLength, Lookup lookup) {
     if (c != '.' || !lookup.isCompletion()) {
diff --git a/python/python-sdk/src/com/jetbrains/python/sdk/legacy/PythonSdkUtil.java b/python/python-sdk/src/com/jetbrains/python/sdk/legacy/PythonSdkUtil.java
@@ -39,8 +39,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static com.intellij.ide.plugins.PluginManagerCore.ULTIMATE_PLUGIN_ID;
-
 /**
  * Utility methods for Python {@link Sdk} based on the project model and the file system.
  * <p>
@@ -84,7 +82,7 @@ public static boolean isPythonSdk(@NotNull Sdk sdk, boolean allowRemoteInFreeTie
    * @return PyCharm with Pro mode disabled
    */
   public static boolean isFreeTier() {
-    return PlatformUtils.isPyCharm() && (!PlatformUtils.isDataSpell()) && PluginManagerCore.isDisabled(ULTIMATE_PLUGIN_ID);
+    return PlatformUtils.isPyCharm() && (!PlatformUtils.isDataSpell()) && PluginManagerCore.isDisabled(PluginManagerCore.ULTIMATE_PLUGIN_ID);
   }
 
   public static @Unmodifiable @NotNull List<@NotNull Sdk> getAllSdks() {
diff --git a/python/python-syntax/src/com/jetbrains/python/highlighting/PythonEditorHighlighter.java b/python/python-syntax/src/com/jetbrains/python/highlighting/PythonEditorHighlighter.java
@@ -19,10 +19,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-/**
- * User : catherine
- */
-public class PythonEditorHighlighter extends LexerEditorHighlighter {
+public final class PythonEditorHighlighter extends LexerEditorHighlighter {
 
   public PythonEditorHighlighter(@NotNull EditorColorsScheme scheme, @Nullable Project project, @Nullable VirtualFile file) {
     super(SyntaxHighlighterFactory.getSyntaxHighlighter(file != null ? file.getFileType() : PythonFileType.INSTANCE,
diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/AddHtmlTagOrAttributeToCustomsIntention.java b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/AddHtmlTagOrAttributeToCustomsIntention.java
@@ -14,10 +14,7 @@
 import com.intellij.xml.analysis.XmlAnalysisBundle;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author Maxim.Mossienko
- */
-public class AddHtmlTagOrAttributeToCustomsIntention implements LocalQuickFix {
+public final class AddHtmlTagOrAttributeToCustomsIntention implements LocalQuickFix {
   private final String myName;
   private final @IntentionName String myText;
   private final Key<InspectionProfileEntry> myInspectionKey;
diff --git a/xml/xml-ui-common/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java b/xml/xml-ui-common/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java
@@ -7,6 +7,7 @@
 import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorModificationUtil;
+import com.intellij.openapi.editor.EditorModificationUtilEx;
 import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.editor.highlighter.HighlighterIterator;
 import com.intellij.openapi.fileTypes.FileType;
@@ -131,7 +132,7 @@ else if (tokenType == XmlTokenType.XML_START_TAG_START) {
             element.getPrevSibling() !=null &&
             element.getPrevSibling().getText().equals("<")) {
           // tag is started and there is another text in the end
-          EditorModificationUtil.insertStringAtCaret(editor, "</" + element.getText() + ">", false, 0);
+          EditorModificationUtilEx.insertStringAtCaret(editor, "</" + element.getText() + ">", false, 0);
         }
         return Result.CONTINUE;
       }
