From d15d17d85f779dc646cb4d55aa7343c87157bf8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Pl=C3=B6ger?= <develop@dieploegers.de>
Date: Tue, 5 Nov 2024 11:27:18 +0100
Subject: [PATCH] fix: Smaller fixes and updates

---
 .github/workflows/build.yml                                | 2 +-
 .idea/gradle.xml                                           | 1 +
 CHANGELOG.md                                               | 5 +++++
 gradle.properties                                          | 4 ++--
 gradle/libs.versions.toml                                  | 4 ++--
 .../develop/idea/shellfilter/CustomFilterAction.java       | 7 ++++++-
 .../dieploegers/develop/idea/shellfilter/FilterAction.java | 7 ++++++-
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e1c11fa..0fafeef 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -170,7 +170,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2024.2.3
+        uses: JetBrains/qodana-action@v2024.2.6
         with:
           cache-default-branch-only: true
 
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ce1c62c..43cc8e4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="temurin-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b75347..fbbd631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed some 2024.3 deprecations
+- Updates to Qodana and Kotlin
+
 ## [5.0.3] - 2024-09-26
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
index 6079416..7a74521 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ pluginGroup = de.dieploegers.develop.idea
 pluginName = shellfilter
 pluginRepositoryUrl = https://github.com/dploeger/idea-shellfilter
 # SemVer format -> https://semver.org
-pluginVersion = 5.0.3
+pluginVersion = 5.0.4
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 232
@@ -12,7 +12,7 @@ pluginUntilBuild = 243.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IC
-platformVersion = 2024.2
+platformVersion = 243.21565.23
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7d81c3b..0a89aaf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,9 +5,9 @@ junit = "4.13.2"
 # plugins
 changelog = "2.2.1"
 intelliJPlatform = "2.1.0"
-kotlin = "2.0.20"
+kotlin = "2.0.21"
 kover = "0.8.3"
-qodana = "2024.2.3"
+qodana = "2024.2.6"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }
diff --git a/src/main/java/de/dieploegers/develop/idea/shellfilter/CustomFilterAction.java b/src/main/java/de/dieploegers/develop/idea/shellfilter/CustomFilterAction.java
index 731f0a2..9568a23 100644
--- a/src/main/java/de/dieploegers/develop/idea/shellfilter/CustomFilterAction.java
+++ b/src/main/java/de/dieploegers/develop/idea/shellfilter/CustomFilterAction.java
@@ -19,7 +19,12 @@ public void actionPerformed(final AnActionEvent anActionEvent) {
         LOG.debug("Custom Shell Filter was invoked. Fetching data from event.");
 
         final Editor editor =
-                anActionEvent.getRequiredData(CommonDataKeys.EDITOR);
+                anActionEvent.getData(CommonDataKeys.EDITOR);
+
+        if (editor == null) {
+            LOG.error("Internal error. Editor not found");
+            return;
+        }
 
         LOG.debug("Custom command selected. Show input dialog");
 
diff --git a/src/main/java/de/dieploegers/develop/idea/shellfilter/FilterAction.java b/src/main/java/de/dieploegers/develop/idea/shellfilter/FilterAction.java
index 72e34ea..04afc6b 100644
--- a/src/main/java/de/dieploegers/develop/idea/shellfilter/FilterAction.java
+++ b/src/main/java/de/dieploegers/develop/idea/shellfilter/FilterAction.java
@@ -49,7 +49,12 @@ public void actionPerformed(final AnActionEvent anActionEvent) {
         LOG.debug("Shell Filter was invoked. Fetching data from event.");
 
         final Editor editor =
-            anActionEvent.getRequiredData(CommonDataKeys.EDITOR);
+            anActionEvent.getData(CommonDataKeys.EDITOR);
+
+        if (editor == null) {
+            LOG.error("Internal error. Editor not found");
+            return;
+        }
 
         LOG.debug("Building up command list from settings and custom command");