From 889c2279db9d2a622d2cd91111897d5e7acb4509 Mon Sep 17 00:00:00 2001
From: Mario Arias <mario@marioarias.org>
Date: Sat, 29 Jul 2023 09:26:02 +0800
Subject: [PATCH 1/4] First steps on autocompletion

---
 .run/Run IDE for UI Tests.run.xml             |  3 +-
 build.gradle.kts                              |  2 +-
 .../kotlin/org/ziglang/jb/toolchain/ZigEnv.kt | 27 ++++++++++
 .../ziglang/jb/toolchain/ZigLocalToolchain.kt | 21 ++++++++
 .../org/ziglang/jb/toolchain/ZigToolchain.kt  | 54 +++++++++++++++++++
 5 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 src/main/kotlin/org/ziglang/jb/toolchain/ZigEnv.kt
 create mode 100644 src/main/kotlin/org/ziglang/jb/toolchain/ZigLocalToolchain.kt
 create mode 100644 src/main/kotlin/org/ziglang/jb/toolchain/ZigToolchain.kt

diff --git a/.run/Run IDE for UI Tests.run.xml b/.run/Run IDE for UI Tests.run.xml
index d4380cc..e860068 100644
--- a/.run/Run IDE for UI Tests.run.xml	
+++ b/.run/Run IDE for UI Tests.run.xml	
@@ -14,11 +14,12 @@
           <option value="runIdeForUiTests" />
         </list>
       </option>
-      <option name="vmOptions" value="" />
+      <option name="vmOptions" value="-Xmx8G" />
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 2c25aea..6bd6749 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.8.10"
+    id("org.jetbrains.kotlin.jvm") version "1.8.20"
     // Gradle IntelliJ Plugin
     id("org.jetbrains.intellij") version "1.13.2"
     // Gradle Changelog Plugin
