MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-797 intellij.platform.editor review internal API

Browse Source 
GitOrigin-RevId: 514591f43e57749b752d8399d08b2cfd79fb34ea
This commit is contained in:
Alexandr Trushev
2024-06-17 22:06:02 +00:00
committed by intellij-monorepo-bot
parent 5b28275172
commit 1e4e505e16
77 changed files with 219 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-structure-view/src/com/intellij/ide/highlighter/JavaClsStructureViewBuilderProvider.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class JavaClsStructureViewBuilderProvider implements StructureViewBuilder
}
if (psiFile != null) {
PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(psiFile.getLanguage());
PsiStructureViewFactory factory = LanguageStructureViewBuilder.getInstance().forLanguage(psiFile.getLanguage());
if (factory != null) {
return factory.getStructureViewBuilder(psiFile);
}
java/java-tests/testSrc/com/intellij/java/editor/JavaEditorTextAttributesTest.java
+2 -2
View File
@@ -157,7 +157,7 @@ public class JavaEditorTextAttributesTest extends LightPlatformTestCase {
TYPE_PARAMETER_NAME_ATTRIBUTES { color: #20999d; font-style: normal; }
""",
dumpDefaultColorScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME));
dumpDefaultColorScheme(EditorColorsScheme.getDefaultSchemeName()));
}
public void testDarculaColorScheme() {
@@ -220,7 +220,7 @@ public class JavaEditorTextAttributesTest extends LightPlatformTestCase {
}
public void testInheritanceFlagCanBeOverwrittenWithDefaultAttributes() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme editorScheme = (EditorColorsScheme)defaultScheme.clone();
TextAttributes localVarAttrs = defaultScheme.getAttributes(JavaHighlightingColors.LOCAL_VARIABLE_ATTRIBUTES);
editorScheme.setAttributes(JavaHighlightingColors.LOCAL_VARIABLE_ATTRIBUTES, localVarAttrs);
java/java-tests/testSrc/com/intellij/java/structureView/JavaStructureViewTest.java
+5 -5
View File
@@ -488,7 +488,7 @@ public class JavaStructureViewTest extends LightJavaStructureViewTestCaseBase {
myFixture.testStructureView(svc -> {
svc.setActionActive(FieldsFilter.ID, true);
svc.setActionActive(Sorter.ALPHA_SORTER_ID, true);
svc.setActionActive(Sorter.getAlphaSorterId(), true);
svc.setActionActive(InheritedMembersNodeProvider.ID, false);
@@ -517,7 +517,7 @@ public class JavaStructureViewTest extends LightJavaStructureViewTestCaseBase {
svc.setActionActive(InheritedMembersNodeProvider.ID, true);
svc.setActionActive(PropertiesGrouper.ID, true);
svc.setActionActive(SuperTypesGrouper.ID, true);
svc.setActionActive(Sorter.ALPHA_SORTER_ID, true);
svc.setActionActive(Sorter.getAlphaSorterId(), true);
JTree tree = svc.getTree();
PlatformTestUtil.waitForPromise(TreeUtil.promiseExpand(tree, 2));
@@ -543,7 +543,7 @@ public class JavaStructureViewTest extends LightJavaStructureViewTestCaseBase {
svc.setActionActive(InheritedMembersNodeProvider.ID, true);
svc.setActionActive(PropertiesGrouper.ID, false);
svc.setActionActive(SuperTypesGrouper.ID, true);
svc.setActionActive(Sorter.ALPHA_SORTER_ID, true);
svc.setActionActive(Sorter.getAlphaSorterId(), true);
JTree tree = svc.getTree();
PlatformTestUtil.expandAll(tree);
@@ -601,7 +601,7 @@ public class JavaStructureViewTest extends LightJavaStructureViewTestCaseBase {
svc.setActionActive(InheritedMembersNodeProvider.ID, true);
svc.setActionActive(PropertiesGrouper.ID, false);
svc.setActionActive(SuperTypesGrouper.ID, true);
svc.setActionActive(Sorter.ALPHA_SORTER_ID, true);
svc.setActionActive(Sorter.getAlphaSorterId(), true);
svc.setActionActive(PublicElementsFilter.ID, true);
JTree tree = svc.getTree();
@@ -652,7 +652,7 @@ public class JavaStructureViewTest extends LightJavaStructureViewTestCaseBase {
svc.setActionActive(InheritedMembersNodeProvider.ID, true);
svc.setActionActive(PropertiesGrouper.ID, false);
svc.setActionActive(SuperTypesGrouper.ID, true);
svc.setActionActive(Sorter.ALPHA_SORTER_ID, true);
svc.setActionActive(Sorter.getAlphaSorterId(), true);
JTree tree = svc.getTree();
PlatformTestUtil.expandAll(tree);
java/java-tests/testSrc/com/intellij/java/structureView/PropertyElementTest.java
+3 -3
View File
@@ -81,7 +81,7 @@ public class PropertyElementTest extends LightJavaStructureViewTestCaseBase {
myFixture.testStructureView(component -> {
component.setActionActive(PropertiesGrouper.ID, true);
component.setActionActive(Sorter.ALPHA_SORTER_ID, true);
component.setActionActive(Sorter.getAlphaSorterId(), true);
PlatformTestUtil.assertTreeEqual(component.getTree(),
"""
@@ -129,7 +129,7 @@ public class PropertyElementTest extends LightJavaStructureViewTestCaseBase {
myFixture.testStructureView(component -> {
component.setActionActive(PropertiesGrouper.ID, true);
component.setActionActive(Sorter.ALPHA_SORTER_ID, true);
component.setActionActive(Sorter.getAlphaSorterId(), true);
JTree tree = component.getTree();
PlatformTestUtil.expandAll(tree);
PlatformTestUtil.assertTreeEqual(tree,
@@ -182,7 +182,7 @@ public class PropertyElementTest extends LightJavaStructureViewTestCaseBase {
myFixture.testStructureView(component -> {
component.setActionActive(PropertiesGrouper.ID, true);
component.setActionActive(Sorter.ALPHA_SORTER_ID, true);
component.setActionActive(Sorter.getAlphaSorterId(), true);
component.setActionActive(InheritedMembersNodeProvider.ID, false);
component.setActionActive(PublicElementsFilter.ID, false);
json/tests/test/com/intellij/json/JsonStructureViewTest.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class JsonStructureViewTest extends JsonTestCase {
private void doTestTreeStructure(@NotNull Consumer<StructureViewModel> consumer) {
myFixture.configureByFile(getTestName(false) + ".json");
final StructureViewBuilder builder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(myFixture.getFile());
final StructureViewBuilder builder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(myFixture.getFile());
assertNotNull(builder);
StructureViewComponent component = null;
try {
platform/diff-impl/src/com/intellij/diff/editor/DiffFileEditorBase.kt
+1 -1
View File
@@ -32,7 +32,7 @@ abstract class DiffFileEditorBase(
init {
Disposer.register(contentDisposable, Disposable {
firePropertyChange(FileEditor.PROP_VALID, true, false)
firePropertyChange(FileEditor.getPropValid(), true, false)
})
}
platform/editor-ui-api/api-dump-unreviewed.txt
+14 -17
View File
@@ -48,7 +48,6 @@ f:com.intellij.ide.highlighter.HighlighterFactory
f:com.intellij.ide.lightEdit.LightEdit
- s:owns(com.intellij.openapi.project.Project):Z
*:com.intellij.ide.lightEdit.LightEditService
- sf:WINDOW_NAME:java.lang.String
- a:closeEditorWindow():Z
- a:createNewDocument(java.nio.file.Path):com.intellij.ide.lightEdit.LightEditorInfo
- a:getEditorManager():com.intellij.ide.lightEdit.LightEditorManager
@@ -56,6 +55,7 @@ f:com.intellij.ide.lightEdit.LightEdit
- a:getProject():com.intellij.openapi.project.Project
- a:getSelectedFile():com.intellij.openapi.vfs.VirtualFile
- a:getSelectedFileEditor():com.intellij.openapi.fileEditor.FileEditor
- s:getWindowName():java.lang.String
- a:isAutosaveMode():Z
- a:isForceOpenInLightEditMode():Z
- a:isLightEditEnabled():Z
@@ -70,7 +70,6 @@ f:com.intellij.ide.lightEdit.LightEdit
- a:showEditorWindow():V
- a:updateFileStatus(java.util.Collection):V
*:com.intellij.ide.lightEdit.LightEditServiceListener
- sf:TOPIC:com.intellij.util.messages.Topic
- lightEditWindowClosed(com.intellij.openapi.project.Project):V
- lightEditWindowOpened(com.intellij.openapi.project.Project):V
*:com.intellij.ide.lightEdit.LightEditTabAttributesProvider
@@ -194,6 +193,7 @@ com.intellij.ide.structureView.StructureView
com.intellij.ide.structureView.StructureViewBuilder
- sf:PROVIDER:com.intellij.ide.structureView.StructureViewBuilderProvider
- a:createStructureView(com.intellij.openapi.fileEditor.FileEditor,com.intellij.openapi.project.Project):com.intellij.ide.structureView.StructureView
- s:getProvider():com.intellij.ide.structureView.StructureViewBuilderProvider
com.intellij.ide.structureView.StructureViewBuilderProvider
- a:getStructureViewBuilder(com.intellij.openapi.fileTypes.FileType,com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.project.Project):com.intellij.ide.structureView.StructureViewBuilder
a:com.intellij.ide.structureView.StructureViewFactory
@@ -330,7 +330,6 @@ f:com.intellij.ide.ui.NotRoamableUiOptions
f:com.intellij.ide.ui.NotRoamableUiSettings
- com.intellij.openapi.components.SerializablePersistentStateComponent
- sf:Companion:com.intellij.ide.ui.NotRoamableUiSettings$Companion
- <init>():V
- f:getEditorAAType():com.intellij.ide.ui.AntialiasingType
- f:getExperimentalSingleStripe():Z
- f:getFontFace():java.lang.String
@@ -577,7 +576,6 @@ f:com.intellij.ide.ui.UISettings$Companion
- f:setupFractionalMetrics(javax.swing.JComponent):V
com.intellij.ide.ui.UISettingsListener
- java.util.EventListener
- sf:TOPIC:com.intellij.util.messages.Topic
- a:uiSettingsChanged(com.intellij.ide.ui.UISettings):V
f:com.intellij.ide.ui.UISettingsState
- com.intellij.openapi.components.BaseState
@@ -1019,8 +1017,8 @@ com.intellij.ide.util.treeView.smartTree.SortableTreeElement
com.intellij.ide.util.treeView.smartTree.Sorter
- com.intellij.ide.util.treeView.smartTree.TreeAction
- sf:ALPHA_SORTER:com.intellij.ide.util.treeView.smartTree.Sorter
- sf:ALPHA_SORTER_ID:java.lang.String
- sf:EMPTY_ARRAY:com.intellij.ide.util.treeView.smartTree.Sorter[]
- s:getAlphaSorterId():java.lang.String
- a:getComparator():java.util.Comparator
- a:isVisible():Z
f:com.intellij.ide.util.treeView.smartTree.SorterUtil
@@ -1050,6 +1048,7 @@ com.intellij.injected.editor.InjectedFileChangesHandlerProvider
f:com.intellij.lang.LanguageStructureViewBuilder
- com.intellij.lang.LanguageExtension
- sf:INSTANCE:com.intellij.lang.LanguageStructureViewBuilder
- s:getInstance():com.intellij.lang.LanguageStructureViewBuilder
- getStructureViewBuilder(com.intellij.psi.PsiFile):com.intellij.ide.structureView.StructureViewBuilder
com.intellij.lang.PsiStructureViewFactory
- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName
@@ -1690,7 +1689,6 @@ com.intellij.openapi.editor.Editor
- a:xyToVisualPosition(java.awt.geom.Point2D):com.intellij.openapi.editor.VisualPosition
- yToVisualLine(I):I
f:com.intellij.openapi.editor.EditorCoreUtil
- <init>():V
- s:createEmptyHighlighter(com.intellij.openapi.project.Project,com.intellij.openapi.editor.Document):com.intellij.openapi.editor.highlighter.EditorHighlighter
- s:inVirtualSpace(com.intellij.openapi.editor.Editor,com.intellij.openapi.editor.LogicalPosition):Z
- s:indentLine(com.intellij.openapi.project.Project,com.intellij.openapi.editor.Editor,I,I,I,Z):I
@@ -1705,6 +1703,7 @@ com.intellij.openapi.editor.EditorCustomElementRenderer
- paint(com.intellij.openapi.editor.Inlay,java.awt.Graphics2D,java.awt.geom.Rectangle2D,com.intellij.openapi.editor.markup.TextAttributes):V
- paint(com.intellij.openapi.editor.Inlay,java.awt.Graphics,java.awt.Rectangle,com.intellij.openapi.editor.markup.TextAttributes):V
a:com.intellij.openapi.editor.EditorFactory
- <init>():V
- a:addEditorFactoryListener(com.intellij.openapi.editor.event.EditorFactoryListener):V
- a:addEditorFactoryListener(com.intellij.openapi.editor.event.EditorFactoryListener,com.intellij.openapi.Disposable):V
- a:createDocument(java.lang.CharSequence):com.intellij.openapi.editor.Document
@@ -2150,7 +2149,7 @@ f:com.intellij.openapi.editor.VisualPosition
- leanRight(Z):com.intellij.openapi.editor.VisualPosition
f:com.intellij.openapi.editor.actions.LanguageWordBoundaryFilter
- com.intellij.lang.LanguageExtension
- sf:INSTANCE:com.intellij.openapi.editor.actions.LanguageWordBoundaryFilter
- s:getInstance():com.intellij.openapi.editor.actions.LanguageWordBoundaryFilter
c:com.intellij.openapi.editor.actions.WordBoundaryFilter
- <init>():V
- isWordBoundary(com.intellij.psi.tree.IElementType,com.intellij.psi.tree.IElementType):Z
@@ -2233,12 +2232,13 @@ com.intellij.openapi.editor.colors.EditorColorsListener
- java.util.EventListener
- a:globalSchemeChange(com.intellij.openapi.editor.colors.EditorColorsScheme):V
a:com.intellij.openapi.editor.colors.EditorColorsManager
- sf:COLOR_SCHEME_FILE_EXTENSION:java.lang.String
- sf:DEFAULT_SCHEME_NAME:java.lang.String
- sf:TOPIC:com.intellij.util.messages.Topic
- a:addColorScheme(com.intellij.openapi.editor.colors.EditorColorsScheme):V
- a:getActiveVisibleScheme():com.intellij.openapi.editor.colors.EditorColorsScheme
- a:getAllSchemes():com.intellij.openapi.editor.colors.EditorColorsScheme[]
- s:getColorSchemeFileExtension():java.lang.String
- s:getDefaultSchemeName():java.lang.String
- a:getGlobalScheme():com.intellij.openapi.editor.colors.EditorColorsScheme
- s:getInstance():com.intellij.openapi.editor.colors.EditorColorsManager
- a:getScheme(java.lang.String):com.intellij.openapi.editor.colors.EditorColorsScheme
@@ -2256,7 +2256,6 @@ com.intellij.openapi.editor.colors.EditorColorsScheme
- com.intellij.openapi.options.Scheme
- com.intellij.openapi.options.SchemeMetaInfo
- java.lang.Cloneable
- sf:DEFAULT_SCHEME_NAME:java.lang.String
- a:clone():java.lang.Object
- getAttributes(com.intellij.openapi.editor.colors.TextAttributesKey,Z):com.intellij.openapi.editor.markup.TextAttributes
- a:getColor(com.intellij.openapi.editor.colors.ColorKey):java.awt.Color
@@ -2267,6 +2266,7 @@ com.intellij.openapi.editor.colors.EditorColorsScheme
- a:getConsoleLineSpacing():F
- a:getDefaultBackground():java.awt.Color
- a:getDefaultForeground():java.awt.Color
- s:getDefaultSchemeName():java.lang.String
- a:getEditorFontName():java.lang.String
- a:getEditorFontSize():I
- getEditorFontSize2D():F
@@ -2332,7 +2332,7 @@ com.intellij.openapi.editor.colors.EditorSchemeAttributeDescriptor
- a:isModified():Z
com.intellij.openapi.editor.colors.EditorSchemeAttributeDescriptorWithPath
- com.intellij.openapi.editor.colors.EditorSchemeAttributeDescriptor
- sf:NAME_SEPARATOR:java.lang.String
- s:getNameSeparator():java.lang.String
c:com.intellij.openapi.editor.colors.FontPreferences
- sf:DEFAULT_FONT_NAME:java.lang.String
- sf:DEFAULT_FONT_SIZE:I
@@ -2496,7 +2496,6 @@ com.intellij.openapi.editor.highlighter.EditorHighlighter
- setText(java.lang.CharSequence):V
a:com.intellij.openapi.editor.highlighter.EditorHighlighterFactory
- sf:Companion:com.intellij.openapi.editor.highlighter.EditorHighlighterFactory$Companion
- <init>():V
- a:createEditorHighlighter(com.intellij.openapi.editor.colors.EditorColorsScheme,java.lang.String,com.intellij.openapi.project.Project):com.intellij.openapi.editor.highlighter.EditorHighlighter
- a:createEditorHighlighter(com.intellij.openapi.fileTypes.FileType,com.intellij.openapi.editor.colors.EditorColorsScheme,com.intellij.openapi.project.Project):com.intellij.openapi.editor.highlighter.EditorHighlighter
- a:createEditorHighlighter(com.intellij.openapi.fileTypes.SyntaxHighlighter,com.intellij.openapi.editor.colors.EditorColorsScheme):com.intellij.openapi.editor.highlighter.EditorHighlighter
@@ -2531,7 +2530,7 @@ com.intellij.openapi.editor.markup.ActiveGutterRenderer
- getAccessibleName():java.lang.String
- getAccessibleTooltipText():java.lang.String
- getTooltipText():java.lang.String
e:com.intellij.openapi.editor.markup.CustomHighlighterOrder
*e:com.intellij.openapi.editor.markup.CustomHighlighterOrder
- java.lang.Enum
- sf:AFTER_BACKGROUND:com.intellij.openapi.editor.markup.CustomHighlighterOrder
- sf:AFTER_TEXT:com.intellij.openapi.editor.markup.CustomHighlighterOrder
@@ -2651,8 +2650,6 @@ com.intellij.openapi.fileEditor.FileEditor
- com.intellij.openapi.Disposable
- com.intellij.openapi.util.UserDataHolder
- sf:EMPTY_ARRAY:com.intellij.openapi.fileEditor.FileEditor[]
- sf:PROP_MODIFIED:java.lang.String
- sf:PROP_VALID:java.lang.String
- a:addPropertyChangeListener(java.beans.PropertyChangeListener):V
- deselectNotify():V
- getBackgroundHighlighter():com.intellij.codeHighlighting.BackgroundEditorHighlighter
@@ -2662,6 +2659,8 @@ com.intellij.openapi.fileEditor.FileEditor
- getFilesToRefresh():java.util.List
- a:getName():java.lang.String
- a:getPreferredFocusedComponent():javax.swing.JComponent
- s:getPropModified():java.lang.String
- s:getPropValid():java.lang.String
- getState(com.intellij.openapi.fileEditor.FileEditorStateLevel):com.intellij.openapi.fileEditor.FileEditorState
- getStructureViewBuilder():com.intellij.ide.structureView.StructureViewBuilder
- getTabActions():com.intellij.openapi.actionSystem.ActionGroup
@@ -2763,6 +2762,7 @@ a:com.intellij.openapi.ide.CopyPasteManager
- a:getAllContents():java.awt.datatransfer.Transferable[]
- a:getContents():java.awt.datatransfer.Transferable
- a:getContents(java.awt.datatransfer.DataFlavor):java.lang.Object
- s:getCutColor():java.awt.Color
- s:getInstance():com.intellij.openapi.ide.CopyPasteManager
- a:isCutElement(java.lang.Object):Z
- a:removeContentChangedListener(com.intellij.openapi.ide.CopyPasteManager$ContentChangedListener):V
@@ -2875,19 +2875,16 @@ com.intellij.openapi.vcs.FileStatus
- a:getId():java.lang.String
- a:getText():java.lang.String
f:com.intellij.openapi.vcs.FileStatusFactory
- <init>():V
- createFileStatus(java.lang.String,java.lang.String):com.intellij.openapi.vcs.FileStatus
- createFileStatus(java.lang.String,java.lang.String,java.awt.Color):com.intellij.openapi.vcs.FileStatus
- createFileStatus(java.lang.String,java.util.function.Supplier,com.intellij.openapi.extensions.PluginId):com.intellij.openapi.vcs.FileStatus
- createFileStatus(java.lang.String,java.util.function.Supplier,java.awt.Color,com.intellij.openapi.extensions.PluginId):com.intellij.openapi.vcs.FileStatus
- s:getInstance():com.intellij.openapi.vcs.FileStatusFactory
com.intellij.openapi.vcs.FileStatusListener
- sf:TOPIC:com.intellij.util.messages.Topic
- fileStatusChanged(com.intellij.openapi.vfs.VirtualFile):V
- fileStatusesChanged():V
a:com.intellij.openapi.vcs.FileStatusManager
- psf:LOG:com.intellij.openapi.diagnostic.Logger
- <init>():V
- addFileStatusListener(com.intellij.openapi.vcs.FileStatusListener,com.intellij.openapi.Disposable):V
- a:fileStatusChanged(com.intellij.openapi.vfs.VirtualFile):V
- a:fileStatusesChanged():V
platform/editor-ui-api/src/com/intellij/ide/lightEdit/LightEditService.java
+7 -4
View File
@@ -15,11 +15,10 @@ import java.util.Collection;
@ApiStatus.Experimental
public interface LightEditService {
String WINDOW_NAME = "LightEdit";
boolean isLightEditEnabled();
boolean isForceOpenInLightEditMode();
static @NotNull String getWindowName() {
return "LightEdit";
}
static LightEditService getInstance() {
return ApplicationManager.getApplication().getService(LightEditService.class);
@@ -77,4 +76,8 @@ public interface LightEditService {
* @return True if Project mode is preferred without a confirmation.
*/
boolean isPreferProjectMode();
boolean isLightEditEnabled();
boolean isForceOpenInLightEditMode();
}
platform/editor-ui-api/src/com/intellij/ide/lightEdit/LightEditServiceListener.java
+4 -2
View File
@@ -8,10 +8,12 @@ import org.jetbrains.annotations.NotNull;
@ApiStatus.Experimental
public interface LightEditServiceListener {
@Topic.AppLevel
Topic<LightEditServiceListener> TOPIC = new Topic<>(LightEditServiceListener.class, Topic.BroadcastDirection.NONE);
default void lightEditWindowOpened(@NotNull Project project) {}
default void lightEditWindowClosed(@NotNull Project project) {}
@ApiStatus.Internal
@Topic.AppLevel
Topic<LightEditServiceListener> TOPIC = new Topic<>(LightEditServiceListener.class, Topic.BroadcastDirection.NONE);
}
platform/editor-ui-api/src/com/intellij/ide/lightEdit/LightEditTabAttributesProvider.java
+3 -4
View File
@@ -10,10 +10,9 @@ import org.jetbrains.annotations.Nullable;
@ApiStatus.Experimental
public interface LightEditTabAttributesProvider {
@ApiStatus.Internal
ExtensionPointName<LightEditTabAttributesProvider> EP_NAME
= ExtensionPointName.create("com.intellij.lightEditTabAttributesProvider");
@Nullable
TextAttributes calcAttributes(@NotNull LightEditorInfo editorInfo);
@ApiStatus.Internal
ExtensionPointName<LightEditTabAttributesProvider> EP_NAME = ExtensionPointName.create("com.intellij.lightEditTabAttributesProvider");
}
platform/editor-ui-api/src/com/intellij/ide/projectView/TreeStructureProvider.java
+3 -3
View File
@@ -19,9 +19,6 @@ import java.util.Collection;
*/
public interface TreeStructureProvider extends PossiblyDumbAware {
@ApiStatus.Internal
ProjectExtensionPointName<TreeStructureProvider> EP = new ProjectExtensionPointName<>("com.intellij.treeStructureProvider");
/**
* Allows modifying the list of children displayed for the specified node in the
* project view.
@@ -54,4 +51,7 @@ public interface TreeStructureProvider extends PossiblyDumbAware {
default @Nullable Object getData(@NotNull Collection<? extends AbstractTreeNode<?>> selected, @NotNull String dataId) {
return null;
}
@ApiStatus.Internal
ProjectExtensionPointName<TreeStructureProvider> EP = new ProjectExtensionPointName<>("com.intellij.treeStructureProvider");
}
platform/editor-ui-api/src/com/intellij/ide/structureView/StructureViewBuilder.java
+13 -5
View File
@@ -24,11 +24,9 @@ import org.jetbrains.annotations.Nullable;
public interface StructureViewBuilder {
@ApiStatus.Internal
ExtensionPointName<KeyedFactoryEPBean> EP_NAME = ExtensionPointName.create("com.intellij.structureViewBuilder");
StructureViewBuilderProvider PROVIDER =
new FileTypeExtensionFactory<>(StructureViewBuilderProvider.class, EP_NAME).get();
static @NotNull StructureViewBuilderProvider getProvider() {
return PROVIDER;
}
/**
* Returns the structure view implementation for the specified file
@@ -41,4 +39,14 @@ public interface StructureViewBuilder {
*/
@NotNull
StructureView createStructureView(@Nullable FileEditor fileEditor, @NotNull Project project);
@ApiStatus.Internal
ExtensionPointName<KeyedFactoryEPBean> EP_NAME = ExtensionPointName.create("com.intellij.structureViewBuilder");
/**
* @deprecated use {@link #getProvider()} instead
*/
@Deprecated
StructureViewBuilderProvider PROVIDER =
new FileTypeExtensionFactory<>(StructureViewBuilderProvider.class, EP_NAME).get();
}
platform/editor-ui-api/src/com/intellij/ide/ui/NotRoamableUiSettings.kt
+2 -1
View File
@@ -7,13 +7,14 @@ import com.intellij.ui.scale.JBUIScale
import com.intellij.util.FontUtil
import com.intellij.util.xmlb.annotations.OptionTag
import com.intellij.util.xmlb.annotations.Property
import org.jetbrains.annotations.ApiStatus.Internal
import java.awt.Font
@State(name = NotRoamableUiSettings.COMPONENT_NAME,
category = SettingsCategory.UI,
exportable = true,
storages = [(Storage(StoragePathMacros.NON_ROAMABLE_FILE, roamingType = RoamingType.DISABLED))])
class NotRoamableUiSettings : SerializablePersistentStateComponent<NotRoamableUiOptions>(NotRoamableUiOptions()) {
class NotRoamableUiSettings @Internal constructor(): SerializablePersistentStateComponent<NotRoamableUiOptions>(NotRoamableUiOptions()) {
private var initialConfigurationLoaded = false
companion object {
platform/editor-ui-api/src/com/intellij/ide/ui/UISettingsListener.java
+4 -2
View File
@@ -2,6 +2,7 @@
package com.intellij.ide.ui;
import com.intellij.util.messages.Topic;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import java.util.EventListener;
@@ -18,8 +19,9 @@ import java.util.EventListener;
@FunctionalInterface
public interface UISettingsListener extends EventListener {
void uiSettingsChanged(@NotNull UISettings uiSettings);
@ApiStatus.Internal
@Topic.AppLevel
Topic<UISettingsListener> TOPIC = new Topic<>(UISettingsListener.class, Topic.BroadcastDirection.TO_DIRECT_CHILDREN);
void uiSettingsChanged(@NotNull UISettings uiSettings);
}
platform/editor-ui-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java
+1 -1
View File
@@ -97,7 +97,7 @@ public abstract class AbstractTreeNode<T> extends PresentableNodeDescriptor<Abst
fgColor = fgColor == null ? status.getColor() : fgColor;
if (valueIsCut()) {
fgColor = CopyPasteManager.CUT_COLOR;
fgColor = CopyPasteManager.getCutColor();
}
if (presentation.getForcedTextForeground() == null) {
platform/editor-ui-api/src/com/intellij/ide/util/treeView/TreeAnchorizer.java
+4 -4
View File
@@ -27,10 +27,6 @@ public class TreeAnchorizer {
return result;
}
@ApiStatus.Internal
protected TreeAnchorizer() {
}
public @NotNull Object createAnchor(@NotNull Object element) {
return element;
}
@@ -48,4 +44,8 @@ public class TreeAnchorizer {
public static @NotNull List<Object> retrieveList(Collection<Object> anchors) {
return ContainerUtil.mapNotNull(anchors, getService()::retrieveElement);
}
@ApiStatus.Internal
protected TreeAnchorizer() {
}
}
platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java
+5 -3
View File
@@ -16,6 +16,10 @@ import java.util.Comparator;
public interface Sorter extends TreeAction {
Sorter[] EMPTY_ARRAY = new Sorter[0];
static @NonNls @NotNull String getAlphaSorterId() {
return "ALPHA_COMPARATOR";
}
/**
* Returns the comparator used for comparing nodes in the tree.
*
@@ -25,8 +29,6 @@ public interface Sorter extends TreeAction {
boolean isVisible();
@NonNls String ALPHA_SORTER_ID = "ALPHA_COMPARATOR";
/**
* The default sorter which sorts the tree nodes alphabetically.
*/
@@ -58,7 +60,7 @@ public interface Sorter extends TreeAction {
@Override
public @NotNull String getName() {
return ALPHA_SORTER_ID;
return getAlphaSorterId();
}
};
}
platform/editor-ui-api/src/com/intellij/lang/LanguageStructureViewBuilder.java
+9
View File
@@ -7,8 +7,17 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public final class LanguageStructureViewBuilder extends LanguageExtension<PsiStructureViewFactory>{
/**
* @deprecated use {@link #getInstance()} instead
*/
@Deprecated
public static final LanguageStructureViewBuilder INSTANCE = new LanguageStructureViewBuilder();
public static LanguageStructureViewBuilder getInstance() {
return INSTANCE;
}
private LanguageStructureViewBuilder() {
super(PsiStructureViewFactory.EP_NAME);
}
platform/editor-ui-api/src/com/intellij/openapi/editor/BlockInlayPriority.java
+3
View File
@@ -1,11 +1,14 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.editor;
import org.jetbrains.annotations.ApiStatus;
/**
* Priorities for different types of 'block' visual elements in editor.
*
* @see InlayModel#addBlockElement(int, boolean, boolean, int, EditorCustomElementRenderer)
*/
@ApiStatus.NonExtendable
public interface BlockInlayPriority {
int DOC_RENDER = -300;
int CODE_AUTHOR = -200;
platform/editor-ui-api/src/com/intellij/openapi/editor/EditorCoreUtil.java
+3
View File
@@ -151,4 +151,7 @@ public final class EditorCoreUtil {
public static boolean inVirtualSpace(@NotNull Editor editor, @NotNull LogicalPosition logicalPosition) {
return !editor.offsetToLogicalPosition(editor.logicalPositionToOffset(logicalPosition)).equals(logicalPosition);
}
private EditorCoreUtil() {
}
}
platform/editor-ui-api/src/com/intellij/openapi/editor/EditorFactory.java
-5
View File
@@ -9,7 +9,6 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.concurrency.annotations.RequiresEdt;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -202,8 +201,4 @@ public abstract class EditorFactory {
*/
@RequiresEdt
public abstract void refreshAllEditors();
@ApiStatus.Internal
protected EditorFactory() {
}
}
platform/editor-ui-api/src/com/intellij/openapi/editor/EditorSettings.java
+2
View File
@@ -3,12 +3,14 @@ package com.intellij.openapi.editor;
import com.intellij.lang.Language;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.function.Supplier;
@ApiStatus.NonExtendable
public interface EditorSettings {
boolean isRightMarginShown();
void setRightMarginShown(boolean val);
platform/editor-ui-api/src/com/intellij/openapi/editor/GutterMarkPreprocessor.java
+3 -3
View File
@@ -25,9 +25,9 @@ import java.util.List;
@FunctionalInterface
public interface GutterMarkPreprocessor {
@ApiStatus.Internal
ExtensionPointName<GutterMarkPreprocessor> EP_NAME = ExtensionPointName.create("com.intellij.gutterMarkPreprocessor");
@NotNull
List<GutterMark> processMarkers(@NotNull List<GutterMark> list);
@ApiStatus.Internal
ExtensionPointName<GutterMarkPreprocessor> EP_NAME = ExtensionPointName.create("com.intellij.gutterMarkPreprocessor");
}
platform/editor-ui-api/src/com/intellij/openapi/editor/actions/LanguageWordBoundaryFilter.java
+6 -1
View File
@@ -4,7 +4,12 @@ package com.intellij.openapi.editor.actions;
import com.intellij.lang.LanguageExtension;
public final class LanguageWordBoundaryFilter extends LanguageExtension<WordBoundaryFilter> {
public static final LanguageWordBoundaryFilter INSTANCE = new LanguageWordBoundaryFilter();
private static final LanguageWordBoundaryFilter INSTANCE = new LanguageWordBoundaryFilter();
public static LanguageWordBoundaryFilter getInstance() {
return INSTANCE;
}
private LanguageWordBoundaryFilter() {
super("com.intellij.wordBoundaryFilter", new WordBoundaryFilter());
platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsManager.java
+12 -5
View File
@@ -5,19 +5,26 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.ui.ColorUtil;
import com.intellij.util.concurrency.annotations.RequiresEdt;
import com.intellij.util.messages.Topic;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.*;
public abstract class EditorColorsManager {
@Topic.AppLevel
public static final Topic<EditorColorsListener> TOPIC = new Topic<>(EditorColorsListener.class, Topic.BroadcastDirection.TO_DIRECT_CHILDREN);
/**
* @deprecated use {@link #getDefaultSchemeName()} instead
*/
@Deprecated
public static final @NonNls String DEFAULT_SCHEME_NAME = "Default";
public static final @NonNls String COLOR_SCHEME_FILE_EXTENSION = ".icls";
public static @NonNls @NotNull String getDefaultSchemeName() {
return DEFAULT_SCHEME_NAME;
}
public static @NonNls @NotNull String getColorSchemeFileExtension() {
return ".icls";
}
public static EditorColorsManager getInstance() {
return ApplicationManager.getApplication().getService(EditorColorsManager.class);
platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java
+4 -1
View File
@@ -15,7 +15,10 @@ import org.jetbrains.annotations.Nullable;
import java.awt.*;
public interface EditorColorsScheme extends Cloneable, TextAttributesScheme, Scheme, SchemeMetaInfo {
@NonNls String DEFAULT_SCHEME_NAME = "Default";
static @NonNls @NotNull String getDefaultSchemeName() {
return EditorColorsManager.getDefaultSchemeName();
}
void setName(String name);
platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsUtil.java
+2 -2
View File
@@ -53,7 +53,7 @@ public final class EditorColorsUtil {
boolean dark1 = background == null ? StartupUiUtil.isUnderDarcula() : ColorUtil.isDark(background);
boolean dark2 = ColorUtil.isDark(globalScheme.getDefaultBackground());
if (dark1 != dark2) {
EditorColorsScheme scheme = EditorColorsManager.getInstance().getScheme(dark1 ? "Darcula" : EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme scheme = EditorColorsManager.getInstance().getScheme(dark1 ? "Darcula" : EditorColorsScheme.getDefaultSchemeName());
if (scheme != null) {
return scheme;
}
@@ -63,7 +63,7 @@ public final class EditorColorsUtil {
public static @NotNull EditorColorsScheme getColorSchemeForPrinting() {
EditorColorsManager colorsManager = EditorColorsManager.getInstance();
return colorsManager.isDarkEditor() ? colorsManager.getScheme(EditorColorsManager.DEFAULT_SCHEME_NAME)
return colorsManager.isDarkEditor() ? colorsManager.getScheme(EditorColorsManager.getDefaultSchemeName())
: colorsManager.getGlobalScheme();
}
platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorSchemeAttributeDescriptorWithPath.java
+6 -1
View File
@@ -15,6 +15,11 @@
*/
package com.intellij.openapi.editor.colors;
import org.jetbrains.annotations.NotNull;
public interface EditorSchemeAttributeDescriptorWithPath extends EditorSchemeAttributeDescriptor {
String NAME_SEPARATOR = "//";
static @NotNull String getNameSeparator() {
return "//";
}
}
platform/editor-ui-api/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactory.kt
+2 -1
View File
@@ -8,8 +8,9 @@ import com.intellij.openapi.fileTypes.FileType
import com.intellij.openapi.fileTypes.SyntaxHighlighter
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.annotations.ApiStatus.Internal
abstract class EditorHighlighterFactory {
abstract class EditorHighlighterFactory @Internal constructor() {
companion object {
@JvmStatic
fun getInstance(): EditorHighlighterFactory = ApplicationManager.getApplication().service<EditorHighlighterFactory>()
platform/editor-ui-api/src/com/intellij/openapi/editor/markup/CustomHighlighterOrder.java
+3
View File
@@ -1,6 +1,9 @@
// 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.openapi.editor.markup;
import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Experimental
public enum CustomHighlighterOrder {
BEFORE_BACKGROUND,
/** Paint over the background (defined by common highlighters) and selection, but before the text */
platform/editor-ui-api/src/com/intellij/openapi/fileEditor/FileEditor.java
+10 -4
View File
@@ -23,16 +23,22 @@ import java.util.List;
* @see TextEditor
*/
public interface FileEditor extends UserDataHolder, Disposable {
FileEditor[] EMPTY_ARRAY = {};
/**
* @see #isModified()
*/
String PROP_MODIFIED = "modified";
static @NotNull String getPropModified() {
return "modified";
}
/**
* @see #isValid()
*/
String PROP_VALID = "valid";
FileEditor[] EMPTY_ARRAY = {};
static @NotNull String getPropValid() {
return "valid";
}
/**
* Returns a component which represents the editor in UI.
platform/editor-ui-api/src/com/intellij/openapi/ide/CopyPasteManager.java
+9
View File
@@ -16,8 +16,17 @@ import java.awt.datatransfer.Transferable;
import java.util.EventListener;
public abstract class CopyPasteManager {
/**
* @deprecated use {@link #getCutColor()} instead
*/
@Deprecated
public static final Color CUT_COLOR = Gray._160;
public static @NotNull Color getCutColor() {
return CUT_COLOR;
}
public static CopyPasteManager getInstance() {
return ApplicationManager.getApplication().getService(CopyPasteManager.class);
}
platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatusFactory.java
+3
View File
@@ -79,4 +79,7 @@ public final class FileStatusFactory {
synchronized void onPluginUnload(@NotNull PluginId pluginId) {
myStatuses.remove(pluginId);
}
private FileStatusFactory() {
}
}
platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatusListener.java
+3
View File
@@ -5,9 +5,12 @@ import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.concurrency.annotations.RequiresEdt;
import com.intellij.util.messages.Topic;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
public interface FileStatusListener {
@ApiStatus.Internal
@Topic.ProjectLevel
Topic<FileStatusListener> TOPIC = new Topic<>(FileStatusListener.class, Topic.BroadcastDirection.NONE, true);
platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatusManager.java
+5
View File
@@ -5,6 +5,7 @@ import com.intellij.openapi.Disposable;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.CalledInAny;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -22,6 +23,10 @@ public abstract class FileStatusManager {
return project.getService(FileStatusManager.class);
}
@ApiStatus.Internal
protected FileStatusManager() {
}
/**
* Returns color that is associated with passed file in vcs subsystem.
* <p>
platform/editor-ui-api/src/com/intellij/ui/tree/DelegatingEdtBgtTreeVisitor.kt
-1
View File
@@ -1,7 +1,6 @@
// 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.ui.tree
import com.intellij.util.ui.EDT
import org.jetbrains.annotations.ApiStatus
import javax.swing.tree.TreePath
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/DefaultColorsScheme.java
+2 -1
View File
@@ -2,6 +2,7 @@
package com.intellij.openapi.editor.colors.impl;
import com.intellij.openapi.editor.colors.ColorKey;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.options.SchemeState;
@@ -86,7 +87,7 @@ public class DefaultColorsScheme extends AbstractColorsScheme {
public Object clone() {
EditorColorsSchemeImpl newScheme = new EditorColorsSchemeImpl(this);
copyTo(newScheme);
newScheme.setName(DEFAULT_SCHEME_NAME);
newScheme.setName(EditorColorsScheme.getDefaultSchemeName());
newScheme.setDefaultMetaInfo(this);
return newScheme;
}
platform/lang-impl/src/com/intellij/codeEditor/printing/TextPainter.java
+1 -1
View File
@@ -120,7 +120,7 @@ final class TextPainter extends BasePainter {
EditorColorsManager colorsManager = EditorColorsManager.getInstance();
myMethodSeparatorColor = colorsManager.isDarkEditor()
? colorsManager.getScheme(EditorColorsManager.DEFAULT_SCHEME_NAME)
? colorsManager.getScheme(EditorColorsManager.getDefaultSchemeName())
.getColor(CodeInsightColors.METHOD_SEPARATORS_COLOR)
: null;
}
platform/lang-impl/src/com/intellij/codeInsight/hint/ShowContainerInfoHandler.java
+1 -1
View File
@@ -32,7 +32,7 @@ public final class ShowContainerInfoHandler implements CodeInsightActionHandler
PsiElement container = getProcessedHint(editor);
StructureViewBuilder builder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file);
StructureViewBuilder builder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(file);
if (builder instanceof TreeBasedStructureViewBuilder) {
StructureViewModel model = ((TreeBasedStructureViewBuilder) builder).createStructureViewModel(editor);
boolean goOneLevelUp = true;
platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java
+1 -1
View File
@@ -32,6 +32,6 @@ public final class ShowContainerInfoAction extends BaseCodeInsightAction{
@Override
protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) {
return LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file) instanceof TreeBasedStructureViewBuilder;
return LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(file) instanceof TreeBasedStructureViewBuilder;
}
}
platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java
+1 -1
View File
@@ -46,7 +46,7 @@ public final class MethodUpDownUtil {
}
private static void addNavigationElements(Collection<? super PsiElement> array, PsiFile element) {
StructureViewBuilder structureViewBuilder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(element);
StructureViewBuilder structureViewBuilder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(element);
if (structureViewBuilder instanceof TreeBasedStructureViewBuilder builder) {
StructureViewModel model = builder.createStructureViewModel(null);
try {
platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java
+1 -1
View File
@@ -38,7 +38,7 @@ public final class MethodUpAction extends BaseCodeInsightAction implements DumbA
static boolean checkValidForFile(final PsiFile file) {
try {
final StructureViewBuilder structureViewBuilder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file);
final StructureViewBuilder structureViewBuilder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(file);
return structureViewBuilder instanceof TreeBasedStructureViewBuilder;
}
catch (IndexNotReadyException e) {
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/ClassSearchEverywhereContributor.java
+1 -1
View File
@@ -174,7 +174,7 @@ public class ClassSearchEverywhereContributor extends AbstractGotoSEContributor
}
public static @Nullable Navigatable findMember(String memberPattern, String fullPattern, PsiElement psiElement, VirtualFile file) {
final PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(psiElement.getLanguage());
final PsiStructureViewFactory factory = LanguageStructureViewBuilder.getInstance().forLanguage(psiElement.getLanguage());
final StructureViewBuilder builder = factory == null ? null : factory.getStructureViewBuilder(psiElement.getContainingFile());
List<FileEditor> editors = FileEditorManager.getInstance(psiElement.getProject()).getEditorList(file);
if (builder == null || editors.isEmpty()) {
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
+1 -1
View File
@@ -1090,7 +1090,7 @@ public final class SearchEverywhereUI extends BigPopupUI implements DataProvider
PsiFile psiFile = psiElement instanceof PsiFile ? (PsiFile)psiElement : null;
if (psiFile == null) return new UsageInfo(psiElement);
StructureViewBuilder structureViewBuilder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(psiFile);
StructureViewBuilder structureViewBuilder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(psiFile);
if (!(structureViewBuilder instanceof TreeBasedStructureViewBuilder)) return new UsageInfo(psiElement);
@NotNull StructureViewModel structureViewModel =
platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java
+1 -1
View File
@@ -275,7 +275,7 @@ public final class Bookmark implements Navigatable, Comparable<Bookmark> {
if (psiFile == null) return presentableUrl;
StructureViewBuilder builder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(psiFile);
StructureViewBuilder builder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(psiFile);
if (builder instanceof TreeBasedStructureViewBuilder) {
StructureViewModel model = ((TreeBasedStructureViewBuilder)builder).createStructureViewModel(null);
Object element;
platform/lang-impl/src/com/intellij/ide/navigationToolbar/StructureAwareNavBarModelExtension.kt
+1 -1
View File
@@ -120,7 +120,7 @@ abstract class StructureAwareNavBarModelExtension : AbstractNavBarModelExtension
}
protected open fun createModel(file: PsiFile, editor: Editor?): @NotNull StructureViewModel? {
val builder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file)
val builder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(file)
return (builder as? TreeBasedStructureViewBuilder)?.createStructureViewModel(editor)
}
platform/lang-impl/src/com/intellij/ide/structureView/impl/TemplateLanguageStructureViewBuilder.java
+1 -1
View File
@@ -144,7 +144,7 @@ public abstract class TemplateLanguageStructureViewBuilder extends TreeBasedStru
PsiFile psi = viewProvider.getPsi(language);
if (psi == null) return null;
if (language == baseLanguage) return createMainBuilder(psi);
PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(language);
PsiStructureViewFactory factory = LanguageStructureViewBuilder.getInstance().forLanguage(language);
return factory == null ? null : factory.getStructureViewBuilder(psi);
}
platform/lang-impl/src/com/intellij/ide/util/treeView/SmartElementDescriptor.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class SmartElementDescriptor extends NodeDescriptor{
}
}
if (CopyPasteManager.getInstance().isCutElement(element)) {
color = CopyPasteManager.CUT_COLOR;
color = CopyPasteManager.getCutColor();
}
boolean changes = !Comparing.equal(icon, getIcon()) || !Comparing.equal(color, myColor);
platform/lang-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java
+1 -1
View File
@@ -44,7 +44,7 @@ public final class ProjectWindowActionGroup extends IdeDependentActionGroup impl
}
private static @NlsActions.ActionText String getProjectDisplayName(Project project) {
if (LightEdit.owns(project)) return LightEditService.WINDOW_NAME;
if (LightEdit.owns(project)) return LightEditService.getWindowName();
String name = ModuleAttachProcessor.getMultiProjectDisplayName(project);
return name != null ? name : project.getName();
}
platform/platform-api/src/com/intellij/ide/ui/laf/UIThemeLookAndFeelInfo.kt
+1 -1
View File
@@ -60,7 +60,7 @@ fun EditorColorsScheme.isDefaultForTheme(theme: UIThemeLookAndFeelInfo?): Boolea
val UIThemeLookAndFeelInfo.defaultSchemeName: String @Internal get() = editorSchemeId ?: defaultNonLaFSchemeName(isDark)
private fun defaultNonLaFSchemeName() = defaultNonLaFSchemeName(StartupUiUtil.isDarkTheme)
@Internal
fun defaultNonLaFSchemeName(dark: Boolean): String = if (dark) "Darcula" else EditorColorsScheme.DEFAULT_SCHEME_NAME
fun defaultNonLaFSchemeName(dark: Boolean): String = if (dark) "Darcula" else EditorColorsScheme.getDefaultSchemeName()
val UIThemeLookAndFeelInfo.isThemeFromPlugin: Boolean @Internal get() {
val pluginClassLoader = providerClassLoader as? PluginAwareClassLoader
platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java
+1 -1
View File
@@ -213,7 +213,7 @@ public final class ColorAndFontDescriptionPanel extends JPanel implements Option
Pair<ColorAndFontDescriptorsProvider, ? extends AbstractKeyDescriptor> baseDescriptor = description.getFallbackKeyDescriptor();
if (baseDescriptor != null) {
String attrName = baseDescriptor.second.getDisplayName();
String attrLabel = attrName.replaceAll(EditorSchemeAttributeDescriptorWithPath.NAME_SEPARATOR, FontUtil.rightArrow(
String attrLabel = attrName.replaceAll(EditorSchemeAttributeDescriptorWithPath.getNameSeparator(), FontUtil.rightArrow(
StartupUiUtil.getLabelFont()));
ColorAndFontDescriptorsProvider settingsPage = baseDescriptor.first;
String tooltipText;
platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
+1 -1
View File
@@ -341,7 +341,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
private void selectDefaultScheme() {
DefaultColorsScheme defaultScheme =
(DefaultColorsScheme)EditorColorsManager.getInstance().getScheme(EditorColorsManager.DEFAULT_SCHEME_NAME);
(DefaultColorsScheme)EditorColorsManager.getInstance().getScheme(EditorColorsManager.getDefaultSchemeName());
selectScheme(defaultScheme.getEditableCopyName());
}
platform/platform-impl/src/com/intellij/application/options/colors/ColorOptionsTree.java
+5 -5
View File
@@ -21,7 +21,7 @@ import javax.swing.tree.*;
import java.awt.event.ActionListener;
import java.util.*;
import static com.intellij.openapi.editor.colors.EditorSchemeAttributeDescriptorWithPath.NAME_SEPARATOR;
import static com.intellij.openapi.editor.colors.EditorSchemeAttributeDescriptorWithPath.getNameSeparator;
public final class ColorOptionsTree extends Tree {
private final String myCategoryName;
@@ -108,7 +108,7 @@ public final class ColorOptionsTree extends Tree {
}
public void selectOptionByName(@NotNull String name) {
String optionName = name.replace(FontUtil.rightArrow(StartupUiUtil.getLabelFont()), NAME_SEPARATOR);
String optionName = name.replace(FontUtil.rightArrow(StartupUiUtil.getLabelFont()), getNameSeparator());
selectPath(findOption(myTreeModel.getRoot(), new DescriptorMatcher() {
@Override
public boolean matches(@NotNull Object data) {
@@ -143,12 +143,12 @@ public final class ColorOptionsTree extends Tree {
if (descriptor instanceof EditorSchemeAttributeDescriptorWithPath) {
String name = descriptor.toString();
List<String> path = new ArrayList<>();
int separatorStart = name.indexOf(NAME_SEPARATOR);
int separatorStart = name.indexOf(getNameSeparator());
int nextChunkStart = 0;
while(separatorStart > 0) {
path.add(name.substring(nextChunkStart, separatorStart));
nextChunkStart = separatorStart + NAME_SEPARATOR.length();
separatorStart = name.indexOf(NAME_SEPARATOR, nextChunkStart);
nextChunkStart = separatorStart + getNameSeparator().length();
separatorStart = name.indexOf(getNameSeparator(), nextChunkStart);
}
if (nextChunkStart < name.length()) {
path.add(name.substring(nextChunkStart));
platform/platform-impl/src/com/intellij/application/options/colors/ColorSchemeExporter.java
+1 -1
View File
@@ -11,6 +11,6 @@ public final class ColorSchemeExporter extends SerializableSchemeExporter {
@Override
public String getExtension() {
return EditorColorsManager.COLOR_SCHEME_FILE_EXTENSION.substring(1);
return EditorColorsManager.getColorSchemeFileExtension().substring(1);
}
}
platform/platform-impl/src/com/intellij/application/options/colors/ColorSchemeImporter.java
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable;
public final class ColorSchemeImporter implements SchemeImporter<EditorColorsScheme> {
private static final String[] FILE_EXTENSIONS =
new String[] {EditorColorsManager.COLOR_SCHEME_FILE_EXTENSION.substring(1), "jar"};
new String[] {EditorColorsManager.getColorSchemeFileExtension().substring(1), "jar"};
@Override
public String @NotNull [] getSourceExtensions() {
platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt
+1 -1
View File
@@ -646,7 +646,7 @@ class LafManagerImpl(private val coroutineScope: CoroutineScope) : LafManager(),
targetScheme = themeName
}
if (!wasUITheme) {
properties.setValue(toSavedEditorThemeKey, current.name, if (dark) EditorColorsScheme.DEFAULT_SCHEME_NAME else DarculaLaf.NAME)
properties.setValue(toSavedEditorThemeKey, current.name, if (dark) EditorColorsScheme.getDefaultSchemeName() else DarculaLaf.NAME)
}
editorColorManager.getScheme(targetScheme)?.let {
editorColorManager.setGlobalScheme(it, processChangeSynchronously = true)
platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
+1 -1
View File
@@ -317,7 +317,7 @@ public final class EditorActionUtil {
@Nullable IElementType rightTokenType) {
return leftTokenType != null &&
rightTokenType != null &&
LanguageWordBoundaryFilter.INSTANCE.forLanguage(rightTokenType.getLanguage())
LanguageWordBoundaryFilter.getInstance().forLanguage(rightTokenType.getLanguage())
.isWordBoundary(leftTokenType, rightTokenType);
}
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorSchemesComparator.java
+2 -2
View File
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
import java.util.Comparator;
import static com.intellij.openapi.editor.colors.EditorColorsScheme.DEFAULT_SCHEME_NAME;
import static com.intellij.openapi.editor.colors.EditorColorsScheme.getDefaultSchemeName;
/**
* Defines the order in which editor color schemes are displayed.
@@ -41,7 +41,7 @@ public final class EditorColorSchemesComparator implements Comparator<EditorColo
if (scheme instanceof AbstractColorsScheme) {
EditorColorsScheme original = ((AbstractColorsScheme)scheme).getOriginal();
if (!groupNumberOnly && original instanceof DefaultColorsScheme) {
return DEFAULT_SCHEME_NAME.equals(original.getName()) ? DEFAULT_SCHEME : ONE_OF_DEFAULT_SCHEMES;
return getDefaultSchemeName().equals(original.getName()) ? DEFAULT_SCHEME : ONE_OF_DEFAULT_SCHEMES;
}
if (original != null && original.isReadOnly()) {
if (ExperimentalUI.isNewUI()) {
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.kt
+3 -3
View File
@@ -267,7 +267,7 @@ class EditorColorsManagerImpl @NonInjectable constructor(schemeManagerFactory: S
}
if (scheme == null) {
val schemeName = if (lookAndFeelInfo != null && lookAndFeelInfo.isDark) "Darcula" else DEFAULT_SCHEME_NAME
val schemeName = if (lookAndFeelInfo != null && lookAndFeelInfo.isDark) "Darcula" else getDefaultSchemeName()
val defaultColorSchemeManager = DefaultColorSchemesManager.getInstance()
scheme = defaultColorSchemeManager.getScheme(schemeName)
if (scheme == null) {
@@ -307,7 +307,7 @@ class EditorColorsManagerImpl @NonInjectable constructor(schemeManagerFactory: S
// It is reasonable to fetch attributes from a Default color scheme.
// Otherwise, if we launch IDE and then try to switch from a custom colors scheme (e.g., with a dark background) to the default one.
// The editor will show incorrect highlighting with "traces" of a color scheme which was active during IDE startup.
return getScheme(if (dark) "Darcula" else EditorColorsScheme.DEFAULT_SCHEME_NAME)?.getAttributes(key)
return getScheme(if (dark) "Darcula" else EditorColorsScheme.getDefaultSchemeName())?.getAttributes(key)
}
override fun addColorScheme(scheme: EditorColorsScheme) {
@@ -581,7 +581,7 @@ class EditorColorsManagerImpl @NonInjectable constructor(schemeManagerFactory: S
}
override val schemeExtension: @NonNls String
get() = COLOR_SCHEME_FILE_EXTENSION
get() = getColorSchemeFileExtension()
override fun isSchemeEqualToBundled(scheme: EditorColorsSchemeImpl): Boolean {
if (!scheme.getName().startsWith(Scheme.EDITABLE_COPY_PREFIX)) {
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.kt
+2 -2
View File
@@ -1828,12 +1828,12 @@ open class FileEditorManagerImpl(
}
val propertyName = e.propertyName
if (FileEditor.PROP_MODIFIED == propertyName) {
if (FileEditor.getPropModified() == propertyName) {
getComposite(e.source as FileEditor)?.let {
updateFileIcon(it.file)
}
}
else if (FileEditor.PROP_VALID == propertyName) {
else if (FileEditor.getPropValid() == propertyName) {
if (e.newValue == false) {
closeFileEditor(e.source as FileEditor)
}
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.kt
+2 -2
View File
@@ -158,7 +158,7 @@ open class TextEditorComponent(
fun updateModifiedProperty(textEditor: TextEditorImpl) {
val oldModified = isModified
isModified = isModifiedImpl
textEditor.firePropertyChange(FileEditor.PROP_MODIFIED, oldModified, isModified)
textEditor.firePropertyChange(FileEditor.getPropModified(), oldModified, isModified)
}
/**
@@ -179,7 +179,7 @@ open class TextEditorComponent(
private fun updateValidProperty(textEditor: TextEditorImpl) {
val oldValid = isValid
isValid = isEditorValidImpl
textEditor.firePropertyChange(FileEditor.PROP_VALID, oldValid, isValid)
textEditor.firePropertyChange(FileEditor.getPropValid(), oldValid, isValid)
}
override fun uiDataSnapshot(sink: DataSink) {
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorImpl.kt
+1 -1
View File
@@ -189,7 +189,7 @@ open class TextEditorImpl @Internal constructor(
override fun getStructureViewBuilder(): StructureViewBuilder? {
val file = FileDocumentManager.getInstance().getFile(component.editor.document)?.takeIf { it.isValid } ?: return null
return StructureViewBuilder.PROVIDER.getStructureViewBuilder(file.fileType, file, project)
return StructureViewBuilder.getProvider().getStructureViewBuilder(file.fileType, file, project)
}
override fun canNavigateTo(navigatable: Navigatable): Boolean {
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.kt
+1 -1
View File
@@ -233,7 +233,7 @@ open class TextEditorProvider : DefaultPlatformFileEditorProvider, TextBasedFile
}
override fun getStructureViewBuilder(project: Project, file: VirtualFile): StructureViewBuilder? {
return StructureViewBuilder.PROVIDER.getStructureViewBuilder(file.fileType, file, project)
return StructureViewBuilder.getProvider().getStructureViewBuilder(file.fileType, file, project)
}
protected open inner class EditorWrapper(private val editor: Editor) : UserDataHolderBase(), TextEditor {
platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java
+1 -1
View File
@@ -82,7 +82,7 @@ public final class ProjectWindowAction extends ToggleAction implements DumbAware
}
private @Nullable Project findProject() {
if (LightEditService.WINDOW_NAME.equals(myProjectName)) {
if (LightEditService.getWindowName().equals(myProjectName)) {
return LightEditService.getInstance().getProject();
}
final Project[] projects = ProjectManager.getInstance().getOpenProjects();
platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/EditorColorsSchemeImplTest.java
+10 -10
View File
@@ -229,7 +229,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
}
public void testWriteColorWithAlpha() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme scheme = (EditorColorsScheme)defaultScheme.clone();
scheme.setName("test");
scheme.setColor(ColorKey.createColorKey("BASE_COLOR"), new Color(0x80, 0x81, 0x82));
@@ -246,7 +246,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
}
public void testWriteInheritedFromDefault() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme editorColorsScheme = (EditorColorsScheme)defaultScheme.clone();
editorColorsScheme.setName("test");
EditorColorSchemeTestCase.assertXmlOutputEquals(
@@ -284,7 +284,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
}
public void testSaveNoInheritanceAndDefaults() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
TextAttributes declarationAttrs = defaultScheme.getAttributes(DefaultLanguageHighlighterColors.IDENTIFIER).clone();
assertEquals(DefaultLanguageHighlighterColors.IDENTIFIER, DefaultLanguageHighlighterColors.FUNCTION_DECLARATION.getFallbackAttributeKey());
Pair<EditorColorsScheme, TextAttributes> result = doTestWriteRead(DefaultLanguageHighlighterColors.FUNCTION_DECLARATION, declarationAttrs);
@@ -330,7 +330,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
public void testPreventCyclicTextAttributeDependency() {
DefaultLogger.disableStderrDumping(getTestRootDisposable());
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme editorColorsScheme = (EditorColorsScheme)defaultScheme.clone();
editorColorsScheme.setName("test");
TextAttributesKey keyD = TextAttributesKey.createTextAttributesKey("D");
@@ -380,7 +380,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
}
public void testIdea152156() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme parentScheme = (EditorColorsScheme)defaultScheme.clone();
parentScheme.setName("DefaultTest");
AbstractColorsScheme editorColorsScheme = new EditorColorsSchemeImpl(parentScheme);
@@ -407,7 +407,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
}
public void testWriteDefaultSemanticHighlighting() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme editorColorsScheme = (EditorColorsScheme)defaultScheme.clone();
editorColorsScheme.setName("rainbow");
@@ -462,7 +462,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
}
public void testSettingsEqual() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
AbstractColorsScheme editorColorsScheme = (AbstractColorsScheme)defaultScheme.clone();
editorColorsScheme.setName("Test");
editorColorsScheme.setColor(EditorColors.TEARLINE_COLOR, new Color(255, 0, 0));
@@ -669,7 +669,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
}
public void testIdea188308() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme initialScheme = (EditorColorsScheme)defaultScheme.clone();
initialScheme.setLineSpacing(1.2f);
initialScheme.setConsoleLineSpacing(1.0f);
@@ -685,7 +685,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
float currSpacing = appPrefs.getLineSpacing();
try {
appPrefs.setLineSpacing(1.2f);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme initialScheme = (EditorColorsScheme)defaultScheme.clone();
initialScheme.setConsoleLineSpacing(1.0f);
assertFalse(appPrefs.getLineSpacing() == initialScheme.getConsoleLineSpacing());
@@ -704,7 +704,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
}
public void testEa124005() {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme editorColorsScheme = (EditorColorsScheme)defaultScheme.clone();
editorColorsScheme.setColor(EditorColors.LINE_NUMBERS_COLOR, null);
editorColorsScheme.setColor(EditorColors.LINE_NUMBERS_COLOR, new Color(255, 0, 0));
platform/structure-view-impl/src/com/intellij/ide/highlighter/LanguageFileTypeStructureViewBuilderProvider.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class LanguageFileTypeStructureViewBuilderProvider implements StructureVi
final PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
if (psiFile == null) return null;
final PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(psiFile.getLanguage());
final PsiStructureViewFactory factory = LanguageStructureViewBuilder.getInstance().forLanguage(psiFile.getLanguage());
return factory == null ? null : factory.getStructureViewBuilder(psiFile);
}
}
platform/testFramework/src/com/intellij/editor/EditorColorSchemeTestCase.java
+2 -2
View File
@@ -30,7 +30,7 @@ public abstract class EditorColorSchemeTestCase extends LightPlatformTestCase {
Document doc = JavaXmlDocumentKt.createDocumentBuilder().parse(new InputSource(new StringReader(docText)));
Element root = new DOMBuilder().build(doc.getDocumentElement());
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme targetScheme = new EditorColorsSchemeImpl(defaultScheme);
targetScheme.readExternal(root);
@@ -40,7 +40,7 @@ public abstract class EditorColorSchemeTestCase extends LightPlatformTestCase {
@NotNull
protected Pair<EditorColorsScheme, TextAttributes> doTestWriteRead(@NotNull TextAttributesKey key, @NotNull TextAttributes attributes) {
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.getDefaultSchemeName());
EditorColorsScheme sourceScheme = (EditorColorsScheme)defaultScheme.clone();
sourceScheme.setName("test");
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+1 -1
View File
@@ -2130,7 +2130,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
FileEditor fileEditor = FileEditorManager.getInstance(getProject()).getSelectedEditor(myFile);
assertNotNull("editor not opened for " + myFile, myFile);
StructureViewBuilder builder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(getFile());
StructureViewBuilder builder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(getFile());
assertNotNull("no builder for " + myFile, builder);
StructureViewComponent component = null;
plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/colors/EclipseColorSchemeImporter.java
+1 -1
View File
@@ -167,7 +167,7 @@ public class EclipseColorSchemeImporter implements SchemeImporter<EditorColorsSc
private static void setupMissingColors(@NotNull EditorColorsScheme scheme) {
Color background = scheme.getDefaultBackground();
String defaultSchemeName = ColorUtil.isDark(background) ? "Darcula" : EditorColorsScheme.DEFAULT_SCHEME_NAME;
String defaultSchemeName = ColorUtil.isDark(background) ? "Darcula" : EditorColorsScheme.getDefaultSchemeName();
EditorColorsScheme baseScheme = DefaultColorSchemesManager.getInstance().getScheme(defaultSchemeName);
assert baseScheme != null : "Can not find default scheme '" + defaultSchemeName + "'!";
for (TextAttributesKey attributesKey : ATTRIBUTES_TO_COPY) {
plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/file/GitLabMergeRequestTimelineFileEditor.kt
+1 -1
View File
@@ -58,7 +58,7 @@ internal class GitLabMergeRequestTimelineFileEditor(private val project: Project
override fun isValid(): Boolean = !disposed
override fun isDisposed(): Boolean = disposed
override fun dispose() {
propertyChangeSupport.firePropertyChange(FileEditor.PROP_VALID, true, false)
propertyChangeSupport.firePropertyChange(FileEditor.getPropValid(), true, false)
}
override fun addPropertyChangeListener(listener: PropertyChangeListener) =
plugins/java-decompiler/plugin/test/org/jetbrains/java/decompiler/IdeaDecompilerTest.kt
+1 -1
View File
@@ -182,7 +182,7 @@ class IdeaDecompilerTest : LightJavaCodeInsightFixtureTestCase() {
private fun checkStructure(file: VirtualFile, s: String) {
val editor = FileEditorManager.getInstance(project).openFile(file, false)[0]
val builder = StructureViewBuilder.PROVIDER.getStructureViewBuilder(JavaClassFileType.INSTANCE, file, project)!!
val builder = StructureViewBuilder.getProvider().getStructureViewBuilder(JavaClassFileType.INSTANCE, file, project)!!
val svc = builder.createStructureView(editor, project) as StructureViewComponent
Disposer.register(myFixture.testRootDisposable, svc)
svc.setActionActive(JavaAnonymousClassesNodeProvider.ID, true)
plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java
+1 -1
View File
@@ -637,7 +637,7 @@ public final class ResourceBundleEditor extends UserDataHolderBase implements Do
final ResourceBundleFileStructureViewElement root =
(ResourceBundleFileStructureViewElement)myStructureViewComponent.getTreeModel().getRoot();
final Set<String> propertyKeys = ResourceBundleFileStructureViewElement.getPropertiesMap(myResourceBundle, root.isShowOnlyIncomplete()).keySet();
final boolean isAlphaSorted = myStructureViewComponent.isActionActive(Sorter.ALPHA_SORTER_ID);
final boolean isAlphaSorted = myStructureViewComponent.isActionActive(Sorter.getAlphaSorterId());
List<String> keysOrder = isAlphaSorted ? ContainerUtil.sorted(propertyKeys) : new ArrayList<>(propertyKeys);
final String currentKey = selectedProperty.getKey();
plugins/properties/tests/testSrc/com/intellij/lang/properties/PropertiesFileTreeStructureTest.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class PropertiesFileTreeStructureTest extends BasePlatformTestCase {
private void doTest(String classText, String expected) {
myFixture.configureByText("Test.properties", classText);
myFixture.testStructureView(svc -> {
svc.setActionActive(Sorter.ALPHA_SORTER_ID, true);
svc.setActionActive(Sorter.getAlphaSorterId(), true);
svc.setActionActive(GroupByWordPrefixes.ID, true);
svc.setActionActive(PropertiesFileStructureViewModel.KIND_SORTER_ID, true);
JTree tree = svc.getTree();
xml/dom-openapi/src/com/intellij/util/xml/ui/PerspectiveFileEditor.java
+1 -1
View File
@@ -254,7 +254,7 @@ public abstract class PerspectiveFileEditor extends UserDataHolderBase implement
protected boolean checkIsValid() {
if (!myInvalidated && !isValid()) {
myInvalidated = true;
myPropertyChangeSupport.firePropertyChange(FileEditor.PROP_VALID, Boolean.TRUE, Boolean.FALSE);
myPropertyChangeSupport.firePropertyChange(FileEditor.getPropValid(), Boolean.TRUE, Boolean.FALSE);
}
return !myInvalidated;
}
xml/tests/src/com/intellij/projectView/XmlTreeStructureTest.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class XmlTreeStructureTest extends BaseProjectViewTestCase {
XmlFile xmlFile = (XmlFile)getContentDirectory().findFile(fileName);
VirtualFile virtualFile = xmlFile.getVirtualFile();
final StructureViewBuilder structureViewBuilder =
StructureViewBuilder.PROVIDER.getStructureViewBuilder(virtualFile.getFileType(), virtualFile, myProject);
StructureViewBuilder.getProvider().getStructureViewBuilder(virtualFile.getFileType(), virtualFile, myProject);
StructureViewModel viewModel = ((TreeBasedStructureViewBuilder)structureViewBuilder).createStructureViewModel(null);
try {
xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlStructureViewTreeModel.java
+1 -1
View File
@@ -63,7 +63,7 @@ final class HtmlStructureViewTreeModel extends XmlStructureViewTreeModel impleme
@Override
public @NotNull String getName() {
return ALPHA_SORTER_ID;
return Sorter.getAlphaSorterId();
}
};
xml/xml-structure-view-impl/src/com/intellij/lang/xml/XmlStructureViewBuilderFactory.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class XmlStructureViewBuilderFactory implements PsiStructureViewFactory {
@Nullable
private static StructureViewBuilder getStructureViewBuilderForExtensions(@NotNull PsiFile psiFile) {
for (Language language : XMLLanguage.INSTANCE.getLanguageExtensionsForFile(psiFile)) {
PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(language);
PsiStructureViewFactory factory = LanguageStructureViewBuilder.getInstance().forLanguage(language);
if (factory == null) continue;
final StructureViewBuilder builder = factory.getStructureViewBuilder(psiFile);
if (builder != null) {