chylex/IntelliJ-Rainbow-Brackets
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-Rainbow-Brackets.git synced 2025-04-10 18:15:50 +02:00
Code

Simplify RainbowSettingsForm code

Browse Source
This commit is contained in:
张志豪 2018-03-17 22:02:07 +08:00
parent 2ee2695559
commit fc0883b023
3 changed files with 32 additions and 39 deletions
src
main/kotlin/com/github/izhangzhihao/rainbow/brackets/settings
RainbowConfigurable.kt
form
RainbowSettingsForm.kt
test/kotlin/com/github/izhangzhihao/rainbow/brackets/settings
RainbowConfigurableTest.kt

14
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/settings/RainbowConfigurable.kt
View File

@ -11,7 +11,7 @@ class RainbowConfigurable : Configurable {
override fun createComponent(): JComponent? {
settingsForm = settingsForm ?: RainbowSettingsForm()
return settingsForm?.component
return settingsForm?.component()
}
override fun isModified(): Boolean {
@ -21,12 +21,12 @@ class RainbowConfigurable : Configurable {
@Throws(ConfigurationException::class)
override fun apply() {
val settings = RainbowSettings.instance
settings.isRainbowEnabled = settingsForm?.isRainbowEnabled ?: true
settings.isEnableRainbowRoundBrackets = settingsForm?.isRainbowRoundBracketsEnabled ?: true
settings.isEnableRainbowAngleBrackets = settingsForm?.isRainbowAngleBracketsEnabled ?: true
settings.isEnableRainbowSquigglyBrackets = settingsForm?.isRainbowSquigglyBracketsEnabled ?: true
settings.isEnableRainbowSquareBrackets = settingsForm?.isRainbowSquareBracketsEnabled ?: true
settings.isDoNOTRainbowifyBracketsWithoutContent = settingsForm?.isDoNOTRainbowifyBracketsWithoutContent ?: false
settings.isRainbowEnabled = settingsForm?.isRainbowEnabled() ?: true
settings.isEnableRainbowRoundBrackets = settingsForm?.isRainbowRoundBracketsEnabled() ?: true
settings.isEnableRainbowAngleBrackets = settingsForm?.isRainbowAngleBracketsEnabled() ?: true
settings.isEnableRainbowSquigglyBrackets = settingsForm?.isRainbowSquigglyBracketsEnabled() ?: true
settings.isEnableRainbowSquareBrackets = settingsForm?.isRainbowSquareBracketsEnabled() ?: true
settings.isDoNOTRainbowifyBracketsWithoutContent = settingsForm?.isDoNOTRainbowifyBracketsWithoutContent() ?: false
}
override fun reset() {

33
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/settings/form/RainbowSettingsForm.kt
View File

@ -15,34 +15,27 @@ class RainbowSettingsForm {
private val settings: RainbowSettings = RainbowSettings.instance
val component: JComponent?
get() = panel
fun component(): JComponent? = panel
val isRainbowEnabled: Boolean?
get() = enableRainbow?.isSelected
fun isRainbowEnabled() = enableRainbow?.isSelected
val isRainbowRoundBracketsEnabled: Boolean?
get() = enableRainbowRoundBrackets?.isSelected
fun isRainbowRoundBracketsEnabled() = enableRainbowRoundBrackets?.isSelected
val isRainbowSquigglyBracketsEnabled: Boolean?
get() = enableRainbowSquigglyBrackets?.isSelected
fun isRainbowSquigglyBracketsEnabled() = enableRainbowSquigglyBrackets?.isSelected
val isRainbowSquareBracketsEnabled: Boolean?
get() = enableRainbowSquareBrackets?.isSelected
fun isRainbowSquareBracketsEnabled() = enableRainbowSquareBrackets?.isSelected
val isRainbowAngleBracketsEnabled: Boolean?
get() = enableRainbowAngleBrackets?.isSelected
fun isRainbowAngleBracketsEnabled() = enableRainbowAngleBrackets?.isSelected
val isDoNOTRainbowifyBracketsWithoutContent: Boolean?
get() = doNOTRainbowifyBracketsWithoutContent?.isSelected
fun isDoNOTRainbowifyBracketsWithoutContent() = doNOTRainbowifyBracketsWithoutContent?.isSelected
val isModified: Boolean
get() = (isRainbowEnabled != settings.isRainbowEnabled
|| isRainbowAngleBracketsEnabled != settings.isEnableRainbowAngleBrackets
|| isRainbowRoundBracketsEnabled != settings.isEnableRainbowRoundBrackets
|| isRainbowSquigglyBracketsEnabled != settings.isEnableRainbowSquigglyBrackets
|| isRainbowSquareBracketsEnabled != settings.isEnableRainbowSquareBrackets
|| isDoNOTRainbowifyBracketsWithoutContent != settings.isDoNOTRainbowifyBracketsWithoutContent)
get() = (isRainbowEnabled() != settings.isRainbowEnabled
|| isRainbowAngleBracketsEnabled() != settings.isEnableRainbowAngleBrackets
|| isRainbowRoundBracketsEnabled() != settings.isEnableRainbowRoundBrackets
|| isRainbowSquigglyBracketsEnabled() != settings.isEnableRainbowSquigglyBrackets
|| isRainbowSquareBracketsEnabled() != settings.isEnableRainbowSquareBrackets
|| isDoNOTRainbowifyBracketsWithoutContent() != settings.isDoNOTRainbowifyBracketsWithoutContent)
init {
loadSettings()

24
src/test/kotlin/com/github/izhangzhihao/rainbow/brackets/settings/RainbowConfigurableTest.kt
View File

@ -24,12 +24,12 @@ class RainbowConfigurableTest : LightCodeInsightFixtureTestCase() {
rainbowConfigurable.createComponent()
rainbowConfigurable.settingsForm.shouldNotBe(null)
rainbowConfigurable.settingsForm!!.isRainbowEnabled shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowAngleBracketsEnabled shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowRoundBracketsEnabled shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowSquareBracketsEnabled shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowSquigglyBracketsEnabled shouldBe true
rainbowConfigurable.settingsForm!!.isDoNOTRainbowifyBracketsWithoutContent shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowEnabled() shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowAngleBracketsEnabled() shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowRoundBracketsEnabled() shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowSquareBracketsEnabled() shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowSquigglyBracketsEnabled() shouldBe true
rainbowConfigurable.settingsForm!!.isDoNOTRainbowifyBracketsWithoutContent() shouldBe false
rainbowConfigurable.disposeUIResources()
rainbowConfigurable.settingsForm.shouldBe(null)
@ -49,12 +49,12 @@ class RainbowConfigurableTest : LightCodeInsightFixtureTestCase() {
rainbowConfigurable.createComponent()
rainbowConfigurable.apply()
rainbowConfigurable.settingsForm!!.isRainbowEnabled shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowAngleBracketsEnabled shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowRoundBracketsEnabled shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowSquareBracketsEnabled shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowSquigglyBracketsEnabled shouldBe false
rainbowConfigurable.settingsForm!!.isDoNOTRainbowifyBracketsWithoutContent shouldBe true
rainbowConfigurable.settingsForm!!.isRainbowEnabled() shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowAngleBracketsEnabled() shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowRoundBracketsEnabled() shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowSquareBracketsEnabled() shouldBe false
rainbowConfigurable.settingsForm!!.isRainbowSquigglyBracketsEnabled() shouldBe false
rainbowConfigurable.settingsForm!!.isDoNOTRainbowifyBracketsWithoutContent() shouldBe true
rainbowConfigurable.disposeUIResources()
rainbowConfigurable.settingsForm.shouldBe(null)