diff --git a/src/main/kotlin/org/ziglang/jb/toolchain/ZigEnv.kt b/src/main/kotlin/org/ziglang/jb/toolchain/ZigEnv.kt
new file mode 100644
index 0000000..bb51829
--- /dev/null
+++ b/src/main/kotlin/org/ziglang/jb/toolchain/ZigEnv.kt
@@ -0,0 +1,27 @@
+package org.ziglang.jb.toolchain
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+
+
+/**
+ * Created by IntelliJ IDEA.
+ * @author Mario Arias
+ * Date: 23/4/23
+ * Time: 5:22 pm
+ */
+@JsonIgnoreProperties("global_cache_dir")
+data class ZigEnv(
+    @field:JsonProperty("zig_exe")
+    val zigExe: String,
+
+    @field:JsonProperty("lib_dir")
+    val libDir: String,
+
+    @field:JsonProperty("std_dir")
+    val stdDir: String,
+    
+    val version: String,
+
+    val target:String
+)
diff --git a/src/main/kotlin/org/ziglang/jb/toolchain/ZigLocalToolchain.kt b/src/main/kotlin/org/ziglang/jb/toolchain/ZigLocalToolchain.kt
new file mode 100644
index 0000000..9da57e7
--- /dev/null
+++ b/src/main/kotlin/org/ziglang/jb/toolchain/ZigLocalToolchain.kt
@@ -0,0 +1,21 @@
+package org.ziglang.jb.toolchain
+
+import com.intellij.openapi.vfs.VirtualFile
+
+class ZigLocalToolchain(private val env: ZigEnv):ZigToolchain {
+    override fun version(): String = env.version
+
+    override fun executable(): VirtualFile? {
+        TODO("Not yet implemented")
+    }
+
+    override fun libDir(): VirtualFile? {
+        TODO("Not yet implemented")
+    }
+
+    override fun stdLibDir(): VirtualFile? {
+        TODO("Not yet implemented")
+    }
+
+    override fun isValid(): Boolean = true
+}
\ No newline at end of file
diff --git a/src/main/kotlin/org/ziglang/jb/toolchain/ZigToolchain.kt b/src/main/kotlin/org/ziglang/jb/toolchain/ZigToolchain.kt
new file mode 100644
index 0000000..6e6dff1
--- /dev/null
+++ b/src/main/kotlin/org/ziglang/jb/toolchain/ZigToolchain.kt
@@ -0,0 +1,54 @@
+package org.ziglang.jb.toolchain
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.intellij.execution.configurations.GeneralCommandLine
+import com.intellij.execution.process.OSProcessHandler
+import com.intellij.execution.processTools.getResultStdoutStr
+import com.intellij.openapi.vfs.VirtualFile
+import kotlinx.coroutines.runBlocking
+import org.ziglang.jb.ZigLang
+import java.nio.charset.StandardCharsets
+
+interface ZigToolchain {
+    fun version(): String
+    fun executable(): VirtualFile?
+    fun libDir(): VirtualFile?
+    fun stdLibDir(): VirtualFile?
+
+    fun isValid(): Boolean
+
+
+    companion object {
+        private val objectMapper = ObjectMapper().registerModule(KotlinModule.Builder().build())
+        private const val ENV = "env"
+
+        
+
+        fun defaultZigEnv(): ZigEnv? = runBlocking {
+            val zigPath = ZigLang.zigPath ?: return@runBlocking null
+            val commandLine = GeneralCommandLine()
+                .withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE)
+                .withExePath(zigPath)
+                .withParameters(ENV)
+            val handler = OSProcessHandler(commandLine.withCharset(StandardCharsets.UTF_8))
+
+            val envOutput = handler.process.getResultStdoutStr().getOrNull() ?: return@runBlocking null
+            objectMapper.readValue(envOutput, ZigEnv::class.java)
+        }
+
+        val NULL = object : ZigToolchain {
+            override fun version(): String = ""
+
+            override fun executable(): VirtualFile? = null
+
+            override fun libDir(): VirtualFile? = null
+
+            override fun stdLibDir(): VirtualFile? = null
+
+            override fun isValid(): Boolean = false
+
+        }
+    }
+
+}
\ No newline at end of file

From f73e16daaf8a64c4e0a0f001ce183b800e7be520 Mon Sep 17 00:00:00 2001
From: Mario Arias <mario@marioarias.org>
Date: Sat, 29 Jul 2023 20:59:10 +0800
Subject: [PATCH 2/4] Update to latest plugin version

---
 .github/workflows/build.yml                   | 133 ++++++++++++++----
 .github/workflows/release.yml                 |   6 +-
 .github/workflows/run-ui-tests.yml            |   4 +-
 ...with Plugin.run.xml => Run Plugin.run.xml} |   0
 ...Plugin Tests.run.xml => Run Tests.run.xml} |   0
 build.gradle.kts                              |  30 ++--
 gradle.properties                             |  12 +-
 gradle/libs.versions.toml                     |  22 +++
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 qodana.yml                                    |   2 +
 src/main/kotlin/org/ziglang/jb/ZigFileType.kt |   2 +-
 11 files changed, 162 insertions(+), 51 deletions(-)
 rename .run/{Run IDE with Plugin.run.xml => Run Plugin.run.xml} (100%)
 rename .run/{Run Plugin Tests.run.xml => Run Tests.run.xml} (100%)
 create mode 100644 gradle/libs.versions.toml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b40bf9..7dc1280 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ name: Build
 on:
   # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests)
   push:
-    branches: [main]
+    branches: [ main ]
   # Trigger the workflow on any pull request
   pull_request:
 
@@ -31,6 +31,7 @@ jobs:
     outputs:
       version: ${{ steps.properties.outputs.version }}
       changelog: ${{ steps.properties.outputs.changelog }}
+      pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
     steps:
       - name: Maximize Build Space
         run: |
