mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[grazie] Refactor ProofreadSettingsPanel and ProofreadConfigurable to align with UI DSL approach
Merge-request: IJ-MR-176321 Merged-by: Ilia Permiashkin <ilia.permiashkin@jetbrains.com> GitOrigin-RevId: 135b807b2730914ffa462a8343f9435c3df31c25
This commit is contained in:
Ilia Permiashkin
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
cf26bc5101
commit
57072eb4f7
+150
-8
@@ -1,17 +1,159 @@
|
||||
package com.intellij.grazie.ide.ui.proofreading
|
||||
|
||||
import com.intellij.grazie.GrazieBundle
|
||||
import com.intellij.grazie.GrazieConfig
|
||||
import com.intellij.openapi.components.service
|
||||
import com.intellij.openapi.options.ConfigurableBase
|
||||
import com.intellij.grazie.ide.ui.components.dsl.msg
|
||||
import com.intellij.grazie.ide.ui.proofreading.component.GrazieLanguagesComponent
|
||||
import com.intellij.grazie.jlanguage.Lang
|
||||
import com.intellij.grazie.remote.GrazieRemote
|
||||
import com.intellij.grazie.remote.GrazieRemote.getLanguagesBasedOnUserAgreement
|
||||
import com.intellij.grazie.remote.LanguageDownloader
|
||||
import com.intellij.ide.DataManager
|
||||
import com.intellij.openapi.application.EDT
|
||||
import com.intellij.openapi.application.ModalityState
|
||||
import com.intellij.openapi.application.asContextElement
|
||||
import com.intellij.openapi.options.BoundSearchableConfigurable
|
||||
import com.intellij.openapi.options.OptionsBundle
|
||||
import com.intellij.openapi.options.ex.Settings
|
||||
import com.intellij.openapi.project.guessCurrentProject
|
||||
import com.intellij.openapi.ui.DialogPanel
|
||||
import com.intellij.profile.codeInspection.ui.ErrorsConfigurable
|
||||
import com.intellij.ui.dsl.builder.*
|
||||
import com.intellij.util.ui.AsyncProcessIcon
|
||||
import com.intellij.util.ui.JBDimension
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
import javax.swing.JLabel
|
||||
|
||||
class ProofreadConfigurable : ConfigurableBase<ProofreadSettingsPanel, GrazieConfig>(
|
||||
"proofread",
|
||||
class ProofreadConfigurable : BoundSearchableConfigurable(
|
||||
OptionsBundle.message("configurable.group.proofread.settings.display.name"),
|
||||
"reference.settings.ide.settings.proofreading"
|
||||
"reference.settings.ide.settings.proofreading",
|
||||
"proofread"
|
||||
) {
|
||||
private val ui by lazy { ProofreadSettingsPanel() }
|
||||
private val languages by lazy { GrazieLanguagesComponent(::download) }
|
||||
private val project by lazy { guessCurrentProject(languages.component) }
|
||||
|
||||
override fun getSettings(): GrazieConfig = service<GrazieConfig>()
|
||||
override fun createUi(): ProofreadSettingsPanel = ui
|
||||
private val downloadingLanguages: MutableSet<Lang> = ConcurrentHashMap.newKeySet()
|
||||
private val downloadLabel: JLabel by lazy {
|
||||
JLabel(msg("grazie.settings.proofreading.languages.download")).apply { isVisible = false }
|
||||
}
|
||||
private val asyncDownloadingIcon: AsyncProcessIcon by lazy {
|
||||
AsyncProcessIcon("Downloading language models").apply { isVisible = false }
|
||||
}
|
||||
|
||||
private val config get() = GrazieConfig.get()
|
||||
|
||||
var autoFix: Boolean
|
||||
get() = config.autoFix
|
||||
set(value) = GrazieConfig.update { it.copy(autoFix = value) }
|
||||
|
||||
private suspend fun download(langs: Collection<Lang>) {
|
||||
withProcessIcon(langs) {
|
||||
LanguageDownloader.startDownloading(it)
|
||||
}
|
||||
languages.updateLinkToDownloadMissingLanguages()
|
||||
}
|
||||
|
||||
override fun createPanel(): DialogPanel {
|
||||
lateinit var result: DialogPanel
|
||||
result = panel {
|
||||
lateinit var lbLanguage: JLabel
|
||||
row {
|
||||
lbLanguage = label(msg("grazie.settings.proofreading.languages.text"))
|
||||
.gap(RightGap.SMALL)
|
||||
.component
|
||||
cell(asyncDownloadingIcon).gap(RightGap.SMALL)
|
||||
cell(downloadLabel)
|
||||
}
|
||||
row {
|
||||
cell(languages.component)
|
||||
.onReset { languages.reset(GrazieConfig.get()) }
|
||||
.onApply { GrazieConfig.update { state -> languages.apply(state) } }
|
||||
.onIsModified { languages.isModified(GrazieConfig.get()) }
|
||||
.applyToComponent {
|
||||
preferredSize = JBDimension(350, 150)
|
||||
putClientProperty(DslComponentProperty.VERTICAL_COMPONENT_GAP, VerticalComponentGap(top = false, bottom = true))
|
||||
lbLanguage.labelFor = this
|
||||
}
|
||||
}
|
||||
row {
|
||||
link(msg("grazie.settings.proofreading.link-to-inspection")) {
|
||||
Settings.KEY.getData(DataManager.getInstance().getDataContext(result))?.let { settings ->
|
||||
settings.find(ErrorsConfigurable::class.java)?.let {
|
||||
settings.select(it).doWhenDone {
|
||||
it.selectInspectionGroup(arrayOf(msg("grazie.group.name")))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
generalSettings()
|
||||
}
|
||||
|
||||
languages.reset(GrazieConfig.get())
|
||||
return result
|
||||
}
|
||||
|
||||
private fun Panel.generalSettings(): Row {
|
||||
return group {
|
||||
row {
|
||||
checkBox(GrazieBundle.message("grazie.settings.auto.apply.fixes.label")).bindSelected(::autoFix)
|
||||
}
|
||||
|
||||
row {
|
||||
@Suppress("DialogTitleCapitalization")
|
||||
val oxfordCb = checkBox(GrazieBundle.message("grazie.settings.use.oxford.spelling.checkbox"))
|
||||
.bindSelected(
|
||||
getter = { config.useOxfordSpelling },
|
||||
setter = { GrazieConfig.update { state -> state.withOxfordSpelling(it) } }
|
||||
)
|
||||
|
||||
fun updateAvailability() {
|
||||
oxfordCb.enabled(Lang.BRITISH_ENGLISH in GrazieConfig.get().availableLanguages)
|
||||
}
|
||||
updateAvailability()
|
||||
GrazieConfig.subscribe(disposable!!) { updateAvailability() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun withProcessIcon(langs: Collection<Lang>, download: suspend (Collection<Lang>) -> Unit) {
|
||||
var failed = false
|
||||
try {
|
||||
if (GrazieRemote.allAvailableLocally(langs)) return
|
||||
val filteredLanguages = withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
|
||||
getLanguagesBasedOnUserAgreement(langs, project)
|
||||
}
|
||||
if (filteredLanguages.isEmpty()) return
|
||||
if (downloadingLanguages.isEmpty()) {
|
||||
downloadingLanguages.addAll(langs)
|
||||
withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
|
||||
downloadLabel.text = msg("grazie.settings.proofreading.languages.download")
|
||||
asyncDownloadingIcon.resume()
|
||||
asyncDownloadingIcon.isVisible = true
|
||||
downloadLabel.isVisible = true
|
||||
}
|
||||
}
|
||||
download(filteredLanguages)
|
||||
}
|
||||
catch (e: Exception) {
|
||||
withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
|
||||
downloadLabel.text = msg("grazie.settings.proofreading.languages.download.failed", langs.joinToString { it.displayName })
|
||||
asyncDownloadingIcon.suspend()
|
||||
}
|
||||
failed = true
|
||||
downloadingLanguages.clear()
|
||||
throw e
|
||||
}
|
||||
finally {
|
||||
downloadingLanguages.removeAll(langs)
|
||||
if (downloadingLanguages.isEmpty() && !failed) {
|
||||
withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
|
||||
asyncDownloadingIcon.isVisible = false
|
||||
downloadLabel.isVisible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-206
@@ -1,206 +0,0 @@
|
||||
package com.intellij.grazie.ide.ui.proofreading
|
||||
|
||||
import com.intellij.grazie.GrazieBundle
|
||||
import com.intellij.grazie.GrazieConfig
|
||||
import com.intellij.grazie.ide.ui.components.dsl.msg
|
||||
import com.intellij.grazie.ide.ui.proofreading.component.GrazieLanguagesComponent
|
||||
import com.intellij.grazie.jlanguage.Lang
|
||||
import com.intellij.grazie.remote.GrazieRemote
|
||||
import com.intellij.grazie.remote.GrazieRemote.getLanguagesBasedOnUserAgreement
|
||||
import com.intellij.grazie.remote.LanguageDownloader
|
||||
import com.intellij.ide.DataManager
|
||||
import com.intellij.openapi.Disposable
|
||||
import com.intellij.openapi.application.EDT
|
||||
import com.intellij.openapi.application.ModalityState
|
||||
import com.intellij.openapi.application.asContextElement
|
||||
import com.intellij.openapi.options.BoundConfigurable
|
||||
import com.intellij.openapi.options.ConfigurableUi
|
||||
import com.intellij.openapi.options.SearchableConfigurable
|
||||
import com.intellij.openapi.options.ex.Settings
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.openapi.project.guessCurrentProject
|
||||
import com.intellij.openapi.ui.DialogPanel
|
||||
import com.intellij.profile.codeInspection.ui.ErrorsConfigurable
|
||||
import com.intellij.ui.dsl.builder.*
|
||||
import com.intellij.util.ui.AsyncProcessIcon
|
||||
import com.intellij.util.ui.JBDimension
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
import javax.swing.JComponent
|
||||
import javax.swing.JLabel
|
||||
import javax.swing.JPanel
|
||||
|
||||
class ProofreadSettingsPanel : BoundConfigurable(
|
||||
GrazieBundle.message("grazie.settings.configurable.name"),
|
||||
null
|
||||
), ConfigurableUi<GrazieConfig>, SearchableConfigurable, Disposable {
|
||||
private val languages = GrazieLanguagesComponent(::download)
|
||||
private val project: Project = guessCurrentProject(languages.component)
|
||||
|
||||
private val downloadingLanguages: MutableSet<Lang> = ConcurrentHashMap.newKeySet()
|
||||
private val downloadLabel: JLabel by lazy {
|
||||
JLabel(msg("grazie.settings.proofreading.languages.download")).apply { isVisible = false }
|
||||
}
|
||||
private val asyncDownloadingIcon: AsyncProcessIcon by lazy {
|
||||
AsyncProcessIcon("Downloading language models").apply { isVisible = false }
|
||||
}
|
||||
|
||||
private val config get() = GrazieConfig.get()
|
||||
|
||||
var autoFix: Boolean
|
||||
get() = config.autoFix
|
||||
set(value) = GrazieConfig.update { it.copy(autoFix = value) }
|
||||
|
||||
private suspend fun download(langs: Collection<Lang>) {
|
||||
withProcessIcon(langs) {
|
||||
LanguageDownloader.startDownloading(it)
|
||||
}
|
||||
languages.updateLinkToDownloadMissingLanguages()
|
||||
}
|
||||
|
||||
override fun reset(settings: GrazieConfig) {
|
||||
super<SearchableConfigurable>.reset()
|
||||
super<BoundConfigurable>.reset()
|
||||
languages.reset(settings.state)
|
||||
}
|
||||
|
||||
override fun isModified(settings: GrazieConfig): Boolean = languages.isModified(settings.state)
|
||||
|| super<BoundConfigurable>.isModified
|
||||
|
||||
override fun apply(settings: GrazieConfig) {
|
||||
super.apply()
|
||||
GrazieConfig.update { state ->
|
||||
languages.apply(state)
|
||||
}
|
||||
}
|
||||
|
||||
override fun dispose() {
|
||||
disposeUIResources()
|
||||
}
|
||||
|
||||
override fun getComponent(): JPanel {
|
||||
lateinit var result: DialogPanel
|
||||
result = panel {
|
||||
lateinit var lbLanguage: JLabel
|
||||
row {
|
||||
lbLanguage = label(msg("grazie.settings.proofreading.languages.text"))
|
||||
.gap(RightGap.SMALL)
|
||||
.component
|
||||
cell(asyncDownloadingIcon).gap(RightGap.SMALL)
|
||||
cell(downloadLabel)
|
||||
}
|
||||
row {
|
||||
cell(languages.component)
|
||||
.applyToComponent {
|
||||
preferredSize = JBDimension(350, 150)
|
||||
putClientProperty(DslComponentProperty.VERTICAL_COMPONENT_GAP, VerticalComponentGap(top = false, bottom = true))
|
||||
lbLanguage.labelFor = this
|
||||
}
|
||||
}
|
||||
row {
|
||||
link(msg("grazie.settings.proofreading.link-to-inspection")) {
|
||||
Settings.KEY.getData(DataManager.getInstance().getDataContext(result))?.let { settings ->
|
||||
settings.find(ErrorsConfigurable::class.java)?.let {
|
||||
settings.select(it).doWhenDone {
|
||||
it.selectInspectionGroup(arrayOf(msg("grazie.group.name")))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
row {
|
||||
cell(super.createComponent())
|
||||
.align(AlignX.FILL)
|
||||
}
|
||||
}
|
||||
|
||||
languages.reset(GrazieConfig.get())
|
||||
return result
|
||||
}
|
||||
|
||||
private val component: DialogPanel by lazy {
|
||||
panel {
|
||||
generalSettings()
|
||||
}
|
||||
}
|
||||
|
||||
private fun Panel.generalSettings(): Row {
|
||||
return group {
|
||||
row {
|
||||
checkBox(GrazieBundle.message("grazie.settings.auto.apply.fixes.label")).bindSelected(::autoFix)
|
||||
}
|
||||
|
||||
row {
|
||||
@Suppress("DialogTitleCapitalization")
|
||||
val oxfordCb = checkBox(GrazieBundle.message("grazie.settings.use.oxford.spelling.checkbox"))
|
||||
.bindSelected(
|
||||
getter = { config.useOxfordSpelling },
|
||||
setter = { GrazieConfig.update { state -> state.withOxfordSpelling(it) } }
|
||||
)
|
||||
|
||||
fun updateAvailability() {
|
||||
oxfordCb.enabled(Lang.BRITISH_ENGLISH in GrazieConfig.get().availableLanguages)
|
||||
}
|
||||
updateAvailability()
|
||||
GrazieConfig.subscribe(disposable!!) { updateAvailability() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun withProcessIcon(langs: Collection<Lang>, download: suspend (Collection<Lang>) -> Unit) {
|
||||
var failed = false
|
||||
try {
|
||||
if (GrazieRemote.allAvailableLocally(langs)) return
|
||||
val filteredLanguages = withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
|
||||
getLanguagesBasedOnUserAgreement(langs, project)
|
||||
}
|
||||
if (filteredLanguages.isEmpty()) return
|
||||
if (downloadingLanguages.isEmpty()) {
|
||||
downloadingLanguages.addAll(langs)
|
||||
withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
|
||||
downloadLabel.text = msg("grazie.settings.proofreading.languages.download")
|
||||
asyncDownloadingIcon.resume()
|
||||
asyncDownloadingIcon.isVisible = true
|
||||
downloadLabel.isVisible = true
|
||||
}
|
||||
}
|
||||
download(filteredLanguages)
|
||||
}
|
||||
catch (e: Exception) {
|
||||
withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
|
||||
downloadLabel.text = msg("grazie.settings.proofreading.languages.download.failed", langs.joinToString { it.displayName })
|
||||
asyncDownloadingIcon.suspend()
|
||||
}
|
||||
failed = true
|
||||
downloadingLanguages.clear()
|
||||
throw e
|
||||
}
|
||||
finally {
|
||||
downloadingLanguages.removeAll(langs)
|
||||
if (downloadingLanguages.isEmpty() && !failed) {
|
||||
withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
|
||||
asyncDownloadingIcon.isVisible = false
|
||||
downloadLabel.isVisible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun createPanel(): DialogPanel = component
|
||||
|
||||
override fun getPreferredFocusedComponent(): JComponent? {
|
||||
return super<ConfigurableUi>.preferredFocusedComponent
|
||||
}
|
||||
|
||||
override fun enableSearch(option: String?): Runnable? {
|
||||
return super<ConfigurableUi>.enableSearch(option)
|
||||
}
|
||||
|
||||
override fun getId(): String = ID
|
||||
|
||||
companion object {
|
||||
internal const val ID = "reference.settings.grazie"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user