Full migration to LSP4IJ

Signed-off-by: Uladzislau <[email protected]>

intellij-plugin/.github/workflows/build.yml → .github/workflows/build.yml

@@ -3,9 +3,16 @@ name: Build
 on: [push, workflow_dispatch]
 
 jobs:
-  build:
+  build-intellij:
     runs-on: ubuntu-latest
+    # Changing WORKING_DIRECTORY, don't forget to change defaults.run.working-directory
+    env:
+      WORKING_DIRECTORY: intellij-plugin
+    defaults:
+      run:
+        working-directory: ./intellij-plugin
     steps:
+
       - name: Checkout the plugin GitHub repository
         uses: actions/checkout@v4
 
@@ -24,6 +31,10 @@ jobs:
         shell: bash
         run: pwd && ls -la
 
+      - name: Test plugin
+        shell: bash
+        run: ./gradlew test
+
       - name: Build plugin
         shell: bash
         run: ./gradlew buildPlugin
@@ -32,7 +43,7 @@ jobs:
         id: artifact
         shell: bash
         run: |
-          cd ${{ github.workspace }}/build/distributions
+          cd ${{ github.workspace }}/${{ env.WORKING_DIRECTORY }}/build/distributions
           FILENAME=`ls *.zip`
           unzip "$FILENAME" -d content
           echo "filename=${FILENAME:0:-4}" >> $GITHUB_OUTPUT
@@ -43,4 +54,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact.outputs.filename }}
-          path: ./build/distributions/content/*/*
+          path: ./${{ env.WORKING_DIRECTORY }}/build/distributions/content/*/*

intellij-plugin/build.gradle.kts

@@ -1,11 +1,15 @@
 /*
+ * Copyright (c) 2024 IBA Group.
+ *
  * This program and the accompanying materials are made available under the terms of the
  * Eclipse Public License v2.0 which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-v20.html
  *
  * SPDX-License-Identifier: EPL-2.0
  *
- * Copyright Contributors to the Zowe Project
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
  */
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -16,10 +20,15 @@ plugins {
   id("java")
   id("org.jetbrains.kotlin.jvm") version "1.9.21"
   id("org.jetbrains.intellij") version "1.16.1"
+  id("org.jetbrains.kotlinx.kover") version "0.8.1"
 }
 
 group = properties("pluginGroup").get()
 version = properties("pluginVersion").get()
+val lsp4ijVersion = "0.3.0"
+val kotestVersion = "5.9.1"
+val mockkVersion = "1.13.11"
+val junitVersion = "1.10.2"
 
 repositories {
   mavenCentral()
@@ -29,7 +38,22 @@ repositories {
 // Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
 intellij {
   version.set(properties("platformVersion").get())
-  plugins.set(listOf("org.jetbrains.plugins.textmate", "com.redhat.devtools.lsp4ij:0.0.1"))
+  //  pluginsRepositories {
+  //    custom("https://plugins.jetbrains.com/plugins/nightly/23257")
+  //  }
+  plugins.set(listOf("org.jetbrains.plugins.textmate", "com.redhat.devtools.lsp4ij:$lsp4ijVersion"))
+}
+
+dependencies {
+  // ===== Test env setup =====
+  // Kotest
+  testImplementation("io.kotest:kotest-runner-junit5:$kotestVersion")
+  testImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
+  // MockK
+  testImplementation("io.mockk:mockk:$mockkVersion")
+  // JUnit Platform (needed for Kotest)
+  testImplementation("org.junit.platform:junit-platform-launcher:$junitVersion")
+  // ==========================
 }
 
 tasks {
@@ -43,8 +67,16 @@ tasks {
   }
 
   patchPluginXml {
-    version.set(properties("pluginVersion").get())
-    sinceBuild.set(properties("pluginSinceBuild").get())
-    untilBuild.set(properties("pluginUntilBuild").get())
+    version = properties("pluginVersion")
+    sinceBuild = properties("pluginSinceBuild")
+    untilBuild = properties("pluginUntilBuild")
+  }
+
+  test {
+    useJUnitPlatform()
+    testLogging {
+      events("passed", "skipped", "failed")
+    }
+    finalizedBy("koverHtmlReport")
   }
 }

intellij-plugin/gradle.properties

@@ -16,4 +16,3 @@ pluginGroup = org.zowe
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 232
-pluginUntilBuild = 241.*

intellij-plugin/src/main/kotlin/org/zowe/pli/PliProjectManagerListener.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2024 IBA Group.
+ *
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   IBA Group
+ *   Zowe Community
+ */
+
+package org.zowe.pli
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.ProjectManager
+import com.intellij.openapi.project.ProjectManagerListener
+import org.zowe.pli.state.PliPluginState
+import org.zowe.pli.state.InitializationOnly
+import org.zowe.pli.state.LanguageSupportStateService
+
+/** PL/I project manager listener. Listens to projects changes and react to them respectively */
+class PliProjectManagerListener : ProjectManagerListener {
+
+  /**
+   * Delete TextMate bundle if the last opened project is being closed
+   * (the only possible way to handle plug-in's TextMate bundle to be deleted when the plug-in is uninstalled)
+   */
+  @OptIn(InitializationOnly::class)
+  override fun projectClosing(project: Project) {
+    val lsStateService = LanguageSupportStateService.instance
+    val pluginState = lsStateService.getPluginState(project) { PliPluginState(project) }
+
+    if (isLastProjectClosing() && (pluginState.isLSPClientReady() || pluginState.isLSPServerConnectionReady())) {
+      pluginState.unloadLSPClient {}
+      pluginState.finishDeinitialization {}
+    }
+  }
+
+  /** Check if the project being closed is the last one that was opened */
+  private fun isLastProjectClosing(): Boolean {
+    return ProjectManager.getInstance().openProjects.size == 1
+  }
+
+}