@@ -53,6 +54,9 @@ jobs:
           distribution: zulu
           java-version: 17
 
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       # Set environment variables
       - name: Export Properties
         id: properties
@@ -71,7 +75,47 @@ jobs:
           echo "$CHANGELOG" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
           ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
+      # Build plugin
+      - name: Build plugin
+        run: ./gradlew buildPlugin
+
+      # Prepare plugin archive content for creating artifact
+      - name: Prepare Plugin Artifact
+        id: artifact
+        shell: bash
+        run: |
+          cd ${{ github.workspace }}/build/distributions
+          FILENAME=`ls *.zip`
+          unzip "$FILENAME" -d content
+          echo "filename=${FILENAME:0:-4}" >> $GITHUB_OUTPUT
+      # Store already-built plugin as an artifact for downloading
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.artifact.outputs.filename }}
+          path: ./build/distributions/content/*/*
+
+  # Run tests and upload a code coverage report
+  test:
+    name: Test
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Check out current repository
+      - name: Fetch Sources                   zza
+        uses: actions/checkout@v3
 
+      # Setup Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       # Run tests
       - name: Run Tests
         run: ./gradlew check
@@ -88,16 +132,66 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           files: ${{ github.workspace }}/build/reports/kover/xml/report.xml
+  # Run Qodana inspections and provide report
+  inspectCode:
+    name: Inspect code
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      checks: write
+      pull-requests: write
+    steps:
+
+      # Check out current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v3
+
+      # Setup Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+
+      # Run Qodana inspections
+      - name: Qodana - Code Inspection
+        uses: JetBrains/qodana-action@v2023.1.5
+        with:
+          cache-default-branch-only: true
+
+  # Run plugin structure verification along with IntelliJ Plugin Verifier
+  verify:
+    name: Verify plugin
+    needs: [ build, test, inspectCode ]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Check out current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v3
+
+      # Setup Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       # Cache Plugin Verifier IDEs
       - name: Setup Plugin Verifier IDEs Cache
         uses: actions/cache@v3
         with:
-          path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
+          path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
           key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
 
       # Run Verify Plugin task and IntelliJ Plugin Verifier tool
       - name: Run Plugin Verification tasks
-        run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
+        run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
 
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result
@@ -107,34 +201,12 @@ jobs:
           name: pluginVerifier-result
           path: ${{ github.workspace }}/build/reports/pluginVerifier
 
-      # Run Qodana inspections
-      - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2022.3.4
-
-      # Prepare plugin archive content for creating artifact
-      - name: Prepare Plugin Artifact
-        id: artifact
-        shell: bash
-        run: |
-          cd ${{ github.workspace }}/build/distributions
-          FILENAME=`ls *.zip`
-          unzip "$FILENAME" -d content
-
-          echo "filename=${FILENAME:0:-4}" >> $GITHUB_OUTPUT
-
-      # Store already-built plugin as an artifact for downloading
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ steps.artifact.outputs.filename }}
-          path: ./build/distributions/content/*/*
-
   # Prepare a draft release for GitHub Releases page for the manual verification
   # If accepted and published, release workflow would be triggered
   releaseDraft:
-    name: Release Draft
+    name: Release draft
     if: github.event_name != 'pull_request'
-    needs: build
+    needs: [ build, verify ]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -144,6 +216,13 @@ jobs:
       - name: Fetch Sources
         uses: actions/checkout@v3
 
+      # Setup Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+
       # Remove old release drafts by using the curl request for the available releases with draft flag
       - name: Remove Old Release Drafts
         env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d0be7c4..4affafb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           ref: ${{ github.event.release.tag_name }}
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
@@ -31,6 +31,10 @@ jobs:
           java-version: 17
           cache: gradle
 
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       # Set environment variables
       - name: Export Properties
         id: properties
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
index e1de610..74a0cd3 100644
--- a/.github/workflows/run-ui-tests.yml
+++ b/.github/workflows/run-ui-tests.yml
@@ -41,7 +41,9 @@ jobs:
         with:
           distribution: zulu
           java-version: 17
