fix: - fix [issues#39](#39)

- fix [issues#40](#40)
yelog · Nov 15, 2024 · d88cff7 · d88cff7
1 parent 03582d3
commit d88cff7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 # vim-flash Changelog
 
+## 0.0.5
+- fix [issues#39](https://github.com/yelog/vim-flash/issues/39)
+- fix [issues#40](https://github.com/yelog/vim-flash/issues/40)
+
 ## 0.0.4
 - fix [issues#27](https://github.com/yelog/vim-flash/issues/27)
 - fix [issues#30](https://github.com/yelog/vim-flash/issues/30)

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ pluginGroup = com.github.yelog.vimflash
 pluginName = vim-flash
 pluginRepositoryUrl = https://github.com/yelog/vim-flash
 # SemVer format -> https://semver.org
-pluginVersion = 0.0.4
+pluginVersion = 0.0.5
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 223

diff --git a/src/main/kotlin/org/yelog/ideavim/flash/Configurable.kt b/src/main/kotlin/org/yelog/ideavim/flash/Configurable.kt
@@ -5,7 +5,7 @@ import org.yelog.ideavim.flash.UserConfig.DataBean
 import javax.swing.JComponent
 
 class Configurable : Configurable {
-    private lateinit var config: DataBean
+    private val config: DataBean by lazy { UserConfig.getDataBean() }
     private lateinit var ui: ConfigUI
 
     override fun isModified(): Boolean {
@@ -33,7 +33,6 @@ class Configurable : Configurable {
     }
 
     override fun createComponent(): JComponent {
-        config = UserConfig.getDataBean()
         ui = ConfigUI()
         fillUI()
         return ui.rootPanel

diff --git a/src/main/kotlin/org/yelog/ideavim/flash/MarksCanvas.kt b/src/main/kotlin/org/yelog/ideavim/flash/MarksCanvas.kt
@@ -7,7 +7,7 @@ import java.awt.*
 import javax.swing.JComponent
 
 class MarksCanvas : JComponent() {
-    private val config: UserConfig.DataBean = UserConfig.getDataBean()
+    private val config: UserConfig.DataBean by lazy { UserConfig.getDataBean() }
     private var mMarks: List<Mark> = emptyList()
     private lateinit var mEditor: Editor
     private lateinit var mFont: Font

diff --git a/src/main/kotlin/org/yelog/ideavim/flash/UserConfig.kt b/src/main/kotlin/org/yelog/ideavim/flash/UserConfig.kt
@@ -40,11 +40,13 @@ class UserConfig : PersistentStateComponent<UserConfig.DataBean> {
         const val DEFAULT_MATCH_NEAREST_FG_COLOR = 0xff1b1d2b.toInt()
         const val DEFAULT_MATCH_NEAREST_BG_COLOR = 0xffff966c.toInt()
 
-        private val instance: UserConfig
-            get() = ApplicationManager.getApplication().getService(UserConfig::class.java)
+        // get instance
+        private fun getInstance(): UserConfig {
+            return ApplicationManager.getApplication().getService(UserConfig::class.java)
+        }
 
         fun getDataBean(): DataBean {
-            return instance.dataBean
+            return getInstance().dataBean
         }
     }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -43,17 +43,20 @@
     ]]></description>
 
     <change-notes><![CDATA[
+        <h2>0.0.5</h2>
+        <ul>
+            <li>fix [issues#39](https://github.com/yelog/vim-flash/issues/39)</li>
+            <li>fix [issues#40](https://github.com/yelog/vim-flash/issues/40)</li>
+        </ul>
         <h2>0.0.4</h2>
         <ul>
             <li>fix [issues#27](https://github.com/yelog/vim-flash/issues/27)</li>
             <li>fix [issues#30](https://github.com/yelog/vim-flash/issues/30)</li>
-            <li></li>
         </ul>
         <h2>0.0.3</h2>
         <ul>
             <li>Update description</li>
             <li>Goto closest match when pressing enter key</li>
-            <li></li>
         </ul>
         <h2>0.0.1</h2>
         <ul>