Skip to content

Commit bceeef5

Browse files
committed
fix compileServer plugin issue
1 parent 0b976b4 commit bceeef5

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,10 @@ dependencies {
106106
testFramework(TestFrameworkType.Bundled)
107107
testFramework(TestFrameworkType.Plugin.Java)
108108

109+
pluginModule(implementation(project(":jps-plugin")))
110+
pluginModule(implementation(project(":common")))
111+
109112
pluginComposedModule(implementation(project(":hxcpp-debugger-protocol")))
110-
pluginComposedModule(implementation(project(":jps-plugin")))
111113
pluginComposedModule(implementation(project(":common")))
112114

113115
}

src/main/java/com/intellij/plugins/haxe/compilation/HaxeCompiler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ private static HaxeCommonCompilerUtil.CompilationContext createCompilationContex
210210

211211
HaxeTestsConfiguration haxeTestsConfiguration = null;
212212

213-
if(configuration != null && configuration instanceof HaxeTestsConfiguration) {
214-
haxeTestsConfiguration = (HaxeTestsConfiguration)configuration;
213+
if(configuration != null && configuration instanceof HaxeTestsConfiguration testsConfiguration) {
214+
haxeTestsConfiguration = testsConfiguration;
215215
}
216216

217217
final HaxeTestsConfiguration finalHaxeTestsConfiguration = haxeTestsConfiguration;
@@ -366,6 +366,7 @@ public String getModuleDirPath() {
366366
}
367367

368368
private static boolean isDebug(Module module, ModuleBasedConfiguration configuration) {
369+
if(configuration == null) return false;
369370
String name = RunnerAndConfigurationSettingsImpl.getUniqueIdFor(configuration);
370371
return ExecutionManagerImpl.getInstance(module.getProject()).isStarting(name, DefaultDebugExecutor.EXECUTOR_ID, HaxeDebugRunner.HAXE_DEBUG_RUNNER_ID);
371372
}

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<iconMapper mappingFile="HaxeIconMappings.json"/>
5454
<!-- NOTE: Looks like intellij-platform-gradle-plugin 2.7.0 prefixes all extra jars with rootProject.name-->
55-
<compileServer.plugin id="haxe" classpath="Haxe-plugin.jps-plugin.jar;Haxe-plugin.common.jar"/>
55+
<compileServer.plugin id="haxe" classpath="modules/Haxe-plugin.jps-plugin.jar;modules/Haxe-plugin.common.jar"/>
5656
<testFinder implementation="com.intellij.plugins.haxe.ide.HaxeTestFinder"/>
5757

5858
<iconProvider implementation="com.intellij.plugins.haxe.ide.HaxeIconProvider"/>

0 commit comments

Comments
 (0)