Merge pull request #3 from dcsmf/dev

Fix some bugs

Author: dcsmf

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 # intellij-format-methods-plugin Changelog
 
-## [Unreleased]
+## [2.0.1] (2024/01/02)
+- Fix some bugs
+- 修复了一些问题
 
 ## [2.0.0] (2023/12/07)
 - Now minimum support *IDEA* version is 2023.3
@@ -63,7 +65,6 @@
 - Methods sort feature finished
 - 函数排序功能完成
 
-[Unreleased]: https://github.com/dcsmf/intellij-format-methods-plugin/compare/v1.1.1...HEAD
 [1.1.1]: https://github.com/dcsmf/intellij-format-methods-plugin/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/dcsmf/intellij-format-methods-plugin/compare/v1.0.8...v1.1.0
 [1.0.8]: https://github.com/dcsmf/intellij-format-methods-plugin/compare/v1.0.7...v1.0.8

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = com.github.dcsmf.intellijformatmethodsplugin
 pluginName = FormatMethodPyramid
 pluginRepositoryUrl = https://github.com/dcsmf/intellij-format-methods-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 2.0.0
+pluginVersion = 2.0.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 233

src/main/kotlin/com/github/dcsmf/plugin/formatmethods/action/FormatMethodWithPyramidAction.kt

@@ -7,6 +7,7 @@ import com.github.dcsmf.plugin.formatmethods.utils.ElementUtil
 import com.github.dcsmf.plugin.formatmethods.utils.MethodUtil.getJvmStyleSignature
 import com.github.dcsmf.plugin.formatmethods.utils.NotifyUtil
 import com.github.dcsmf.plugin.formatmethods.utils.SortUtil
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -16,11 +17,13 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 import com.intellij.psi.impl.source.PsiExtensibleClass
 import com.intellij.util.containers.stream
-import org.apache.commons.lang.StringUtils
 import java.util.*
 import java.util.stream.Collectors
 
 class FormatMethodWithPyramidAction : AnAction() {
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.BGT
+    }
 
     override fun update(e: AnActionEvent) {
         // 没有打开编辑器的时候禁用按钮
@@ -58,7 +61,7 @@ class FormatMethodWithPyramidAction : AnAction() {
         // Check whether some areas are selected
         val selectionModel = editor.selectionModel
         try {
-            if (StringUtils.isBlank(selectionModel.selectedText)) {
+            if (selectionModel.selectedText.isNullOrBlank()) {
                 // 全部格式化
                 // Sort all
                 sortAllClasses(project, editor)
@@ -101,8 +104,8 @@ class FormatMethodWithPyramidAction : AnAction() {
             if (o1.isConstructor) {
                 return@sorted 1
             }
-            val s1 = getJvmStyleSignature(o1, project)
-            val s2 = getJvmStyleSignature(o2, project)
+            val s1 = getJvmStyleSignature(o1)
+            val s2 = getJvmStyleSignature(o2)
             s1.length.compareTo(s2.length)
         }.collect(Collectors.toList())
         if (SortUtil.isSameAfterSort(methods, sortedMethods)) {

src/main/kotlin/com/github/dcsmf/plugin/formatmethods/settings/AppSettingsConfigurable.kt

@@ -1,15 +1,15 @@
 package com.github.dcsmf.plugin.formatmethods.settings
 
 import com.github.dcsmf.plugin.formatmethods.bundle.SettingsTextBundle.message
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.options.BoundConfigurable
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
 
-class AppSettingsConfigurable(project: Project) : BoundConfigurable(message("settingName")) {
+class AppSettingsConfigurable : BoundConfigurable(message("settingName")) {
 
-    private val appSettingsState: AppSettingsState = AppSettingsState.getInstance(project)
+    private val appSettingsState: AppSettingsState = ApplicationManager.getApplication().getService(AppSettingsState().javaClass)
 
     override fun createPanel(): DialogPanel {
         return panel {

src/main/kotlin/com/github/dcsmf/plugin/formatmethods/settings/AppSettingsState.kt

@@ -4,7 +4,6 @@ import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
-import com.intellij.openapi.project.Project
 import com.intellij.util.xmlb.XmlSerializerUtil
 
 @Service
@@ -43,11 +42,6 @@ class AppSettingsState : PersistentStateComponent<AppSettingsState> {
      */
     var throws: Boolean = true
 
-    companion object {
-        @JvmStatic
-        fun getInstance(project: Project): AppSettingsState = project.getService(AppSettingsState::class.java)
-    }
-
     override fun getState(): AppSettingsState = this
 
     override fun loadState(state: AppSettingsState) = XmlSerializerUtil.copyBean(state, this)

src/main/kotlin/com/github/dcsmf/plugin/formatmethods/utils/MethodUtil.kt

@@ -1,7 +1,7 @@
 package com.github.dcsmf.plugin.formatmethods.utils
 
 import com.github.dcsmf.plugin.formatmethods.settings.AppSettingsState
-import com.intellij.openapi.project.Project
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.psi.PsiKeyword
 import com.intellij.psi.PsiMethod
 
@@ -16,8 +16,8 @@ object MethodUtil {
      * default<T>voidmyMethod(String userId, @NotNull Group group, T t)throws Exception
      */
     @JvmStatic
-    fun getJvmStyleSignature(method: PsiMethod, project: Project): String {
-        val state: AppSettingsState = AppSettingsState.getInstance(project)
+    fun getJvmStyleSignature(method: PsiMethod): String {
+        val state: AppSettingsState = ApplicationManager.getApplication().getService(AppSettingsState().javaClass)
         val returnTypeElementText = when (method.returnTypeElement) {
             null -> ""
             else -> method.returnTypeElement!!.text

src/main/kotlin/com/github/dcsmf/plugin/formatmethods/utils/SortUtil.kt

@@ -5,7 +5,6 @@ import com.github.dcsmf.plugin.formatmethods.model.SelectSortModel
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.impl.source.PsiExtensibleClass
-import org.apache.commons.lang.ArrayUtils
 
 object SortUtil {
     @JvmStatic
@@ -58,7 +57,7 @@ object SortUtil {
         // 还是没找到，范围扩充到查找该类所有方法
         // Still not found, the scope expands to find all methods of the class
         val methods = currentClass.allMethods
-        return if (ArrayUtils.isEmpty(methods)) {
+        return if (methods.isEmpty()) {
             SelectSortModel(start, end, InsertType.ADD, null)
         } else {
             var psiMethods = methods.toList()