fix: Fix build

Author: GlebMikhailov

build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("java")
     id("org.jetbrains.grammarkit") version "2022.3.1"
     id("org.jetbrains.kotlin.jvm") version "1.9.24"
-    id("org.jetbrains.intellij") version "1.16.1"
+    id("org.jetbrains.intellij") version "1.17.4"
     id("io.gitlab.arturbosch.detekt") version "1.23.4"
 }
 
@@ -91,13 +91,6 @@ tasks {
         token.set(System.getenv("PUBLISH_TOKEN"))
     }
 
-    generateLexer {
-        sourceFile.set(project.file("src/main/grammars/RhaiLexer.flex"))
-        targetDir.set("src/main/gen/org/rhai/")
-        targetClass.set("RhaiLexer")
-        purgeOldFiles.set(true)
-    }
-
     generateParser {
         sourceFile.set(project.file("src/main/grammars/Rhai.bnf"))
         targetRoot.set("src/main/gen")
@@ -106,8 +99,16 @@ tasks {
         purgeOldFiles.set(true)
     }
 
+    generateLexer {
+        dependsOn(generateParser)
+        sourceFile.set(project.file("src/main/grammars/RhaiLexer.flex"))
+        targetDir.set("src/main/gen/org/rhai/")
+        targetClass.set("RhaiLexer")
+        purgeOldFiles.set(false)
+    }
+
     compileKotlin {
-        dependsOn(generateLexer, generateParser)
+        dependsOn(generateLexer)
     }
 
     clean {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/org/rhai/features/RhaiCompletionContributor.kt

@@ -581,8 +581,6 @@ class RhaiCompletionContributor : CompletionContributor() {
             if (actualModuleName != moduleName) {
                 val adjustedStart = completionStart + adjustment
                 val adjustedEnd = completionEnd + adjustment
-
-                val oldText = "$moduleName::$symbolName"
                 val newText = "$actualModuleName::$symbolName"
 
                 document.replaceString(adjustedStart, adjustedEnd, newText)

src/main/kotlin/org/rhai/features/RhaiFormatter.kt

@@ -3,13 +3,10 @@ package org.rhai.features
 import com.intellij.formatting.*
 import com.intellij.lang.ASTNode
 import com.intellij.openapi.util.TextRange
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiFile
 import com.intellij.psi.TokenType
 import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
 import com.intellij.psi.formatter.FormatterUtil
-import com.intellij.psi.tree.IElementType
 import com.intellij.psi.tree.TokenSet
 import org.rhai.RhaiTypes
 import org.rhai.lang.RhaiLanguage
@@ -183,22 +180,6 @@ class RhaiFormattingBlock(
     private var subBlocks: List<Block>? = null
 
     companion object {
-        private val BLOCKS = TokenSet.create(
-            RhaiTypes.BLOCK,
-            RhaiTypes.FUNCTION_DEFINITION,
-            RhaiTypes.IF_STATEMENT,
-            RhaiTypes.IF_EXPRESSION,
-            RhaiTypes.WHILE_STATEMENT,
-            RhaiTypes.FOR_STATEMENT,
-            RhaiTypes.LOOP_STATEMENT,
-            RhaiTypes.DO_WHILE_STATEMENT,
-            RhaiTypes.UNTIL_STATEMENT,
-            RhaiTypes.SWITCH_EXPRESSION,
-            RhaiTypes.TRY_CATCH_STATEMENT,
-            RhaiTypes.MODULE_DECLARATION,
-            RhaiTypes.CLOSURE_EXPR
-        )
-
         private val BRACES = TokenSet.create(
             RhaiTypes.LBRACE,
             RhaiTypes.RBRACE,
@@ -207,14 +188,6 @@ class RhaiFormattingBlock(
             RhaiTypes.LPAREN,
             RhaiTypes.RPAREN
         )
-
-        private val CONTAINERS = TokenSet.create(
-            RhaiTypes.ARRAY_LITERAL,
-            RhaiTypes.OBJECT_LITERAL,
-            RhaiTypes.PARAMETERS,
-            RhaiTypes.ARGUMENT_LIST,
-            RhaiTypes.CLOSURE_PARAMS
-        )
     }
 
     override fun getNode(): ASTNode = node

src/main/kotlin/org/rhai/features/RhaiTypedHandler.kt

@@ -2,11 +2,9 @@ package org.rhai.features
 
 import com.intellij.codeInsight.editorActions.TypedHandlerDelegate
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import org.rhai.lang.RhaiFileType
-import org.rhai.RhaiTypes
 
 class RhaiTypedHandler : TypedHandlerDelegate() {
 

src/main/kotlin/org/rhai/inspections/RhaiQuickFixes.kt

@@ -2,11 +2,9 @@ package org.rhai.inspections
 
 import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
 import org.rhai.RhaiBlock
 import org.rhai.RhaiFunctionDefinition

src/main/kotlin/org/rhai/refactoring/RhaiPsiFactory.kt

@@ -22,10 +22,10 @@ class RhaiPsiFactory(private val project: Project) {
         // Create a simple let declaration to extract the identifier
         val file = createFile("let $name = 0;")
         val letDecl = PsiTreeUtil.findChildOfType(file, RhaiLetDeclaration::class.java)
-            ?: throw IllegalStateException("Failed to create identifier PSI element")
+            ?: error("Failed to create identifier PSI element")
 
         val identifierNode = letDecl.pattern.node.findChildByType(RhaiTypes.IDENTIFIER)
-            ?: throw IllegalStateException("Failed to find identifier in created element")
+            ?: error("Failed to find identifier in created element")
 
         return identifierNode.psi
     }

src/main/kotlin/org/rhai/registry/RhaiRegistryCodeParser.kt

@@ -105,7 +105,7 @@ class RhaiRegistryCodeParser(private val project: Project) {
                     constants.add(ParsedRegistryEntry(name, RegistryEntryKind.CONSTANT, typeAnnotation))
                 }
             }
-        } catch (e: Exception) {
+        } catch (@Suppress("SwallowedException") e: Exception) {
             // Ignore parsing errors - just return empty results for unparseable code
         }