Merge remote-tracking branch 'origin/main'

.github/workflows/build.yml

@@ -1,7 +1,6 @@
 # GitHub Actions Workflow is created for testing and preparing the plugin release in the following steps:
 # - validate Gradle Wrapper,
 # - run 'test' and 'verifyPlugin' tasks,
-# - run Qodana inspections,
 # - run 'buildPlugin' task and prepare artifact for the further tests,
 # - run 'runPluginVerifier' task,
 # - create a draft release.
@@ -106,10 +105,6 @@ jobs:
 #        with:
 #          name: pluginVerifier-result
 #          path: ${{ github.workspace }}/build/reports/pluginVerifier
-#
-#      # Run Qodana inspections
-#      - name: Qodana - Code Inspection
-#        uses: JetBrains/[email protected]
 
       # Build Plugin for next step: Prepare Plugin Artifact
       - name: Build Plugin

.github/workflows/release.yml

@@ -13,9 +13,6 @@ jobs:
   release:
     name: Publish Plugin
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
     steps:
 
       # Check out current repository

.gitignore

@@ -1,4 +1,3 @@
 .gradle
 .idea
-.qodana
 build

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 # intellij-format-methods-plugin Changelog
 
-## [Unreleased]
+## [1.0.5] (2023/06/25)
+- Clean up some excess code
+- Resolve the `com.intellij.serviceContainer.AlreadyDisposedException` caused
+- 清理部分多余代码
+- 解决引发的`com.intellij.serviceContainer.AlreadyDisposedException`
 
 ## [1.0.3] (2023/06/15)
 - Fix method sorting errors

README.md

@@ -39,28 +39,6 @@ public interface Demo {
 }
 ```
 
-[//]: # (## Template ToDo list)
-
-[//]: # (- [x] Create a new [IntelliJ Platform Plugin Template][template] project.)
-
-[//]: # (- [ ] Get familiar with the [template documentation][template].)
-
-[//]: # (- [ ] Adjust the [pluginGroup](./gradle.properties), [plugin ID](./src/main/resources/META-INF/plugin.xml) and [sources package](./src/main/kotlin).)
-
-[//]: # (- [ ] Adjust the plugin description in `README` (see [Tips][docs:plugin-description]))
-
-[//]: # (- [ ] Review the [Legal Agreements](https://plugins.jetbrains.com/docs/marketplace/legal-agreements.html?from=IJPluginTemplate).)
-
-[//]: # (- [ ] [Publish a plugin manually](https://plugins.jetbrains.com/docs/intellij/publishing-plugin.html?from=IJPluginTemplate) for the first time.)
-
-[//]: # (- [ ] Set the `PLUGIN_ID` in the above README badges.)
-
-[//]: # (- [ ] Set the [Plugin Signing](https://plugins.jetbrains.com/docs/intellij/plugin-signing.html?from=IJPluginTemplate) related [secrets](https://github.com/JetBrains/intellij-platform-plugin-template#environment-variables).)
-
-[//]: # (- [ ] Set the [Deployment Token](https://plugins.jetbrains.com/docs/marketplace/plugin-upload.html?from=IJPluginTemplate).)
-
-[//]: # (- [ ] Click the <kbd>Watch</kbd> button on the top of the [IntelliJ Platform Plugin Template][template] to be notified about releases containing new features and fixes.)
-
 ## Installation
 
 - Using IDE built-in plugin system:

build.gradle.kts

@@ -12,7 +12,6 @@ plugins {
     alias(libs.plugins.kotlin) // Kotlin support
     alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
     alias(libs.plugins.changelog) // Gradle Changelog Plugin
-    alias(libs.plugins.qodana) // Gradle Qodana Plugin
 }
 
 group = properties("pluginGroup").get()
@@ -47,14 +46,6 @@ changelog {
     repositoryUrl = properties("pluginRepositoryUrl")
 }
 
-// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
-qodana {
-    cachePath = provider { file(".qodana").canonicalPath }
-    reportPath = provider { file("build/reports/inspections").canonicalPath }
-    saveReport = true
-    showReport = environment("QODANA_SHOW_REPORT").map { it.toBoolean() }.getOrElse(false)
-}
-
 tasks {
     wrapper {
         gradleVersion = properties("gradleVersion").get()
@@ -81,15 +72,6 @@ tasks {
         }
     }
 
-    // Configure UI tests plugin
-    // Read more: https://github.com/JetBrains/intellij-ui-test-robot
-    runIdeForUiTests {
-        systemProperty("robot-server.port", "8082")
-        systemProperty("ide.mac.message.dialogs.as.sheets", "false")
-        systemProperty("jb.privacy.policy.text", "<!--999.999-->")
-        systemProperty("jb.consents.confirmation.enabled", "false")
-    }
-
     signPlugin {
         certificateChain = environment("CERTIFICATE_CHAIN")
         privateKey = environment("PRIVATE_KEY")

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 = 1.0.3
+pluginVersion = 1.0.5
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 201

gradle/libs.versions.toml

@@ -3,10 +3,8 @@
 kotlin = "1.8.22"
 changelog = "2.1.0"
 gradleIntelliJPlugin = "1.14.1"
-qodana = "0.1.13"
 
 [plugins]
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
 gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }

src/main/kotlin/com/github/dcsmf/intellijformatmethodsplugin/action/FormatMethodWithPyramidAction.kt

@@ -10,6 +10,7 @@ import com.github.dcsmf.intellijformatmethodsplugin.utils.SortUtil
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
@@ -23,6 +24,9 @@ import java.util.stream.Collectors
 class FormatMethodWithPyramidAction : AnAction() {
 
     override fun update(e: AnActionEvent) {
+        if(ApplicationManager.getApplication().isDisposed){
+            return
+        }
         //没有打开文件的时候禁用按钮(Disable button when file isn't open)
         if (null == e.project) {
             e.presentation.isEnabled = false

src/main/resources/META-INF/plugin.xml

@@ -9,11 +9,6 @@
 
     <resource-bundle>messages.TextBundle</resource-bundle>
 
-    <extensions defaultExtensionNs="com.intellij">
-    </extensions>
-
-    <applicationListeners>
-    </applicationListeners>
     <actions resource-bundle="messages.ActionsBundle">
         <action id="mf.plugin.format.pyramid.method.action"
                 class="com.github.dcsmf.intellijformatmethodsplugin.action.FormatMethodWithPyramidAction">