-          cache: gradle
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       # Run IDEA prepared for UI testing
       - name: Run IDE
diff --git a/.run/Run IDE with Plugin.run.xml b/.run/Run Plugin.run.xml
similarity index 100%
rename from .run/Run IDE with Plugin.run.xml
rename to .run/Run Plugin.run.xml
diff --git a/.run/Run Plugin Tests.run.xml b/.run/Run Tests.run.xml
similarity index 100%
rename from .run/Run Plugin Tests.run.xml
rename to .run/Run Tests.run.xml
diff --git a/build.gradle.kts b/build.gradle.kts
index 6bd6749..cbe2553 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,18 +11,12 @@ fun environment(key: String) = providers.environmentVariable(key)
 plugins {
     // Java support
     id("java")
-    // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.8.20"
-    // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.13.2"
-    // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "2.0.0"
-    // Gradle Qodana Plugin
-    id("org.jetbrains.qodana") version "0.1.13"
-    // Gradle Kover Plugin
-    id("org.jetbrains.kotlinx.kover") version "0.6.1"
-    // Grammar Kit
-    id("org.jetbrains.grammarkit") version "2021.2.2"
+    alias(libs.plugins.kotlin)
+    alias(libs.plugins.gradleIntelliJPlugin)
+    alias(libs.plugins.changelog)
+    alias(libs.plugins.qodana)
+    alias(libs.plugins.kover)
+    alias(libs.plugins.grammarkit)
 }
 
 group = properties("pluginGroup").get()
@@ -70,13 +64,17 @@ qodana {
     showReport.set(environment("QODANA_SHOW_REPORT").map(String::toBoolean).getOrElse(false))
 }
 
