Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/idea-gradle-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
4 changes: 1 addition & 3 deletions IDEA/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ dependencies {
intellijPlatform {
intellijIdeaCommunity("2024.3.4.1")

bundledPlugins(listOf("com.intellij.java"))

testFramework(TestFrameworkType.Platform)
}

Expand All @@ -68,7 +66,7 @@ intellijPlatform {
pluginConfiguration {
// ...

version = "1.4.0.3"
version = "1.4.0.4"

ideaVersion {
sinceBuild = "243.25659.59"
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
}
}
8 changes: 4 additions & 4 deletions IDEA/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ kOS version supported: 1.4

<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
on how to target different products -->
<depends>com.intellij.modules.java</depends>
<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.modules.lang</depends>

<extensions defaultExtensionNs="com.intellij">
Expand Down Expand Up @@ -111,17 +111,17 @@ kOS version supported: 1.4
</action>
<action id="ksp.kos.ideaplugin.actions.differentiate.Differentiate" class="ksp.kos.ideaplugin.actions.differentiate.Differentiate"
text="Differentiate..." description="Compute a derivative">
<add-to-group group-id="RefactoringMenu4" anchor="last"/>
<!-- <add-to-group group-id="RefactoringMenu4" anchor="last"/>-->
<keyboard-shortcut first-keystroke="control alt D" keymap="$default"/>
</action>
<action id="ksp.kos.ideaplugin.actions.Simplify" class="ksp.kos.ideaplugin.actions.Simplify" text="Simplify..."
description="Simplifies expression">
<add-to-group group-id="RefactoringMenu4" anchor="last"/>
<!-- <add-to-group group-id="RefactoringMenu4" anchor="last"/>-->
<keyboard-shortcut keymap="$default" first-keystroke="shift ctrl S"/>
</action>
<action id="ksp.kos.ideaplugin.actions.Normalize" class="ksp.kos.ideaplugin.actions.Normalize" text="Normalize..."
description="Normalizes expression">
<add-to-group group-id="RefactoringMenu4" anchor="last"/>
<!-- <add-to-group group-id="RefactoringMenu4" anchor="last"/>-->
<keyboard-shortcut keymap="$default" first-keystroke="shift ctrl O"/>
</action>
</actions>
Expand Down