IJPL-797 intellij.platform.editor.ex review internal API

GitOrigin-RevId: 599a481e42acc472be0648f7f424e4037057ca66

platform/editor-ui-api/api-dump-unreviewed.txt

@@ -2706,6 +2706,9 @@ f:com.intellij.openapi.fileTypes.FileTypeEditorHighlighterProviders
 - com.intellij.openapi.fileTypes.FileTypeExtension
 - sf:INSTANCE:com.intellij.openapi.fileTypes.FileTypeEditorHighlighterProviders
 - s:getInstance():com.intellij.openapi.fileTypes.FileTypeEditorHighlighterProviders
+f:com.intellij.openapi.fileTypes.LanguageSyntaxHighlighters
+- com.intellij.lang.LanguageExtension
+- s:getInstance():com.intellij.openapi.fileTypes.LanguageSyntaxHighlighters
 c:com.intellij.openapi.fileTypes.PlainSyntaxHighlighter
 - com.intellij.openapi.fileTypes.SyntaxHighlighter
 - <init>():V

platform/editor-ui-api/src/com/intellij/openapi/fileTypes/LanguageSyntaxHighlighters.java

@@ -4,9 +4,11 @@ package com.intellij.openapi.fileTypes;
 import com.intellij.lang.LanguageExtension;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.util.KeyedLazyInstance;
+import org.jetbrains.annotations.ApiStatus;
 
