diff --git a/.github/workflows/idea-gradle-build-and-test.yml b/.github/workflows/idea-gradle-build-and-test.yml index 41323ee..9c3ae35 100644 --- a/.github/workflows/idea-gradle-build-and-test.yml +++ b/.github/workflows/idea-gradle-build-and-test.yml @@ -12,9 +12,9 @@ jobs: # Note: if we wanted, we could expand this to test on multiple OS's runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '21' @@ -24,7 +24,7 @@ jobs: chmod +x gradlew ./gradlew test buildPlugin - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: KerboScript(kOS).zip path: IDEA/build/distributions/KerboScript(kOS).zip diff --git a/IDEA/build.gradle.kts b/IDEA/build.gradle.kts index 60ddae3..4714fa4 100644 --- a/IDEA/build.gradle.kts +++ b/IDEA/build.gradle.kts @@ -43,8 +43,6 @@ dependencies { intellijPlatform { intellijIdeaCommunity("2024.3.4.1") - bundledPlugins(listOf("com.intellij.java")) - testFramework(TestFrameworkType.Platform) } @@ -68,7 +66,7 @@ intellijPlatform { pluginConfiguration { // ... - version = "1.4.0.3" + version = "1.4.0.4" ideaVersion { sinceBuild = "243.25659.59" diff --git a/IDEA/src/main/java/ksp/kos/ideaplugin/highlighting/KerboScriptHighlightFilter.java b/IDEA/src/main/java/ksp/kos/ideaplugin/highlighting/KerboScriptHighlightFilter.java index 6fe38b7..fff1832 100644 --- a/IDEA/src/main/java/ksp/kos/ideaplugin/highlighting/KerboScriptHighlightFilter.java +++ b/IDEA/src/main/java/ksp/kos/ideaplugin/highlighting/KerboScriptHighlightFilter.java @@ -1,6 +1,5 @@ package ksp.kos.ideaplugin.highlighting; -import com.intellij.openapi.compiler.CompilerManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.vfs.VirtualFile; @@ -20,7 +19,6 @@ public KerboScriptHighlightFilter(Project project) { @Override public boolean value(final VirtualFile file) { - return file.getFileType() == KerboScriptFileType.INSTANCE - && !CompilerManager.getInstance(project).isExcludedFromCompilation(file); + return file.getFileType() == KerboScriptFileType.INSTANCE; } } diff --git a/IDEA/src/main/resources/META-INF/plugin.xml b/IDEA/src/main/resources/META-INF/plugin.xml index 79c0d45..0db6b10 100644 --- a/IDEA/src/main/resources/META-INF/plugin.xml +++ b/IDEA/src/main/resources/META-INF/plugin.xml @@ -80,7 +80,7 @@ kOS version supported: 1.4 - com.intellij.modules.java + com.intellij.modules.platform com.intellij.modules.lang @@ -111,17 +111,17 @@ kOS version supported: 1.4 - + - + - +