From a4253df86f5d181ee05bd94504a54d7e56d081fa Mon Sep 17 00:00:00 2001
From: "Walied K. Yassen" <walied.developer@hotmail.com>
Date: Mon, 15 Apr 2024 08:07:45 +0300
Subject: [PATCH] Update to build 241.*

---
 CHANGELOG.md                                              | 3 +++
 gradle.properties                                         | 8 ++++----
 .../intention/controlFlow/RsMergeIfAndIntention.kt        | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e176698..6f4b266 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
 - Add inspection and quick fix for unused local variables.
 - Add varchook to valid types.
 
+### Changed
+- Update to IntelliJ 2024.1.
+
 ## [1.5.0] - 2023-11-27
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
index 50e848d..91d851e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,15 @@ pluginName = intellij-runescript
 pluginRepositoryUrl = https://github.com/waleedyaseen/intellij-runescript
 pluginVersion = 1.5.0
 
-pluginSinceBuild = 232
-pluginUntilBuild = 233.*
+pluginSinceBuild = 233
+pluginUntilBuild = 241.*
 
 platformType = IC
-platformVersion = 2023.2.2
+platformVersion = 2023.3.4
 
 platformPlugins = com.intellij.java
 
-gradleVersion = 8.2.1
+gradleVersion = 8.6.0
 
 kotlin.stdlib.default.dependency = false
 org.gradle.configuration-cache = true
diff --git a/src/main/kotlin/io/runescript/plugin/ide/codeInsight/intention/controlFlow/RsMergeIfAndIntention.kt b/src/main/kotlin/io/runescript/plugin/ide/codeInsight/intention/controlFlow/RsMergeIfAndIntention.kt
index 0dade94..ba3400a 100644
--- a/src/main/kotlin/io/runescript/plugin/ide/codeInsight/intention/controlFlow/RsMergeIfAndIntention.kt
+++ b/src/main/kotlin/io/runescript/plugin/ide/codeInsight/intention/controlFlow/RsMergeIfAndIntention.kt
@@ -17,7 +17,7 @@ class RsMergeIfAndIntention : BaseElementAtCaretIntentionAction() {
         return RsBundle.message("intention.merge.if.and.name")
     }
 
-    override fun invoke(project: Project, editor: Editor?, element: PsiElement) {
+    override fun invoke(project: Project, editor: Editor, element: PsiElement) {
         val ifStmt = element.parent as RsIfStatement
         val trueStmt = ifStmt.trueStatement.toSingleStatement() as RsIfStatement
         val leftParen = (ifStmt.expression?.precedence ?: 0) > PRECEDENCE_LOGICAL_AND
@@ -45,7 +45,7 @@ class RsMergeIfAndIntention : BaseElementAtCaretIntentionAction() {
 
     }
 
-    override fun isAvailable(project: Project, editor: Editor?, element: PsiElement): Boolean {
+    override fun isAvailable(project: Project, editor: Editor, element: PsiElement): Boolean {
         val ifStmt = element.parent
         if (ifStmt !is RsIfStatement) {
             return false