Skip to content

Commit a72f375

Browse files
authored
Require explicit build optimization flags (#1260)
1 parent 9b275a4 commit a72f375

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/WurstCommands.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,6 @@ public static List<String> getCompileArgs(WFile rootPath, boolean forBuild, Stri
140140
.filter(s -> s.startsWith("-") || (forBuild && s.startsWith("+")))
141141
.map(s -> forBuild && s.startsWith("+") ? "-" + s.substring(1) : s)
142142
.collect(Collectors.toList()));
143-
if (forBuild) {
144-
addBuildDefault(args, "-opt");
145-
addBuildDefault(args, "-inline");
146-
addBuildDefault(args, "-localOptimizations");
147-
}
148143
args.addAll(List.of(additionalArgs));
149144
return WurstBuildConfig.fromWorkspaceRoot(rootPath).applyToCompileArgs(args);
150145
}
@@ -166,10 +161,4 @@ public static List<String> getCompileArgs(WFile rootPath, boolean forBuild, Stri
166161
}
167162
}
168163

169-
private static void addBuildDefault(List<String> args, String option) {
170-
if (!args.contains(option)) {
171-
args.add(option);
172-
}
173-
}
174-
175164
}

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/WurstCommandsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void buildOnlyRunArgsAreExcludedFromRunAndEnabledForBuild() throws Except
3535
assertTrue(buildArgs.contains("-stacktraces"));
3636
assertTrue(buildArgs.contains("-inline"));
3737
assertTrue(buildArgs.contains("-localOptimizations"));
38-
assertTrue(buildArgs.contains("-opt"), "builds enable output optimization by default");
38+
assertFalse(buildArgs.contains("-opt"), "build options require their corresponding '+' entry");
3939
}
4040

4141
@Test

0 commit comments

Comments
 (0)