diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java index 648eb10783f0..ee19dca4813b 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java @@ -960,8 +960,8 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement } } - //this made to make possible compare color schemes inside EditorColorManager - //to prevent cyclic init (getDefaultAttributes uses EditorColorManager.getInstance) + // this made to make possible compare color schemes inside EditorColorManager + // to prevent cyclic init (getDefaultAttributes uses EditorColorManager.getInstance) this.setUseDefaults(useDefaults); otherScheme.setUseDefaults(useDefaults); @@ -1022,12 +1022,11 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement sourceScheme.attributesMap.forEach((key, attributes) -> attributesMap.putIfAbsent(key, attributes)); } - public boolean isUseDefaults() { + boolean isUseDefaults() { return useDefaults; } - public void setUseDefaults(boolean useDefaults) { - + private void setUseDefaults(boolean useDefaults) { this.useDefaults = useDefaults; if (parentScheme != null && parentScheme instanceof AbstractColorsScheme abstractColorsScheme) { abstractColorsScheme.setUseDefaults(useDefaults); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt index 8623f166b0ea..9b0d309341f8 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt @@ -343,7 +343,6 @@ class LafManagerImpl(private val coroutineScope: CoroutineScope) : LafManager(), return element } - //IDEA-331405 Hide IntelliJ Light from new UI private fun Element.getThemeNameWithReplacingDeprecated(): String? { val currentTheme = this.getAttributeValue(ATTRIBUTE_THEME_NAME) if (ExperimentalUI.isNewUI() && currentTheme == "JetBrainsLightTheme") { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.kt index 6e64cb25d9a3..079945bc4940 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.kt +++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.kt @@ -493,7 +493,6 @@ class EditorColorsManagerImpl @NonInjectable constructor(schemeManagerFactory: S activity.end() } - //IDEA-331405 Hide IntelliJ Light from new UI private fun hideIntellijLightSchemeIfNeeded(state: State) { if (!ExperimentalUI.isNewUI()) return val themeName = "IntelliJ Light"