From 87fd308f5a7fd06597857b488396c4de73408b9e Mon Sep 17 00:00:00 2001 From: "Dmitry.Krasilschikov" Date: Tue, 16 Jun 2020 14:38:20 +0300 Subject: [PATCH] IDEA-CR-63632 IDEA-243010 IJP-778 Reader mode: rename variable by review GitOrigin-RevId: 6df42b9af3445c45d089d8cba16462e1fcb79b30 --- .../actions/ReaderModeFileEditorListener.kt | 4 ++-- .../codeInsight/actions/ReaderModeProvider.kt | 2 +- .../codeInsight/actions/ReaderModeProviders.kt | 15 +++++++-------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeFileEditorListener.kt b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeFileEditorListener.kt index 879f4cfd4306..2d817ddb955c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeFileEditorListener.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeFileEditorListener.kt @@ -19,12 +19,12 @@ class ReaderModeFileEditorListener : FileEditorManagerListener { companion object { private var EP_READER_MODE_PROVIDER = ExtensionPointName("com.intellij.readerModeProvider") - fun applyReaderMode(project: Project, selectedEditor: FileEditor?, alreadyOpenedFilesOnly: Boolean = false) { + fun applyReaderMode(project: Project, selectedEditor: FileEditor?, fileIsOpenAlready: Boolean = false) { if (selectedEditor is PsiAwareTextEditorImpl) { val file = selectedEditor.file if (matchMode(project, file)) { EP_READER_MODE_PROVIDER.extensions().forEach { - it.applyModeChanged(project, selectedEditor.editor, instance(project).enabled, alreadyOpenedFilesOnly) + it.applyModeChanged(project, selectedEditor.editor, instance(project).enabled, fileIsOpenAlready) } } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeProvider.kt b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeProvider.kt index fe1f6a47da31..fd2c1da24904 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeProvider.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeProvider.kt @@ -8,5 +8,5 @@ import com.intellij.openapi.project.Project * Use it to provide an activity that should be applied for editor in Read Mode */ interface ReaderModeProvider { - fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, alreadyOpenedFilesOnly: Boolean) {} + fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, fileIsOpenAlready: Boolean) {} } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeProviders.kt b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeProviders.kt index bee4b3e395f2..7102cdaa8b68 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeProviders.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReaderModeProviders.kt @@ -19,8 +19,7 @@ import com.intellij.xml.breadcrumbs.BreadcrumbsForceShownSettings import com.intellij.xml.breadcrumbs.BreadcrumbsInitializingActivity class BreadcrumbsReaderModeProvider : ReaderModeProvider { - override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, - alreadyOpenedFilesOnly: Boolean) { + override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, fileIsOpenAlready: Boolean) { val showBreadcrumbs = (readerMode && ReaderModeSettings.instance(project).showBreadcrumbs) || EditorSettingsExternalizable.getInstance().isBreadcrumbsShown BreadcrumbsForceShownSettings.setForcedShown(showBreadcrumbs, editor) @@ -29,8 +28,8 @@ class BreadcrumbsReaderModeProvider : ReaderModeProvider { } class HighlightingReaderModeProvider : ReaderModeProvider { - override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, alreadyOpenedFilesOnly: Boolean) { - if (!alreadyOpenedFilesOnly) return + override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, fileIsOpenAlready: Boolean) { + if (!fileIsOpenAlready) return val highlighting = if (readerMode && ReaderModeSettings.instance(project).hideWarnings) FileHighlightingSetting.SKIP_INSPECTION @@ -53,7 +52,7 @@ class ReaderModeHighlightingSettingsProvider : DefaultHighlightingSettingProvide } class LigaturesReaderModeProvider : ReaderModeProvider { - override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, alreadyOpenedFilesOnly: Boolean) { + override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, fileIsOpenAlready: Boolean) { val scheme = editor.colorsScheme val preferences = scheme.fontPreferences scheme.fontPreferences = @@ -67,7 +66,7 @@ class LigaturesReaderModeProvider : ReaderModeProvider { class FontReaderModeProvider : ReaderModeProvider { - override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, alreadyOpenedFilesOnly: Boolean) { + override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, fileIsOpenAlready: Boolean) { if (readerMode) { if (ReaderModeSettings.instance(project).increaseLineSpacing) { setLineSpacing(editor, 1.4f) @@ -86,13 +85,13 @@ class FontReaderModeProvider : ReaderModeProvider { } class DocsRenderingReaderModeProvider : ReaderModeProvider { - override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, alreadyOpenedFilesOnly: Boolean) { + override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, fileIsOpenAlready: Boolean) { DocRenderManager.setDocRenderingEnabled(editor, if (readerMode) ReaderModeSettings.instance(project).showRenderedDocs else null) } } class InlaysReaderModeProvider : ReaderModeProvider { - override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, alreadyOpenedFilesOnly: Boolean) { + override fun applyModeChanged(project: Project, editor: Editor, readerMode: Boolean, fileIsOpenAlready: Boolean) { InlayHintsPassFactory.setHintsEnabled(editor, readerMode && ReaderModeSettings.instance(project).showInlaysHints) } } \ No newline at end of file