[Rider] Attempt fix RIDER-116298

The problem was that RiderInitialProjectConfigurator.kt way of setting the default value didn't work properly in RemDev

GitOrigin-RevId: 68fbd70b23d42f72e8f26d81d87776a22c1aae3a
This commit is contained in:
Egor.Skrypnikov
2024-08-26 19:17:03 +02:00
committed by intellij-monorepo-bot
parent c2d8625766
commit 79a8154cf9
4 changed files with 31 additions and 1 deletions

View File

@@ -727,6 +727,16 @@ f:com.intellij.buildfiles.ForcedBuildFileAttribute
- s:belongsToFramework(com.intellij.openapi.vfs.VirtualFile,java.lang.String):Z
- s:forceFileToFramework(com.intellij.openapi.vfs.VirtualFile,java.lang.String,Z):V
- s:getFrameworkIdOfBuildFile(com.intellij.openapi.vfs.VirtualFile):java.lang.String
com.intellij.codeInsight.actions.ReaderModeDefaultsOverride
- sf:Companion:com.intellij.codeInsight.actions.ReaderModeDefaultsOverride$Companion
- s:getInstance():com.intellij.codeInsight.actions.ReaderModeDefaultsOverride
- a:getShowWarningsDefault():Z
f:com.intellij.codeInsight.actions.ReaderModeDefaultsOverride$Companion
- f:getInstance():com.intellij.codeInsight.actions.ReaderModeDefaultsOverride
f:com.intellij.codeInsight.actions.ReaderModeDefaultsOverrideImpl
- com.intellij.codeInsight.actions.ReaderModeDefaultsOverride
- <init>():V
- getShowWarningsDefault():Z
com.intellij.codeInsight.actions.ReaderModeSettings
- com.intellij.openapi.Disposable
- sf:Companion:com.intellij.codeInsight.actions.ReaderModeSettings$Companion

View File

@@ -28,6 +28,20 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.jetbrains.annotations.ApiStatus.Internal
/**
* Might be used for application-wide overriding of [ReaderModeSettings.kt] defaults.
* Useful when some product requires a different default value.
*/
interface ReaderModeDefaultsOverride {
companion object {
@JvmStatic
fun getInstance(): ReaderModeDefaultsOverride = ApplicationManager.getApplication().getService(ReaderModeDefaultsOverride::class.java)
}
val showWarningsDefault: Boolean
}
interface ReaderModeSettings : Disposable {
companion object {
private val EP_READER_MODE_PROVIDER = ExtensionPointName<ReaderModeProvider>("com.intellij.readerModeProvider")

View File

@@ -8,6 +8,10 @@ import com.intellij.openapi.editor.colors.EditorColorsManager
import com.intellij.psi.codeStyle.CodeStyleScheme
import kotlinx.coroutines.CoroutineScope
class ReaderModeDefaultsOverrideImpl : ReaderModeDefaultsOverride {
override val showWarningsDefault = false
}
@State(name = "ReaderModeSettings", storages = [Storage(StoragePathMacros.PRODUCT_WORKSPACE_FILE)], perClient = true)
class ReaderModeSettingsImpl(override val coroutineScope: CoroutineScope) : PersistentStateComponentWithModificationTracker<ReaderModeSettingsImpl.State>,
ReaderModeSettings {
@@ -26,7 +30,7 @@ class ReaderModeSettingsImpl(override val coroutineScope: CoroutineScope) : Pers
@get:ReportValue var increaseLineSpacing: Boolean by property(false)
@get:ReportValue var showRenderedDocs: Boolean by property(true)
@get:ReportValue var showInlayHints: Boolean by property(true)
@get:ReportValue var showWarnings: Boolean by property(false)
@get:ReportValue var showWarnings: Boolean by property(ReaderModeDefaultsOverride.getInstance().showWarningsDefault)
@get:ReportValue var enabled: Boolean by property(Experiments.getInstance().isFeatureEnabled("editor.reader.mode"))
var mode: ReaderMode = ReaderMode.LIBRARIES_AND_READ_ONLY

View File

@@ -162,6 +162,8 @@
<applicationService serviceInterface="com.intellij.openapi.editor.impl.inspector.InspectionsSettingContentService" serviceImplementation="com.intellij.openapi.editor.impl.inspector.InspectionsSettingContentServiceImpl"/>
<applicationService serviceInterface="com.intellij.codeInsight.actions.ReaderModeDefaultsOverride"
serviceImplementation="com.intellij.codeInsight.actions.ReaderModeDefaultsOverrideImpl" />
</extensions>
<!--suppress PluginXmlDynamicPlugin -->