-final class LanguageSyntaxHighlighters extends LanguageExtension<SyntaxHighlighter> {
+public final class LanguageSyntaxHighlighters extends LanguageExtension<SyntaxHighlighter> {
 
+  @ApiStatus.Internal
   public static final ExtensionPointName<KeyedLazyInstance<SyntaxHighlighter>> EP_NAME = ExtensionPointName.create("com.intellij.lang.syntaxHighlighter");
 
   private LanguageSyntaxHighlighters() {

platform/editor-ui-ex/api-dump-unreviewed.txt

@@ -22,9 +22,6 @@ a:com.intellij.codeStyle.AbstractConvertLineSeparatorsAction
 c:com.intellij.ide.todo.TodoConfiguration
 - com.intellij.openapi.components.PersistentStateComponent
 - sf:PROPERTY_CHANGE:com.intellij.util.messages.Topic
-- sf:PROP_MULTILINE:java.lang.String
-- sf:PROP_TODO_FILTERS:java.lang.String
-- sf:PROP_TODO_PATTERNS:java.lang.String
 - <init>():V
 - colorSettingsChanged():V
 - p:getDefaultPatterns():com.intellij.psi.search.TodoPattern[]
@@ -40,11 +37,6 @@ c:com.intellij.ide.todo.TodoConfiguration
 - setMultiLine(Z):V
 - setTodoFilters(com.intellij.ide.todo.TodoFilter[]):V
 - setTodoPatterns(com.intellij.psi.search.TodoPattern[]):V
-f:com.intellij.ide.todo.TodoIndexPatternProvider
-- com.intellij.psi.search.IndexPatternProvider
-- <init>():V
-- getIndexPatterns():com.intellij.psi.search.IndexPattern[]
-- s:getInstance():com.intellij.ide.todo.TodoIndexPatternProvider
 com.intellij.injected.editor.EditorWindow
 - com.intellij.openapi.editor.Editor
 - com.intellij.openapi.util.UserDataHolderEx
@@ -78,9 +70,9 @@ c:com.intellij.injected.editor.MarkupModelWindow
 - removeHighlighter(com.intellij.openapi.editor.markup.RangeHighlighter):V
 - setRangeHighlighterAttributes(com.intellij.openapi.editor.markup.RangeHighlighter,com.intellij.openapi.editor.markup.TextAttributes):V
 a:com.intellij.openapi.editor.colors.impl.AbstractColorsScheme
-- com.intellij.openapi.editor.colors.impl.EditorFontCacheImpl
 - com.intellij.configurationStore.SerializableScheme
 - com.intellij.openapi.editor.colors.EditorColorsScheme
+- com.intellij.openapi.editor.colors.EditorFontCache
 - sf:CURR_VERSION:I
 - sf:INHERITED_ATTRS_MARKER:com.intellij.openapi.editor.markup.TextAttributes
 - sf:INHERITED_COLOR_MARKER:java.awt.Color
@@ -163,17 +155,8 @@ a:com.intellij.openapi.editor.colors.impl.AbstractColorsScheme
 - settingsEqual(java.lang.Object,java.util.function.Predicate,Z,Z):Z
 - writeExternal(org.jdom.Element):V
 - writeScheme():org.jdom.Element
-f:com.intellij.openapi.editor.colors.impl.AppConsoleFontOptions
-- com.intellij.openapi.editor.colors.impl.AppFontOptions
-- <init>():V
-- getFontPreferences():com.intellij.openapi.editor.colors.FontPreferences
-- s:getInstance():com.intellij.openapi.editor.colors.impl.AppConsoleFontOptions
-- isUseEditorFont():Z
-- loadState(com.intellij.openapi.editor.colors.impl.AppConsoleFontOptions$ConsoleFontState):V
-- setUseEditorFont(Z):V
 f:com.intellij.openapi.editor.colors.impl.AppEditorFontOptions
 - com.intellij.openapi.editor.colors.impl.AppFontOptions
-- sf:STORAGE_NAME:java.lang.String
 - <init>():V
 - s:getInstance():com.intellij.openapi.editor.colors.impl.AppEditorFontOptions
 c:com.intellij.openapi.editor.colors.impl.AppEditorFontOptions$PersistentFontPreferences
@@ -238,18 +221,11 @@ c:com.intellij.openapi.editor.colors.impl.EditorColorsSchemeImpl
 - setColor(com.intellij.openapi.editor.colors.ColorKey,java.awt.Color):V
 - setSaveNeeded(Z):V
 - setVisible(Z):V
-c:com.intellij.openapi.editor.colors.impl.EditorFontCacheImpl
-- com.intellij.openapi.editor.colors.EditorFontCache
-- <init>():V
-- s:deriveFontWithLigatures(java.awt.Font,Z):java.awt.Font
-- getFont(com.intellij.openapi.editor.colors.EditorFontType):java.awt.Font
-- p:getFontCacheScheme():com.intellij.openapi.editor.colors.EditorColorsScheme
-- reset():V
 f:com.intellij.openapi.editor.colors.impl.EmptyColorScheme
 - com.intellij.openapi.editor.colors.impl.DefaultColorsScheme
-- sf:INSTANCE:com.intellij.openapi.editor.colors.impl.EmptyColorScheme
-- sf:NAME:java.lang.String
+- s:getEmptyScheme():com.intellij.openapi.editor.colors.impl.EmptyColorScheme
 - getName():java.lang.String
+- s:getSchemeName():java.lang.String
 - hasEditableCopy():Z
 c:com.intellij.openapi.editor.colors.impl.FontPreferencesImpl
 - com.intellij.openapi.editor.colors.ModifiableFontPreferences
@@ -434,48 +410,9 @@ c:com.intellij.openapi.editor.ex.util.ValidatingLexerWrapper
 - getTokenType():com.intellij.psi.tree.IElementType
 - restore(com.intellij.lexer.LexerPosition):V
 - start(java.lang.CharSequence,I,I,I):V
-f:com.intellij.openapi.editor.highlighter.EditorHighlighterFactoryImpl
-- com.intellij.openapi.editor.highlighter.EditorHighlighterFactory
-- <init>():V
-- createEditorHighlighter(com.intellij.openapi.editor.colors.EditorColorsScheme,java.lang.String,com.intellij.openapi.project.Project):com.intellij.openapi.editor.highlighter.EditorHighlighter
-- createEditorHighlighter(com.intellij.openapi.fileTypes.FileType,com.intellij.openapi.editor.colors.EditorColorsScheme,com.intellij.openapi.project.Project):com.intellij.openapi.editor.highlighter.EditorHighlighter
-- createEditorHighlighter(com.intellij.openapi.fileTypes.SyntaxHighlighter,com.intellij.openapi.editor.colors.EditorColorsScheme):com.intellij.openapi.editor.highlighter.EditorHighlighter
-- createEditorHighlighter(com.intellij.openapi.project.Project,com.intellij.openapi.fileTypes.FileType):com.intellij.openapi.editor.highlighter.EditorHighlighter
-- createEditorHighlighter(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile):com.intellij.openapi.editor.highlighter.EditorHighlighter
-- createEditorHighlighter(com.intellij.openapi.project.Project,java.lang.String):com.intellij.openapi.editor.highlighter.EditorHighlighter
-- createEditorHighlighter(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.editor.colors.EditorColorsScheme,com.intellij.openapi.project.Project):com.intellij.openapi.editor.highlighter.EditorHighlighter
 f:com.intellij.openapi.editor.impl.DocumentMarkupModel
 - s:forDocument(com.intellij.openapi.editor.Document,com.intellij.openapi.project.Project,Z):com.intellij.openapi.editor.markup.MarkupModel
 - *s:getExistingMarkupModels(com.intellij.openapi.editor.Document):java.util.List
-f:com.intellij.openapi.editor.impl.DocumentMarkupModelManager
-- <init>(com.intellij.openapi.project.Project):V
-- s:getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.editor.impl.DocumentMarkupModelManager
-- isDisposed():Z
-- registerDocument(com.intellij.openapi.editor.Document):V
-f:com.intellij.openapi.editor.impl.EmptyMarkupModel
-- com.intellij.openapi.editor.ex.MarkupModelEx
-- <init>(com.intellij.openapi.editor.Document):V
-- addLineHighlighter(I,I,com.intellij.openapi.editor.markup.TextAttributes):com.intellij.openapi.editor.markup.RangeHighlighter
-- addLineHighlighter(com.intellij.openapi.editor.colors.TextAttributesKey,I,I):com.intellij.openapi.editor.markup.RangeHighlighter
-- addMarkupModelListener(com.intellij.openapi.Disposable,com.intellij.openapi.editor.impl.event.MarkupModelListener):V
-- addPersistentLineHighlighter(I,I,com.intellij.openapi.editor.markup.TextAttributes):com.intellij.openapi.editor.ex.RangeHighlighterEx
-- addPersistentLineHighlighter(com.intellij.openapi.editor.colors.TextAttributesKey,I,I):com.intellij.openapi.editor.ex.RangeHighlighterEx
-- addRangeHighlighter(I,I,I,com.intellij.openapi.editor.markup.TextAttributes,com.intellij.openapi.editor.markup.HighlighterTargetArea):com.intellij.openapi.editor.markup.RangeHighlighter
-- addRangeHighlighter(com.intellij.openapi.editor.colors.TextAttributesKey,I,I,I,com.intellij.openapi.editor.markup.HighlighterTargetArea):com.intellij.openapi.editor.markup.RangeHighlighter
-- addRangeHighlighterAndChangeAttributes(com.intellij.openapi.editor.colors.TextAttributesKey,I,I,I,com.intellij.openapi.editor.markup.HighlighterTargetArea,Z,com.intellij.util.Consumer):com.intellij.openapi.editor.ex.RangeHighlighterEx
-- changeAttributesInBatch(com.intellij.openapi.editor.ex.RangeHighlighterEx,com.intellij.util.Consumer):V
-- containsHighlighter(com.intellij.openapi.editor.markup.RangeHighlighter):Z
-- dispose():V
-- getAllHighlighters():com.intellij.openapi.editor.markup.RangeHighlighter[]
-- getDocument():com.intellij.openapi.editor.Document
-- getUserData(com.intellij.openapi.util.Key):java.lang.Object
-- overlappingIterator(I,I):com.intellij.openapi.editor.ex.MarkupIterator
-- processRangeHighlightersOutside(I,I,com.intellij.util.Processor):Z
-- processRangeHighlightersOverlappingWith(I,I,com.intellij.util.Processor):Z
-- putUserData(com.intellij.openapi.util.Key,java.lang.Object):V
-- removeAllHighlighters():V
-- removeHighlighter(com.intellij.openapi.editor.markup.RangeHighlighter):V
-- setRangeHighlighterAttributes(com.intellij.openapi.editor.markup.RangeHighlighter,com.intellij.openapi.editor.markup.TextAttributes):V
 f:com.intellij.openapi.editor.impl.EmptySoftWrapModel
 - com.intellij.openapi.editor.SoftWrapModel
 - <init>():V
@@ -488,13 +425,6 @@ f:com.intellij.openapi.editor.impl.EmptySoftWrapModel
 - isSoftWrappingEnabled():Z
 - isVisible(com.intellij.openapi.editor.SoftWrap):Z
 - release():V
-f:com.intellij.openapi.editor.impl.FilteringMarkupIterator
-- com.intellij.openapi.editor.ex.MarkupIterator
-- <init>(com.intellij.openapi.editor.ex.MarkupIterator,java.util.function.Predicate):V
-- dispose():V
-- hasNext():Z
-- next():java.lang.Object
-- peek():java.lang.Object
 c:com.intellij.openapi.editor.impl.FontFamilyDescriptor
 - s:create(java.lang.String,java.lang.String):com.intellij.openapi.editor.impl.FontFamilyDescriptor
 - getFamily():java.lang.String
@@ -525,72 +455,6 @@ c:com.intellij.openapi.editor.impl.FontFamilyService
 - p:isSupportedImpl():Z
 - s:migrateFontSetting(java.lang.String):java.lang.String[]
 - p:migrateFontSettingImpl(java.lang.String):java.lang.String[]
-c:com.intellij.openapi.editor.impl.ImaginaryCaret
-- com.intellij.openapi.util.UserDataHolderBase
-- com.intellij.openapi.editor.Caret
-- <init>(com.intellij.openapi.editor.impl.ImaginaryCaretModel):V
-- clone(Z):com.intellij.openapi.editor.Caret
-- dispose():V
-- getCaretModel():com.intellij.openapi.editor.CaretModel
-- getEditor():com.intellij.openapi.editor.impl.ImaginaryEditor
-- getLeadSelectionOffset():I
-- getLeadSelectionPosition():com.intellij.openapi.editor.VisualPosition
-- getLogicalPosition():com.intellij.openapi.editor.LogicalPosition
-- getOffset():I
-- getSelectedText():java.lang.String
-- getSelectionEnd():I
-- getSelectionEndPosition():com.intellij.openapi.editor.VisualPosition
-- getSelectionStart():I
-- getSelectionStartPosition():com.intellij.openapi.editor.VisualPosition
-- getVisualAttributes():com.intellij.openapi.editor.CaretVisualAttributes
-- getVisualLineEnd():I
-- getVisualLineStart():I
-- getVisualPosition():com.intellij.openapi.editor.VisualPosition
-- hasSelection():Z
-- isAtBidiRunBoundary():Z
-- isAtRtlLocation():Z
-- isUpToDate():Z
-- isValid():Z
-- moveCaretRelatively(I,I,Z,Z):V
-- moveToLogicalPosition(com.intellij.openapi.editor.LogicalPosition):V
-- moveToOffset(I):V
-- moveToOffset(I,Z):V
-- moveToVisualPosition(com.intellij.openapi.editor.VisualPosition):V
-- removeSelection():V
-- selectLineAtCaret():V
-- selectWordAtCaret(Z):V
-- setSelection(I,I):V
-- setSelection(I,I,Z):V
-- setSelection(I,com.intellij.openapi.editor.VisualPosition,I):V
-- setSelection(com.intellij.openapi.editor.VisualPosition,I,com.intellij.openapi.editor.VisualPosition,I):V
-- setSelection(com.intellij.openapi.editor.VisualPosition,I,com.intellij.openapi.editor.VisualPosition,I,Z):V
-- setVisualAttributes(com.intellij.openapi.editor.CaretVisualAttributes):V
-c:com.intellij.openapi.editor.impl.ImaginaryCaretModel
-- com.intellij.openapi.editor.CaretModel
-- <init>(com.intellij.openapi.editor.impl.ImaginaryEditor):V
-- addCaret(com.intellij.openapi.editor.LogicalPosition,Z):com.intellij.openapi.editor.Caret
-- addCaret(com.intellij.openapi.editor.VisualPosition,Z):com.intellij.openapi.editor.Caret
-- addCaretActionListener(com.intellij.openapi.editor.CaretActionListener,com.intellij.openapi.Disposable):V
-- addCaretListener(com.intellij.openapi.editor.event.CaretListener):V
-- getAllCarets():java.util.List
-- getCaretAt(com.intellij.openapi.editor.VisualPosition):com.intellij.openapi.editor.Caret
-- getCaretCount():I
-- getCaretsAndSelections():java.util.List
-- getCurrentCaret():com.intellij.openapi.editor.Caret
-- p:getEditor():com.intellij.openapi.editor.impl.ImaginaryEditor
-- getMaxCaretCount():I
-- getPrimaryCaret():com.intellij.openapi.editor.Caret
-- getTextAttributes():com.intellij.openapi.editor.markup.TextAttributes
-- p:notImplemented():java.lang.RuntimeException
-- removeCaret(com.intellij.openapi.editor.Caret):Z
-- removeCaretListener(com.intellij.openapi.editor.event.CaretListener):V
-- removeSecondaryCarets():V
-- runBatchCaretOperation(java.lang.Runnable):V
-- runForEachCaret(com.intellij.openapi.editor.CaretAction):V
-- runForEachCaret(com.intellij.openapi.editor.CaretAction,Z):V
-- setCaretsAndSelections(java.util.List):V
-- setCaretsAndSelections(java.util.List,Z):V
-- supportsMultipleCarets():Z
 c:com.intellij.openapi.editor.impl.ImaginaryEditor
 - com.intellij.openapi.util.UserDataHolderBase
 - com.intellij.openapi.editor.Editor
@@ -640,36 +504,6 @@ c:com.intellij.openapi.editor.impl.ImaginaryEditor
 - xyToLogicalPosition(java.awt.Point):com.intellij.openapi.editor.LogicalPosition
 - xyToVisualPosition(java.awt.Point):com.intellij.openapi.editor.VisualPosition
 - xyToVisualPosition(java.awt.geom.Point2D):com.intellij.openapi.editor.VisualPosition
-c:com.intellij.openapi.editor.impl.ImaginaryScrollingModel
-- com.intellij.openapi.editor.ScrollingModel
-- <init>(com.intellij.openapi.editor.impl.ImaginaryEditor):V
-- addVisibleAreaListener(com.intellij.openapi.editor.event.VisibleAreaListener):V
-- disableAnimation():V
-- enableAnimation():V
-- p:getEditor():com.intellij.openapi.editor.impl.ImaginaryEditor
-- getHorizontalScrollOffset():I
-- getVerticalScrollOffset():I
-- getVisibleArea():java.awt.Rectangle
-- getVisibleAreaOnScrollingFinished():java.awt.Rectangle
-- removeVisibleAreaListener(com.intellij.openapi.editor.event.VisibleAreaListener):V
-- runActionOnScrollingFinished(java.lang.Runnable):V
-- scroll(I,I):V
-- scrollHorizontally(I):V
-- scrollTo(com.intellij.openapi.editor.LogicalPosition,com.intellij.openapi.editor.ScrollType):V
-- scrollToCaret(com.intellij.openapi.editor.ScrollType):V
-- scrollVertically(I):V
-c:com.intellij.openapi.editor.impl.ImaginarySelectionModel
-- com.intellij.openapi.editor.SelectionModel
-- <init>(com.intellij.openapi.editor.impl.ImaginaryEditor):V
-- addSelectionListener(com.intellij.openapi.editor.event.SelectionListener):V
-- copySelectionToClipboard():V
-- getBlockSelectionEnds():I[]
-- getBlockSelectionStarts():I[]
-- getEditor():com.intellij.openapi.editor.Editor
-- getSelectedText(Z):java.lang.String
-- getTextAttributes():com.intellij.openapi.editor.markup.TextAttributes
-- removeSelectionListener(com.intellij.openapi.editor.event.SelectionListener):V
-- setBlockSelection(com.intellij.openapi.editor.LogicalPosition,com.intellij.openapi.editor.LogicalPosition):V
 c:com.intellij.openapi.editor.impl.MarkupModelImpl
 - com.intellij.openapi.util.UserDataHolderBase
 - com.intellij.openapi.editor.ex.MarkupModelEx
@@ -716,19 +550,3 @@ c:com.intellij.psi.impl.search.LexerEditorHighlighterLexer
 - getTokenType():com.intellij.psi.tree.IElementType
 - resetPosition(I):V
 - start(java.lang.CharSequence,I,I,I):V
-c:com.intellij.psi.impl.search.LightIndexPatternSearch
-- com.intellij.util.QueryFactory
-- sf:SEARCH:com.intellij.psi.impl.search.LightIndexPatternSearch
-- <init>():V
-c:com.intellij.psi.impl.search.PsiTodoSearchHelperImpl
-- com.intellij.psi.search.PsiTodoSearchHelper
-- <init>(com.intellij.openapi.project.Project):V
-- findFilesWithTodoItems():com.intellij.psi.PsiFile[]
-- findTodoItems(com.intellij.psi.PsiFile):com.intellij.psi.search.TodoItem[]
-- findTodoItems(com.intellij.psi.PsiFile,I,I):com.intellij.psi.search.TodoItem[]
-- findTodoItemsLight(com.intellij.psi.PsiFile):com.intellij.psi.search.TodoItem[]
-- findTodoItemsLight(com.intellij.psi.PsiFile,I,I):com.intellij.psi.search.TodoItem[]
-- getTodoItemsCount(com.intellij.psi.PsiFile):I
-- getTodoItemsCount(com.intellij.psi.PsiFile,com.intellij.psi.search.TodoPattern):I
-- processFilesWithTodoItems(com.intellij.util.Processor):Z
-- shouldHighlightInEditor(com.intellij.psi.PsiFile):Z

platform/editor-ui-ex/exposed-private-api.txt

@@ -1 +0,0 @@
-com/intellij/openapi/editor/colors/impl/AppConsoleFontOptions$ConsoleFontState

platform/editor-ui-ex/src/com/intellij/ide/todo/TodoConfiguration.java

@@ -13,6 +13,7 @@ import com.intellij.psi.search.*;
 import com.intellij.util.SmartList;
 import com.intellij.util.messages.Topic;
 import org.jdom.Element;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -27,18 +28,22 @@ public class TodoConfiguration implements PersistentStateComponent<Element> {
   @Topic.ProjectLevel
   public static final Topic<PropertyChangeListener> PROPERTY_CHANGE = new Topic<>("TodoConfiguration changes", PropertyChangeListener.class);
 
+  public static TodoConfiguration getInstance() {
+    return ApplicationManager.getApplication().getService(TodoConfiguration.class);
+  }
+
+  @ApiStatus.Internal public static final @NonNls String PROP_MULTILINE = "multiLine";
+  @ApiStatus.Internal public static final @NonNls String PROP_TODO_PATTERNS = "todoPatterns";
+  @ApiStatus.Internal public static final @NonNls String PROP_TODO_FILTERS = "todoFilters";
+  private                    static final @NonNls String ELEMENT_MULTILINE = "multiLine";
+  private                    static final @NonNls String ELEMENT_PATTERN = "pattern";
+  private                    static final @NonNls String ELEMENT_FILTER = "filter";
+
   private boolean myMultiLine = true;
   private TodoPattern[] myTodoPatterns;
   private TodoFilter[] myTodoFilters;
   private IndexPattern[] myIndexPatterns;
 
-  public static final @NonNls String PROP_MULTILINE = "multiLine";
-  public static final @NonNls String PROP_TODO_PATTERNS = "todoPatterns";
-  public static final @NonNls String PROP_TODO_FILTERS = "todoFilters";
-  private static final @NonNls String ELEMENT_MULTILINE = "multiLine";
-  private static final @NonNls String ELEMENT_PATTERN = "pattern";
-  private static final @NonNls String ELEMENT_FILTER = "filter";
-
   public TodoConfiguration() {
     ApplicationManager.getApplication().getMessageBus().simpleConnect().subscribe(EditorColorsManager.TOPIC, new EditorColorsListener() {
       @Override
@@ -49,10 +54,6 @@ public class TodoConfiguration implements PersistentStateComponent<Element> {
     resetToDefaultTodoPatterns();
   }
 
-  public static TodoConfiguration getInstance() {
-    return ApplicationManager.getApplication().getService(TodoConfiguration.class);
-  }
-
   public void resetToDefaultTodoPatterns() {
     myTodoPatterns = getDefaultPatterns();
     myTodoFilters = new TodoFilter[]{};

platform/editor-ui-ex/src/com/intellij/ide/todo/TodoIndexPatternProvider.java

@@ -3,8 +3,10 @@ package com.intellij.ide.todo;
 
 import com.intellij.psi.search.IndexPattern;
 import com.intellij.psi.search.IndexPatternProvider;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+@ApiStatus.Internal
 public final class TodoIndexPatternProvider implements IndexPatternProvider {
   public static TodoIndexPatternProvider getInstance() {
     return EP_NAME.findExtensionOrFail(TodoIndexPatternProvider.class);

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/ex/DefaultColorSchemesManager.kt

@@ -28,7 +28,7 @@ class DefaultColorSchemesManager {
     }
     catch (e: Exception) {
       thisLogger().error(e)
-      listOf(EmptyColorScheme.INSTANCE)
+      listOf(EmptyColorScheme.getEmptyScheme())
     }
   }
 
@@ -80,7 +80,7 @@ private fun loadState(oldSchemes: List<DefaultColorsScheme>): List<DefaultColors
       schemes.add(newScheme)
     }
   }
-  schemes.add(EmptyColorScheme.INSTANCE)
+  schemes.add(EmptyColorScheme.getEmptyScheme())
   return java.util.List.copyOf(schemes)
 }
 

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java

@@ -107,7 +107,7 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement
     metaInfo.setProperty(META_INFO_IDE, PlatformUtils.getPlatformPrefix());
     metaInfo.setProperty(META_INFO_IDE_VERSION, ApplicationInfo.getInstance().getStrictVersion());
     if (parentScheme != null &&
-        parentScheme != EmptyColorScheme.INSTANCE &&
+        parentScheme != EmptyColorScheme.getEmptyScheme() &&
         !parentScheme.getName().startsWith(Scheme.EDITABLE_COPY_PREFIX)) {
       metaInfo.setProperty(META_INFO_ORIGINAL, parentScheme.getName());
       String pluginId = parentScheme.getMetaProperties().getProperty(META_INFO_PLUGIN_ID);
@@ -343,7 +343,7 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement
     String isDefaultScheme = node.getAttributeValue(DEFAULT_SCHEME_ATTR);
     boolean isDefault = isDefaultScheme != null && Boolean.parseBoolean(isDefaultScheme);
     if (!isDefault) {
-      parentScheme = getDefaultScheme(node.getAttributeValue(PARENT_SCHEME_ATTR, EmptyColorScheme.NAME));
+      parentScheme = getDefaultScheme(node.getAttributeValue(PARENT_SCHEME_ATTR, EmptyColorScheme.getSchemeName()));
     }
 
     metaInfo.clear();
@@ -522,7 +522,7 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement
       JdomKt.addOptionTag(parentNode, FONT_SCALE, String.valueOf(UISettings.getDefFontScale()));
     }
 
-    if (parentScheme != null && parentScheme != EmptyColorScheme.INSTANCE) {
+    if (parentScheme != null && parentScheme != EmptyColorScheme.getEmptyScheme()) {
       parentNode.setAttribute(PARENT_SCHEME_ATTR, parentScheme.getName());
     }
 
@@ -1080,7 +1080,7 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement
     private final String myParentName;
 
     TemporaryParent(@NotNull String parentName) {
-      super(EmptyColorScheme.INSTANCE);
+      super(EmptyColorScheme.getEmptyScheme());
       myParentName = parentName;
     }
 

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AppConsoleFontOptions.java

@@ -8,8 +8,10 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.editor.colors.DelegatingFontPreferences;
 import com.intellij.openapi.editor.colors.FontPreferences;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+@ApiStatus.Internal
 @State(
   name = "ConsoleFont",
   storages = @Storage(value = "console-font.xml", roamingType = RoamingType.DISABLED),

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AppEditorFontOptions.java

@@ -10,6 +10,7 @@ import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.editor.colors.FontPreferences;
 import com.intellij.openapi.editor.impl.FontFamilyService;
 import com.intellij.openapi.util.NlsSafe;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -21,6 +22,7 @@ import java.util.List;
 }, category = SettingsCategory.UI)
 public final class AppEditorFontOptions extends AppFontOptions<AppEditorFontOptions.PersistentFontPreferences> {
 
+  @ApiStatus.Internal
   public static final String STORAGE_NAME = "editor-font.xml";
 
   @Override

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/EditorFontCacheImpl.java

@@ -5,6 +5,7 @@ import com.intellij.ide.ui.UISettings;
 import com.intellij.ide.ui.UISettingsUtils;
 import com.intellij.openapi.editor.colors.*;
 import com.intellij.openapi.editor.impl.FontFamilyService;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -14,6 +15,7 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Objects;
 
+@ApiStatus.Internal
 public class EditorFontCacheImpl extends EditorFontCache {
   private static final Map<TextAttribute, Integer> LIGATURES_ATTRIBUTES = Map.of(TextAttribute.LIGATURES, TextAttribute.LIGATURES_ON);
 

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/EmptyColorScheme.java

@@ -15,8 +15,15 @@ import java.awt.*;
 @SuppressWarnings("UseJBColor")
 public final class EmptyColorScheme extends DefaultColorsScheme {
   private static final TextAttributes DEFAULT_ATTRS = new TextAttributes(Color.GRAY, null, null, EffectType.BOXED, Font.PLAIN);
-  public static final String NAME = "Empty";
-  public static final EmptyColorScheme INSTANCE = new EmptyColorScheme();
+  private static final EmptyColorScheme INSTANCE = new EmptyColorScheme();
+
+  public static @NotNull String getSchemeName() {
+    return "Empty";
+  }
+
+  public static @NotNull EmptyColorScheme getEmptyScheme() {
+    return INSTANCE;
+  }
 
   private EmptyColorScheme() {
     attributesMap.put(HighlighterColors.TEXT.getExternalName(), DEFAULT_ATTRS);
@@ -30,7 +37,7 @@ public final class EmptyColorScheme extends DefaultColorsScheme {
 
   @Override
   public @NotNull String getName() {
-    return NAME;
+    return getSchemeName();
   }
 
   @Override

platform/editor-ui-ex/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.kt

@@ -13,7 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.testFramework.LightVirtualFile
 import com.intellij.util.SlowOperations
 
-class EditorHighlighterFactoryImpl : EditorHighlighterFactory() {
+private class EditorHighlighterFactoryImpl : EditorHighlighterFactory() {
   override fun createEditorHighlighter(highlighter: SyntaxHighlighter?, colors: EditorColorsScheme): EditorHighlighter {
     return LexerEditorHighlighter(highlighter ?: PlainSyntaxHighlighter(), colors)
   }

platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/DocumentMarkupModelManager.java

@@ -10,7 +10,7 @@ import com.intellij.util.containers.WeakList;
 import org.jetbrains.annotations.NotNull;
 
 @Service(Service.Level.PROJECT)
-public final class DocumentMarkupModelManager {
+final class DocumentMarkupModelManager {
   private static final Logger LOG = Logger.getInstance(DocumentMarkupModelManager.class);
 
   private final WeakList<Document> myDocumentSet = new WeakList<>();
@@ -20,7 +20,7 @@ public final class DocumentMarkupModelManager {
     return project.getService(DocumentMarkupModelManager.class);
   }
 
-  public DocumentMarkupModelManager(@NotNull Project project) {
+  DocumentMarkupModelManager(@NotNull Project project) {
     Disposer.register(project, () -> cleanupProjectMarkups(project));
   }
 

platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java

@@ -21,10 +21,10 @@ import org.jetbrains.annotations.Nullable;
 /**
  * This is mock implementation to be used in null-object pattern where necessary.
  */
-public final class EmptyMarkupModel implements MarkupModelEx {
+final class EmptyMarkupModel implements MarkupModelEx {
   private final Document myDocument;
 
-  public EmptyMarkupModel(final Document document) {
+  EmptyMarkupModel(final Document document) {
     myDocument = document;
   }
 

platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/FilteringMarkupIterator.java

@@ -2,11 +2,13 @@
 package com.intellij.openapi.editor.impl;
 
 import com.intellij.openapi.editor.ex.MarkupIterator;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.NoSuchElementException;
 import java.util.function.Predicate;
 
+@ApiStatus.Internal
 public final class FilteringMarkupIterator<T> implements MarkupIterator<T> {
   private final @NotNull MarkupIterator<? extends T> myDelegate;
   private final @NotNull Predicate<? super T> myFilter;

platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/ImaginaryCaret.java

@@ -4,9 +4,11 @@ package com.intellij.openapi.editor.impl;
 import com.intellij.openapi.editor.*;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.UserDataHolderBase;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public class ImaginaryCaret extends UserDataHolderBase implements Caret {
   private final ImaginaryCaretModel myCaretModel;
   private int myStart, myPos, myEnd;

platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/ImaginaryCaretModel.java

@@ -6,12 +6,14 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.*;
 import com.intellij.openapi.editor.event.CaretListener;
 import com.intellij.openapi.editor.markup.TextAttributes;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.List;
 
+@ApiStatus.Internal
 public class ImaginaryCaretModel implements CaretModel {
   private final ImaginaryEditor myEditor;
   private final ImaginaryCaret myCaret;

platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/ImaginaryScrollingModel.java

@@ -5,10 +5,12 @@ import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.editor.ScrollingModel;
 import com.intellij.openapi.editor.event.VisibleAreaListener;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
 
+@ApiStatus.Internal
 public class ImaginaryScrollingModel implements ScrollingModel {
   private final @NotNull ImaginaryEditor myEditor;
 

platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/ImaginarySelectionModel.java

@@ -8,9 +8,11 @@ import com.intellij.openapi.editor.SelectionModel;
 import com.intellij.openapi.editor.event.SelectionListener;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.util.TextRange;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public class ImaginarySelectionModel implements SelectionModel {
   private final ImaginaryEditor myEditor;
   private static final Logger LOG = Logger.getInstance(ImaginarySelectionModel.class);

platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 
-class IndexPatternOccurrenceImpl implements IndexPatternOccurrence {
+final class IndexPatternOccurrenceImpl implements IndexPatternOccurrence {
   private final PsiFile myFile;
   private final int myStartOffset;
   private final int myEndOffset;

platform/editor-ui-ex/src/com/intellij/psi/impl/search/LightIndexPatternSearch.java

@@ -19,10 +19,10 @@ import com.intellij.psi.search.IndexPatternOccurrence;
 import com.intellij.psi.search.searches.IndexPatternSearch;
 import com.intellij.util.QueryFactory;
 
-public class LightIndexPatternSearch extends QueryFactory<IndexPatternOccurrence, IndexPatternSearch.SearchParameters> {
+final class LightIndexPatternSearch extends QueryFactory<IndexPatternOccurrence, IndexPatternSearch.SearchParameters> {
   public static final LightIndexPatternSearch SEARCH = new LightIndexPatternSearch();
 
-  public LightIndexPatternSearch() {
+  LightIndexPatternSearch() {
     registerExecutor(new LightIndexPatternSearcher());
   }
 }

platform/editor-ui-ex/src/com/intellij/psi/impl/search/PsiTodoSearchHelperImpl.java

@@ -11,10 +11,12 @@ import com.intellij.psi.search.searches.IndexPatternSearch;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.CommonProcessors;
 import com.intellij.util.Processor;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
+@ApiStatus.Internal
 public class PsiTodoSearchHelperImpl implements PsiTodoSearchHelper {
 
   private final Project myProject;

platform/editor-ui-ex/src/com/intellij/psi/impl/search/TodoItemCreator.java

@@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * moved from PsiSearchHelperImpl
  */
-class TodoItemCreator {
+final class TodoItemCreator {
   private final TodoPattern[] myTodoPatterns;
 
   TodoItemCreator() {

platform/lang-impl/src/com/intellij/application/options/colors/EditorColorSchemeDropHandler.kt

@@ -71,9 +71,9 @@ private fun importScheme(file: VirtualFile, e: FileDropEvent) {
   val imported = importer.importScheme(DefaultProjectFactory.getInstance().defaultProject, file, colorsManager.globalScheme) { name: String? ->
     val preferredName = name ?: "Unnamed"
     val newName = SchemeNameGenerator.getUniqueName(preferredName) { candidate: String -> names.contains(candidate) }
-    val newScheme = EditorColorsSchemeImpl(EmptyColorScheme.INSTANCE)
+    val newScheme = EditorColorsSchemeImpl(EmptyColorScheme.getEmptyScheme())
     newScheme.name = newName
-    newScheme.setDefaultMetaInfo(EmptyColorScheme.INSTANCE)
+    newScheme.setDefaultMetaInfo(EmptyColorScheme.getEmptyScheme())
     newScheme
   }
 

platform/platform-impl/src/com/intellij/application/options/colors/ColorSchemeActions.java

@@ -81,9 +81,9 @@ public abstract class ColorSchemeActions extends AbstractSchemeActions<EditorCol
                                 String newName = SchemeNameGenerator.getUniqueName(name != null ? name : "Unnamed",
                                                                                    candidate -> getSchemesPanel().getModel()
                                                                                      .containsScheme(candidate, false));
-                                AbstractColorsScheme newScheme = new EditorColorsSchemeImpl(EmptyColorScheme.INSTANCE);
+                                AbstractColorsScheme newScheme = new EditorColorsSchemeImpl(EmptyColorScheme.getEmptyScheme());
                                 newScheme.setName(newName);
-                                newScheme.setDefaultMetaInfo(EmptyColorScheme.INSTANCE);
+                                newScheme.setDefaultMetaInfo(EmptyColorScheme.getEmptyScheme());
                                 return newScheme;
                               });
       if (imported != null) {

plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseColorSchemeImportTest.kt

@@ -26,9 +26,9 @@ class EclipseColorSchemeImportTest : LightPlatformTestCase() {
     val input = VfsUtil.findFile(eclipseTestDataRoot / "import" / "colorSchemes" / "eclipseColorTheme.xml", false)!!
     val importer = EclipseColorSchemeImporter()
     val imported = importer.importScheme(project, input, EditorColorsManager.getInstance().globalScheme) {
-      val scheme = EditorColorsSchemeImpl(EmptyColorScheme.INSTANCE)
+      val scheme = EditorColorsSchemeImpl(EmptyColorScheme.getEmptyScheme())
       scheme.name = "EclipseColorSchemeImportTestScheme"
-      scheme.setDefaultMetaInfo(EmptyColorScheme.INSTANCE)
+      scheme.setDefaultMetaInfo(EmptyColorScheme.getEmptyScheme())
       scheme
     }!!