Skip to content
Merged
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
9 changes: 8 additions & 1 deletion src/zls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,12 @@ function configurationMiddleware(params: ConfigurationParams): LSPAny[] | Respon
if (typeof value === "string") {
// Make sure that `""` gets converted to `undefined` and resolve predefined values
value = value ? zigUtil.handleConfigOption(value, workspaceFolder ?? "guess") : undefined;
} else if (typeof value === "object" && value !== null && !Array.isArray(value)) {
} else if (Array.isArray(value)) {
value = value.map((elem: unknown) => {
if (typeof elem !== "string") return elem;
return zigUtil.handleConfigOption(elem, workspaceFolder ?? "guess");
});
} else if (typeof value === "object" && value !== null) {
// Recursively update the config options
const newValue: Record<string, unknown> = {};
for (const [fieldName, fieldValue] of Object.entries(value)) {
Expand Down Expand Up @@ -212,9 +217,11 @@ function configurationMiddleware(params: ConfigurationParams): LSPAny[] | Respon

switch (configuration.get<"off" | "auto" | "extension" | "zls">("buildOnSaveProvider", "auto")) {
case "auto":
additionalOptions["buildOnSaveArgs"] = configuration.get("buildOnSaveArgs");
break;
case "zls":
additionalOptions["enableBuildOnSave"] = true;
additionalOptions["buildOnSaveArgs"] = configuration.get("buildOnSaveArgs");
break;
case "off":
case "extension":
Expand Down