From cb1c0748b67e5b3a9fb0ae9773d5ecd6fed307c0 Mon Sep 17 00:00:00 2001 From: Alexandr Zhuravlev Date: Fri, 15 Sep 2023 14:25:50 +0300 Subject: [PATCH 1/8] refactor(): Extract logic to get filename from action event in separate method --- src/main/java/gitextensions/commands/BaseAction.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/gitextensions/commands/BaseAction.java b/src/main/java/gitextensions/commands/BaseAction.java index dc3bcc8..c533d24 100644 --- a/src/main/java/gitextensions/commands/BaseAction.java +++ b/src/main/java/gitextensions/commands/BaseAction.java @@ -3,8 +3,10 @@ import com.google.common.base.Strings; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.DataConstants; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vfs.VirtualFile; import gitextensions.GitExtensionsService; @@ -29,8 +31,7 @@ public BaseAction(@NotNull String command) { @Override public void actionPerformed(@NotNull AnActionEvent e) { try { - VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); - String fileName = getFileName(file); + String fileName = getFileNameFromEvent(e); if (fileName != null) { GitExtensionsService service = ApplicationManager.getApplication().getService(GitExtensionsService.class); @@ -57,6 +58,12 @@ public void actionPerformed(@NotNull AnActionEvent e) { } } + @Nullable + protected String getFileNameFromEvent(@NotNull AnActionEvent e) { + VirtualFile file = e.getData(PlatformDataKeys.VIRTUAL_FILE); + return getFileName(file); + } + protected String getFileName(@Nullable VirtualFile file) { return file != null ? file.getCanonicalPath() : null; } From 8b677574d3cf707873680f347ec366419e375c92 Mon Sep 17 00:00:00 2001 From: Alexandr Zhuravlev Date: Fri, 15 Sep 2023 14:27:47 +0300 Subject: [PATCH 2/8] fix(): Override getFileNameFromEvent in Browse command to allow get project base path if no current file --- .../java/gitextensions/commands/Browse.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/gitextensions/commands/Browse.java b/src/main/java/gitextensions/commands/Browse.java index fbf41dd..67216d0 100644 --- a/src/main/java/gitextensions/commands/Browse.java +++ b/src/main/java/gitextensions/commands/Browse.java @@ -1,7 +1,26 @@ package gitextensions.commands; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + public class Browse extends BaseAction { public Browse() { super(Commands.BROWSE); } + + @Nullable + @Override + protected String getFileNameFromEvent(@NotNull AnActionEvent e) { + String result = super.getFileNameFromEvent(e); + if (result == null) { + Project project = e.getData(PlatformDataKeys.PROJECT); + if (project != null) { + result = project.getBasePath(); + } + } + return result; + } } From 5e146f9296a31a881e58071ef1b596fb4ab2746e Mon Sep 17 00:00:00 2001 From: Alexandr Zhuravlev Date: Fri, 15 Sep 2023 14:28:26 +0300 Subject: [PATCH 3/8] build():Change build.gradle to fix build process --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0ef5f25..b676da7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ + + plugins { id 'java' id 'org.jetbrains.intellij' version '0.4.1' @@ -8,8 +10,12 @@ version '0.4.4' sourceCompatibility = 1.8 +repositories { + mavenCentral() +} + dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'junit', name: 'junit', version: '4.13.2' } intellij { From 21ee67a50ab54f523997e4aa2e21ede2be7347b4 Mon Sep 17 00:00:00 2001 From: Alexandr Zhuravlev Date: Fri, 15 Sep 2023 14:29:43 +0300 Subject: [PATCH 4/8] build():Store RunPlugin IDEA's configuration in git --- .run/Run Plugin.run.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .run/Run Plugin.run.xml diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml new file mode 100644 index 0000000..ce1940e --- /dev/null +++ b/.run/Run Plugin.run.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file From b1dac19b1028cb8050a93545904a35536ae76f68 Mon Sep 17 00:00:00 2001 From: Alexandr Zhuravlev Date: Fri, 15 Mar 2024 16:48:48 +0300 Subject: [PATCH 5/8] build():Update to gradle 8.5 --- build.gradle | 13 +++++-------- gradle/wrapper/gradle-wrapper.properties | 11 ++++++----- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index b676da7..4033ecc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,9 @@ - - plugins { - id 'java' - id 'org.jetbrains.intellij' version '0.4.1' + id "org.jetbrains.intellij" version "1.17.2" } group 'com.dmitryzhelnin.intellij.plugin.git.extensions' -version '0.4.4' +version '0.4.5-az' sourceCompatibility = 1.8 @@ -15,10 +12,10 @@ repositories { } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.13.2' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' } intellij { - intellij.version '2019.3' - intellij.updateSinceUntilBuild false + version = '2019.3' + updateSinceUntilBuild = false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 115e6ac..b7e059c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +#Fri Mar 15 15:33:19 MSK 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From f370fe0fa5209e274c1eadd56a9baace8db6123c Mon Sep 17 00:00:00 2001 From: Alexandr Zhuravlev Date: Fri, 15 Mar 2024 17:26:17 +0300 Subject: [PATCH 6/8] build():Upgrade minimum IntelliJ platform to 223 (2022.3) --- build.gradle | 4 ++-- src/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4033ecc..eea60f7 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { group 'com.dmitryzhelnin.intellij.plugin.git.extensions' version '0.4.5-az' -sourceCompatibility = 1.8 +sourceCompatibility = 17 repositories { mavenCentral() @@ -16,6 +16,6 @@ dependencies { } intellij { - version = '2019.3' + version = '2022.3' updateSinceUntilBuild = false } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 53b47ca..0f436ec 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -64,7 +64,7 @@ ]]> - + com.intellij.modules.lang From 49e57d7a6a0527ec7eec7a189d78dbbd3617c805 Mon Sep 17 00:00:00 2001 From: Alexandr Zhuravlev Date: Fri, 15 Mar 2024 17:28:30 +0300 Subject: [PATCH 7/8] fix(): Override getActionUpdateThread method in BaseAction to fix "com.intellij.diagnostic.PluginException: `ActionUpdateThread.OLD_EDT` is deprecated" --- src/main/java/gitextensions/commands/BaseAction.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/gitextensions/commands/BaseAction.java b/src/main/java/gitextensions/commands/BaseAction.java index c533d24..650d316 100644 --- a/src/main/java/gitextensions/commands/BaseAction.java +++ b/src/main/java/gitextensions/commands/BaseAction.java @@ -1,12 +1,8 @@ package gitextensions.commands; import com.google.common.base.Strings; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.DataConstants; -import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vfs.VirtualFile; import gitextensions.GitExtensionsService; @@ -28,6 +24,11 @@ public BaseAction(@NotNull String command) { this.command = command; } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; //super.getActionUpdateThread(); + } + @Override public void actionPerformed(@NotNull AnActionEvent e) { try { From 32d2bb72d02f91992477d7e7275c37971fa90157 Mon Sep 17 00:00:00 2001 From: Alexandr Zhuravlev Date: Fri, 15 Mar 2024 17:32:06 +0300 Subject: [PATCH 8/8] docs():Set version to 0.4.5-az --- src/main/resources/META-INF/plugin.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 0f436ec..7f5591e 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -2,7 +2,7 @@ com.dmitryzhelnin.intellij.plugin.gitextensions GitExtensions Dmitry Zhelnin - 0.4.4 + 0.4.5-az GitExtensions application from IDEs based on the IntelliJ platform @@ -11,6 +11,11 @@
    +
  • 0.4.5
    • +
      +
    • Fix usages of deprecated API
      • +
    • Minimum supported version of IntelliJ platform is 223.0 (2022.3)
      • +
  • 0.4.4
    • Fix usages of deprecated API