Merge pull request #87 from lord41ph4/develop

[IDEA] usage of version catalogs, kotlin version update and fix for #86

Author: jim-hart

.github/workflows/idea-gradle-build-and-test.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
     - name: Run tests and build plugin
       run: |
         cd IDEA

IDEA/build.gradle.kts

@@ -1,12 +1,13 @@
 import org.jetbrains.grammarkit.tasks.GenerateLexerTask
 import org.jetbrains.grammarkit.tasks.GenerateParserTask
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.jetbrains.intellij.platform") version "2.0.1"
-    id("org.jetbrains.kotlin.jvm") version "2.0.20"
-    id("org.jetbrains.grammarkit") version "2022.3.2.2"
+    alias(libs.plugins.intellijPlattform)
+    alias(libs.plugins.kotlin)
+    alias(libs.plugins.grammarkit)
 }
 
 repositories {
@@ -18,7 +19,7 @@ repositories {
 
 // Java target version
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
 }
 
 sourceSets {
@@ -29,33 +30,36 @@ sourceSets {
 
 kotlin {
     java {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_21
+            freeCompilerArgs = listOf("-Xjvm-default=all")
+        }
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
 dependencies {
     intellijPlatform {
-        intellijIdeaCommunity("2024.2.1")
+        intellijIdeaCommunity("2025.1.1")
 
         bundledPlugins(listOf("com.intellij.java"))
-        instrumentationTools()
 
         testFramework(TestFrameworkType.Platform)
     }
 
     // From Kotlin documentation
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.22")
+    implementation(libs.kotlin.stdlib)
     // just in case, version number specified in buildscript is used by default
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22")
+    implementation(libs.kotlin.reflect)
 
     // IntelliJ test framework needs junit 4.
-    testImplementation("junit:junit:4.13")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.7.0")
+    testImplementation(libs.junit4)
+    testRuntimeOnly(libs.junit.vintage.engine)
 
     // Use junit 5.
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+    testImplementation(libs.junit.jupiter.api)
+    testRuntimeOnly(libs.junit.jupiter.engine)
 }
 
 // Configure Gradle IntelliJ Plugin
@@ -74,39 +78,30 @@ intellijPlatform {
 }
 
 project(":") {
-    val generateLexer = task<GenerateLexerTask>("generateMyLexer") {
-        sourceFile.set(file("src/main/grammar/KerboScript.flex"))
-        targetOutputDir.set(file("src/gen/ksp/kos/ideaplugin/parser"))
-//        targetClass.set("KerboScriptLexer")
-        purgeOldFiles.set(true)
-    }
-
-    val generateParser = task<GenerateParserTask>("generateMyParser") {
+    val generateLexer =
+        tasks.register<GenerateLexerTask>("generateMyLexer", fun GenerateLexerTask.() {
+            sourceFile.set(file("src/main/grammar/KerboScript.flex"))
+            targetOutputDir.set(file("src/gen/ksp/kos/ideaplugin/parser"))
+            purgeOldFiles.set(true)
+        })
+
+    val generateParser = tasks.register<GenerateParserTask>("generateMyParser", fun GenerateParserTask.() {
         sourceFile.set(file("src/main/grammar/KerboScript.bnf"))
         targetRootOutputDir.set(file("src/gen"))
         pathToParser.set("/ksp/kos/ideaplugin/parser/KerboScriptParser.java")
         pathToPsiRoot.set("/ksp/kos/ideaplugin/psi")
         purgeOldFiles.set(true)
-    }
+    })
 
     tasks {
         withType<KotlinCompile> {
             dependsOn(generateLexer, generateParser)
         }
 
-        // Set the compatibility versions to 17
+        // Set the compatibility versions to 21
         withType<JavaCompile> {
-            sourceCompatibility = "17"
-            targetCompatibility = "17"
-        }
-
-        listOf("compileKotlin", "compileTestKotlin").forEach {
-            getByName<KotlinCompile>(it) {
-                kotlinOptions {
-                    jvmTarget = "17"
-                    freeCompilerArgs = listOf("-Xjvm-default=all")
-                }
-            }
+            sourceCompatibility = "21"
+            targetCompatibility = "21"
         }
 
         publishPlugin {

IDEA/gradle/libs.versions.toml

@@ -0,0 +1,21 @@
+[versions]
+intellij = "2.5.0"
+kotlin = "2.1.20"
+kotlin-std-lib = "1.8.22"
+grammarkit = "2022.3.2.2"
+junit4 = "4.13.1"
+junit5 = "5.7.0"
+
+[libraries]
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+
+junit4 = { module = "junit:junit", version.ref = "junit4" }
+junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5"}
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5"}
+
+[plugins]
+intellijPlattform = { id = "org.jetbrains.intellij.platform", version.ref = "intellij" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+grammarkit = { id = "org.jetbrains.grammarkit", version.ref = "grammarkit" }

IDEA/gradle/wrapper/gradle-wrapper.properties

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

IDEA/src/main/grammar/KerboScript.bnf

@@ -25,7 +25,7 @@
     tokenTypeClass="ksp.kos.ideaplugin.psi.KerboScriptTokenType"
 
     extends(".*_stmt|directive|instruction_block")=instruction
-    extends("lazyglobal_directive")=directive
+    extends("lazyglobal_directive|clobberbuiltins_directive")=directive
     extends("function_trailer|array_trailer")=suffixterm_trailer
     extends("[a-z]*_expr|factor|suffix|suffixterm|atom|.*number")=expr
 
@@ -109,13 +109,14 @@
         ALL          = 'regexp:(?i)all'
         IDENTIFIER   = 'regexp:[a-zA-Z_][a-zA-Z0-9_]*'
         FILEIDENT    = 'regexp:[a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z0-9_][a-zA-Z0-9_]*)*'
-        INTEGER      = 'regexp:[0-9]+'
-        DOUBLE       = 'regexp:[0-9]*\.[0-9]+'
+        INTEGER      = 'regexp:[0-9][0-9_]*'
+        DOUBLE       = 'regexp:([0-9]+(_[0-9]*)*)?\.[0-9]+(_[0-9]*)*'
         STRING       = 'regexp:@?"(""|[^"])*"'
         EOI          = '.'
         //Compiler Directives
         ATSIGN       = '@'
         LAZYGLOBAL   = 'regexp:(?i)lazyglobal'
+        CLOBBERBUILTINS = 'regexp:(?i)clobberbuiltins'
         //Special
         //EOF          = '$'
         //[Skip]
@@ -127,7 +128,7 @@
 
 // Rules
 // ===================================================
-Start ::= (instruction)* 
+Start ::= (directive|instruction)*
 instruction_block ::= CURLYOPEN instruction* CURLYCLOSE
 instruction ::= !(CURLYCLOSE | <<eof>>) instruction_inner {
   pin = 1
@@ -174,7 +175,6 @@ private instruction_inner ::= empty_stmt |
                unset_stmt |
                instruction_block |
                identifier_led_stmt | // any statement that starts with an identifier.
-               directive // allow directives anywhere for now, let the compiler decide if it's in the wrong place, not the parser.
 
 // ------------ directives --------------------
 lazyglobal_directive      ::= LAZYGLOBAL onoff_trailer EOI

IDEA/src/main/grammar/KerboScript.flex

@@ -98,8 +98,8 @@ ARRAYINDEX   = #
 ALL          = all
 IDENTIFIER   = [a-zA-Z_][a-zA-Z0-9_]*
 FILEIDENT    = [a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z0-9_][a-zA-Z0-9_]*)*
-INTEGER      = [0-9]+
-DOUBLE       = [0-9]*\.[0-9]+
+INTEGER      = [0-9][0-9_]*
+DOUBLE       = ([0-9]+(_[0-9]*)*)?\.[0-9]+(_[0-9]*)*
 STRING       = @?\"(\"\"|[^\"])*\"
 EOI          = \.
 //Compiler Directives

IDEA/src/main/java/ksp/kos/ideaplugin/Magic.kt

@@ -58,6 +58,7 @@ object Magic {
             KerboScriptTypes.UNSET,
             KerboScriptTypes.CHOOSE,
             KerboScriptTypes.ATSIGN,
-            KerboScriptTypes.LAZYGLOBAL
+            KerboScriptTypes.LAZYGLOBAL,
+            KerboScriptTypes.CLOBBERBUILTINS
     )
 }

IDEA/src/main/java/ksp/kos/ideaplugin/actions/differentiate/DiffContext.java

@@ -35,8 +35,8 @@ public DiffContext(FileContext origFile, FileDuality diffFile, FileContextResolv
         registerFile(origFile.getName());
     }
 
-    public static List<ReferenceResolver<LocalContext>> createDiffResolvers(FileContextResolver fileResolver) {
-        List<ReferenceResolver<LocalContext>> resolvers = FileContext.createResolvers(fileResolver);
+    public static List<ReferenceResolver> createDiffResolvers(FileContextResolver fileResolver) {
+        List<ReferenceResolver> resolvers = FileContext.createResolvers(fileResolver);
         resolvers.add((context, reference, createAllowed) -> {
             if (createAllowed && reference.getName().endsWith("_")) {
                 String name1 = reference.getName();

IDEA/src/main/java/ksp/kos/ideaplugin/completion/KerboScriptKeywordProvider.kt

@@ -6,6 +6,7 @@ import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.util.ProcessingContext
 import ksp.kos.ideaplugin.Magic
+import java.util.Locale
 
 class KerboScriptKeywordProvider : CompletionProvider<CompletionParameters>() {
     override fun addCompletions(completionParameters: CompletionParameters, context: ProcessingContext, resultSet: CompletionResultSet) {
@@ -15,8 +16,8 @@ class KerboScriptKeywordProvider : CompletionProvider<CompletionParameters>() {
             // when you type in lowercase, the completion shows uppercase (which can be somewhat unreadable when
             // you're not used to it).
             listOf(
-                    LookupElementBuilder.create(it.toString().toUpperCase()),
-                    LookupElementBuilder.create(it.toString().toLowerCase())
+                    LookupElementBuilder.create(it.toString().uppercase(Locale.getDefault())),
+                    LookupElementBuilder.create(it.toString().lowercase(Locale.getDefault()))
             )
         })
     }

IDEA/src/main/java/ksp/kos/ideaplugin/dataflow/ContextBuilder.java

@@ -31,12 +31,14 @@ public void visit(ExpressionVisitor visitor) {
     }
 
     public String getText() {
-        String text = "";
+        StringBuilder text = new StringBuilder();
         for (Flow<?> flow : getList()) {
-            if (!text.isEmpty()) text += "\n";
-            text += flow.getText();
+            if (!text.isEmpty()) {
+				text.append("\n");
+			}
+            text.append(flow.getText());
         }
-        return text;
+        return text.toString();
     }
 
     public void differentiate(LocalContext context, ContextBuilder contextBuilder) {