-kover.xmlReport {
-    onCheck.set(true)
+koverReport {
+    defaults {
+        xml {
+            onCheck = true
+        }
+    }
 }
 
 // generate code
 val generateZigParser = task<GenerateParserTask>("generateZigParser") {
-    source.set("src/main/kotlin/org/ziglang/jb/grammar/zig.bnf")
+    sourceFile.set(file("src/main/kotlin/org/ziglang/jb/grammar/zig.bnf"))
     targetRoot.set("src/main/gen")
     pathToParser.set("/org/ziglang/jb/psi/parser/ZigParser.java")
     pathToPsiRoot.set("org/ziglang/jb/psi")
@@ -84,7 +82,7 @@ val generateZigParser = task<GenerateParserTask>("generateZigParser") {
 }
 
 val generateZigLexer = task<GenerateLexerTask>("generateZigLexer") {
-    source.set("src/main/kotlin/org/ziglang/jb/grammar/zig.flex")
+    sourceFile.set(file("src/main/kotlin/org/ziglang/jb/grammar/zig.flex"))
     targetDir.set("src/main/gen/org/ziglang/jb/lexer")
     targetClass.set("ZigLexer")
     purgeOldFiles.set(true)
diff --git a/gradle.properties b/gradle.properties
index 3984ebb..3ec259e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,12 +4,12 @@
 pluginGroup = com.github.marioariasc.zigsupport
 pluginName = zig-support
 pluginRepositoryUrl = https://github.com/MarioAriasC/zig-support
-pluginVersion = 0.2.4
+pluginVersion = 0.3.0
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 223
-pluginUntilBuild = 231.*
+pluginUntilBuild = 232.*
 
 
 platformType = IU
@@ -22,7 +22,7 @@ platformPlugins =
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
 javaVersion = 17
 
-gradleVersion = 8.0.2
+gradleVersion = 8.2.1
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
@@ -30,4 +30,8 @@ gradleVersion = 8.0.2
 kotlin.stdlib.default.dependency = false
 
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
-org.gradle.unsafe.configuration-cache = true
\ No newline at end of file
+org.gradle.unsafe.configuration-cache = true
+
+org.gradle.caching = true
+
+systemProp.org.gradle.unsafe.kotlin.assignment = true
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..ebcb113
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,22 @@
+[versions]
+# libraries
+annotations = "24.0.1"
+
+# plugins
+kotlin = "1.9.0"
+changelog = "2.1.2"
+gradleIntelliJPlugin = "1.15.0"
+qodana = "0.1.13"
+kover = "0.7.2"
+grammarkit = "2022.3.1"
+
+[libraries]
+annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
+
+[plugins]
+changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
+qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }
+grammarkit = { id = "org.jetbrains.grammarkit", version.ref = "grammarkit"}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bdc9a83..17a8ddc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/qodana.yml b/qodana.yml
index d7c5065..f388de9 100644
--- a/qodana.yml
+++ b/qodana.yml
@@ -2,6 +2,8 @@
 # https://www.jetbrains.com/help/qodana/qodana-yaml.html
 
 version: 1.0
+linter: jetbrains/qodana-jvm-community:latest
+projectJDK: 17
 profile:
   name: qodana.recommended
 exclude:
diff --git a/src/main/kotlin/org/ziglang/jb/ZigFileType.kt b/src/main/kotlin/org/ziglang/jb/ZigFileType.kt
index 4b18c21..f716f4d 100644
--- a/src/main/kotlin/org/ziglang/jb/ZigFileType.kt
+++ b/src/main/kotlin/org/ziglang/jb/ZigFileType.kt
@@ -14,7 +14,7 @@ object ZigFileType : LanguageFileType(ZigLang) {
 
     override fun getIcon(): Icon = ZigIcons.file
 
-    override fun getCharset(file: VirtualFile, content: ByteArray?): String = CHARSET
+    override fun getCharset(file: VirtualFile, content: ByteArray): String = CHARSET
     
     private const val CHARSET = "UTF-8"
 }
\ No newline at end of file

From f3d0e5950056397367a7b05ba8be9f8e8c758118 Mon Sep 17 00:00:00 2001
From: Mario Arias <mario@marioarias.org>
Date: Sun, 30 Jul 2023 09:57:31 +0800
Subject: [PATCH 3/4] Delete unused classes

---
 .../jb/runner/ZigCommandConfiguration.kt      | 22 -------
 .../jb/runner/ZigCompilerOutputFilter.kt      | 32 ----------
 .../jb/runner/ZigConfigurationFactory.kt      | 18 ------
 .../ziglang/jb/runner/ZigProcessHandler.kt    | 14 -----
 .../org/ziglang/jb/runner/ZigRunState.kt      | 25 --------
 .../kotlin/org/ziglang/jb/runner/ZigRunner.kt | 28 ---------
 .../ziglang/jb/runner/ZigRunnerConfigType.kt  | 11 ----
 .../runner/ZigRunningConfigurationEditor.kt   | 63 -------------------
 8 files changed, 213 deletions(-)
 delete mode 100644 src/main/kotlin/org/ziglang/jb/runner/ZigCommandConfiguration.kt
 delete mode 100644 src/main/kotlin/org/ziglang/jb/runner/ZigCompilerOutputFilter.kt
 delete mode 100644 src/main/kotlin/org/ziglang/jb/runner/ZigConfigurationFactory.kt
 delete mode 100644 src/main/kotlin/org/ziglang/jb/runner/ZigProcessHandler.kt
 delete mode 100644 src/main/kotlin/org/ziglang/jb/runner/ZigRunState.kt
 delete mode 100644 src/main/kotlin/org/ziglang/jb/runner/ZigRunner.kt
 delete mode 100644 src/main/kotlin/org/ziglang/jb/runner/ZigRunnerConfigType.kt
 delete mode 100644 src/main/kotlin/org/ziglang/jb/runner/ZigRunningConfigurationEditor.kt

diff --git a/src/main/kotlin/org/ziglang/jb/runner/ZigCommandConfiguration.kt b/src/main/kotlin/org/ziglang/jb/runner/ZigCommandConfiguration.kt
deleted file mode 100644
index 7c529d3..0000000
--- a/src/main/kotlin/org/ziglang/jb/runner/ZigCommandConfiguration.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.ziglang.jb.runner
-
-import com.intellij.execution.Executor
-import com.intellij.execution.configurations.ConfigurationFactory
-import com.intellij.execution.configurations.LocatableConfigurationBase
-import com.intellij.execution.configurations.RunConfiguration
-import com.intellij.execution.configurations.RunProfileState
-import com.intellij.execution.runners.ExecutionEnvironment
-import com.intellij.openapi.options.SettingsEditor
-import com.intellij.openapi.project.Project
-
-class ZigCommandConfiguration(project: Project, factory: ConfigurationFactory, name: String) :
-    LocatableConfigurationBase<RunProfileState>(project, factory, name) {
-
-    var command = ""
-    var args = ""
-
-    override fun getState(executor: Executor, environment: ExecutionEnvironment): RunProfileState =
-        ZigRunState(environment, this)
-
-    override fun getConfigurationEditor(): SettingsEditor<out RunConfiguration> = ZigRunningConfigurationEditor()
-}
\ No newline at end of file
diff --git a/src/main/kotlin/org/ziglang/jb/runner/ZigCompilerOutputFilter.kt b/src/main/kotlin/org/ziglang/jb/runner/ZigCompilerOutputFilter.kt
deleted file mode 100644
index 6981641..0000000
--- a/src/main/kotlin/org/ziglang/jb/runner/ZigCompilerOutputFilter.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.ziglang.jb.runner
-
-import com.intellij.execution.filters.Filter
-import com.intellij.execution.filters.OpenFileHyperlinkInfo
-import com.intellij.execution.runners.ExecutionEnvironment
-import com.intellij.openapi.project.DumbAware
-import kotlin.math.max
-
-class ZigCompilerOutputFilter(private val environment: ExecutionEnvironment) : Filter, DumbAware {
-    companion object {
-        private val lineRegex = "^(.*.zig):(\\d*):(\\d*):.*\n".toRegex()
-    }
-
-    override fun applyFilter(line: String, entireLength: Int): Filter.Result? {
-        val matchResult = lineRegex.matchEntire(line) ?: return null
-        val filePath = matchResult.groups[1]!!.value
-        val lineNumber = max(0, matchResult.groups[2]!!.value.toInt() - 1)
-        val columnNumber = max(0, matchResult.groups[3]!!.value.toInt() - 1)
-
-        val file = environment.project.baseDir?.findFileByRelativePath(filePath) ?: return null
-        val link = OpenFileHyperlinkInfo(environment.project, file, lineNumber, columnNumber)
-        val lineStart = entireLength - line.length
-        val end = matchResult.groups[1]!!.range.last
-        return Filter.Result(
-            lineStart + matchResult.groups[1]!!.range.first,
-            lineStart + end + 1,
-            link,
-            false
-        )
-    }
-
-}
diff --git a/src/main/kotlin/org/ziglang/jb/runner/ZigConfigurationFactory.kt b/src/main/kotlin/org/ziglang/jb/runner/ZigConfigurationFactory.kt
deleted file mode 100644
index 9904dab..0000000
--- a/src/main/kotlin/org/ziglang/jb/runner/ZigConfigurationFactory.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ziglang.jb.runner
-
-import com.intellij.execution.configurations.ConfigurationFactory
-import com.intellij.execution.configurations.RunConfiguration
-import com.intellij.openapi.project.Project
-
-class ZigConfigurationFactory(type: ZigRunnerConfigType) : ConfigurationFactory(type) {
-
-    companion object {
-        const val CONFIGURATION_ID = "Zig"
-    }
-
-    override fun getId(): String = CONFIGURATION_ID
-
-    override fun createTemplateConfiguration(project: Project): RunConfiguration {
-        return ZigCommandConfiguration(project, this, "Zig")
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/org/ziglang/jb/runner/ZigProcessHandler.kt b/src/main/kotlin/org/ziglang/jb/runner/ZigProcessHandler.kt
deleted file mode 100644
index b47b697..0000000
--- a/src/main/kotlin/org/ziglang/jb/runner/ZigProcessHandler.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ziglang.jb.runner
-
-import com.intellij.execution.configurations.GeneralCommandLine
-import com.intellij.execution.process.AnsiEscapeDecoder
-import com.intellij.execution.process.KillableProcessHandler
-import com.intellij.openapi.util.Key
-
-class ZigProcessHandler(cmdLine: GeneralCommandLine) : KillableProcessHandler(cmdLine),
-    AnsiEscapeDecoder.ColoredTextAcceptor {
-    override fun coloredTextAvailable(text: String, attributes: Key<*>) {
-        super.notifyTextAvailable(text, attributes)
-    }
-
-}
diff --git a/src/main/kotlin/org/ziglang/jb/runner/ZigRunState.kt b/src/main/kotlin/org/ziglang/jb/runner/ZigRunState.kt
deleted file mode 100644
index 940e1b8..0000000
--- a/src/main/kotlin/org/ziglang/jb/runner/ZigRunState.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.ziglang.jb.runner
-
-import com.intellij.execution.configurations.CommandLineState
-import com.intellij.execution.configurations.GeneralCommandLine
-import com.intellij.execution.process.ProcessHandler
-import com.intellij.execution.process.ProcessTerminatedListener
-import com.intellij.execution.runners.ExecutionEnvironment
-
-class ZigRunState(environment: ExecutionEnvironment, private val config: ZigCommandConfiguration) :
-    CommandLineState(environment) {
-
-    init {
-        addConsoleFilters(ZigCompilerOutputFilter(environment))
-    }
-
-    override fun startProcess(): ProcessHandler {
-        val cmds = mutableListOf(config.command)
-        cmds.addAll(config.args.split(" "))
-        val cmdLine = GeneralCommandLine(cmds).withWorkDirectory(environment.project.basePath)
-
-        val handler = ZigProcessHandler(cmdLine)
-        ProcessTerminatedListener.attach(handler)
-        return handler
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/org/ziglang/jb/runner/ZigRunner.kt b/src/main/kotlin/org/ziglang/jb/runner/ZigRunner.kt
deleted file mode 100644
index 757ec51..0000000
--- a/src/main/kotlin/org/ziglang/jb/runner/ZigRunner.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.ziglang.jb.runner
-
-import com.intellij.execution.ExecutionManager
-import com.intellij.execution.configurations.RunProfile
-import com.intellij.execution.configurations.RunnerSettings
-import com.intellij.execution.runners.ExecutionEnvironment
-import com.intellij.execution.runners.ProgramRunner
-import com.intellij.execution.runners.executeState
-import org.jetbrains.concurrency.resolvedPromise
-
-open class ZigRunner : ProgramRunner<RunnerSettings> {
-
-    companion object {
-        const val RUNNER_ID = "Zig"
-    }
-
-    override fun getRunnerId(): String = RUNNER_ID
-
-    override fun canRun(executorId: String, profile: RunProfile): Boolean = true
-
-    @Suppress("UnstableApiUsage")
-    override fun execute(environment: ExecutionEnvironment) {
-        val state = environment.state ?: return
-        ExecutionManager.getInstance(environment.project).startRunProfile(environment) {
-            resolvedPromise(executeState(state, environment, this))
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/org/ziglang/jb/runner/ZigRunnerConfigType.kt b/src/main/kotlin/org/ziglang/jb/runner/ZigRunnerConfigType.kt
deleted file mode 100644
index 0e49a9c..0000000
--- a/src/main/kotlin/org/ziglang/jb/runner/ZigRunnerConfigType.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.ziglang.jb.runner
-
-import com.intellij.execution.configurations.ConfigurationTypeBase
-import org.ziglang.jb.ZigIcons
-
-class ZigRunnerConfigType :
-    ConfigurationTypeBase("ZigRunnerConfiguration", "Zig", "Zig command run configuration", ZigIcons.zig) {
-        init {
-            addFactory(ZigConfigurationFactory(this))
-        }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/org/ziglang/jb/runner/ZigRunningConfigurationEditor.kt b/src/main/kotlin/org/ziglang/jb/runner/ZigRunningConfigurationEditor.kt
deleted file mode 100644
index 30998c8..0000000
--- a/src/main/kotlin/org/ziglang/jb/runner/ZigRunningConfigurationEditor.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.ziglang.jb.runner
-
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.fileChooser.FileChooserDescriptor
-import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
-import com.intellij.openapi.options.SettingsEditor
-import com.intellij.openapi.ui.TextComponentAccessor
-import com.intellij.openapi.ui.TextFieldWithBrowseButton
-import com.intellij.ui.DocumentAdapter
-import com.intellij.ui.EditorTextField
-import com.intellij.ui.components.Label
-import com.intellij.ui.layout.CCFlags
-import com.intellij.ui.layout.panel
-import javax.swing.JComponent
-import javax.swing.event.DocumentEvent
-
-class ZigRunningConfigurationEditor : SettingsEditor<ZigCommandConfiguration>() {
-
-    private val command =
-        pathTextField(FileChooserDescriptorFactory.createSingleFileDescriptor(), this, "Path to Zig compiler")
-            .apply { isEnabled = true }
-
-    private val args = EditorTextField("")
-
-    override fun resetEditorFrom(s: ZigCommandConfiguration) {
-        command.text = s.command
-        args.text = s.args
-    }
-
-    override fun applyEditorTo(s: ZigCommandConfiguration) {
-        s.command = command.text
-        s.args = args.text
-    }
-
-    override fun createEditor(): JComponent = panel {
-        val label = Label("&Zig:").apply { labelFor = command }
-        row(label) {
-            command(CCFlags.pushX, CCFlags.growX)
-        }
-
-        val argLabel = Label("&Args:").apply { labelFor = args }
-        row(argLabel) {
-            args(CCFlags.pushX, CCFlags.growX)
-        }
-    }
-
-
-    private fun pathTextField(
-        descriptor: FileChooserDescriptor,
-        disposable: Disposable,
-        title: String,
-        onTextChanged: () -> Unit = {}
-    ): TextFieldWithBrowseButton = TextFieldWithBrowseButton(null, disposable).apply {
-        addBrowseFolderListener(title, null, null, descriptor, TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT)
-        childComponent.document.addDocumentListener(object : DocumentAdapter() {
-            override fun textChanged(e: DocumentEvent) {
-                onTextChanged()
-            }
-        })
-    }
-}
-
-

From 29e6def92aa6145bb392ba4b5ae3a3ded9bd07e0 Mon Sep 17 00:00:00 2001
From: Mario Arias <mario@marioarias.org>
Date: Sun, 30 Jul 2023 11:08:56 +0800
Subject: [PATCH 4/4] Version 0.2.5

---
 CHANGELOG.md      | 4 ++++
 gradle.properties | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 799d21a..efbf951 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+### Added
+- Support for the new IDEA platform version 2023.2
+- Updated to the latest JetBrain's IntelliJ platform plugin version.
+
 ## [0.2.4] - 2023-04-08
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
index 3ec259e..26c027a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@
 pluginGroup = com.github.marioariasc.zigsupport
 pluginName = zig-support
 pluginRepositoryUrl = https://github.com/MarioAriasC/zig-support
-pluginVersion = 0.3.0
+pluginVersion = 0.2.5
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.