diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/WurstCommands.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/WurstCommands.java index 978174737..a3a596804 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/WurstCommands.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/WurstCommands.java @@ -140,11 +140,6 @@ public static List getCompileArgs(WFile rootPath, boolean forBuild, Stri .filter(s -> s.startsWith("-") || (forBuild && s.startsWith("+"))) .map(s -> forBuild && s.startsWith("+") ? "-" + s.substring(1) : s) .collect(Collectors.toList())); - if (forBuild) { - addBuildDefault(args, "-opt"); - addBuildDefault(args, "-inline"); - addBuildDefault(args, "-localOptimizations"); - } args.addAll(List.of(additionalArgs)); return WurstBuildConfig.fromWorkspaceRoot(rootPath).applyToCompileArgs(args); } @@ -166,10 +161,4 @@ public static List getCompileArgs(WFile rootPath, boolean forBuild, Stri } } - private static void addBuildDefault(List args, String option) { - if (!args.contains(option)) { - args.add(option); - } - } - } diff --git a/de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/WurstCommandsTests.java b/de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/WurstCommandsTests.java index cbc51d451..c6ace509e 100644 --- a/de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/WurstCommandsTests.java +++ b/de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/WurstCommandsTests.java @@ -35,7 +35,7 @@ public void buildOnlyRunArgsAreExcludedFromRunAndEnabledForBuild() throws Except assertTrue(buildArgs.contains("-stacktraces")); assertTrue(buildArgs.contains("-inline")); assertTrue(buildArgs.contains("-localOptimizations")); - assertTrue(buildArgs.contains("-opt"), "builds enable output optimization by default"); + assertFalse(buildArgs.contains("-opt"), "build options require their corresponding '+' entry"); } @Test