condese small expanded things

This commit is contained in:
Meghan Denny 2021-09-30 17:52:36 -07:00
parent 8390aaa70b
commit 7c209a8404
2 changed files with 3 additions and 9 deletions

View File

@ -1168,10 +1168,7 @@ fn loadConfigFile(file_path: []const u8) ?Config {
} }
fn loadConfigInFolder(folder_path: []const u8) ?Config { fn loadConfigInFolder(folder_path: []const u8) ?Config {
const full_path = std.fs.path.resolve(allocator, &.{ const full_path = std.fs.path.resolve(allocator, &.{ folder_path, "zls.json" }) catch return null;
folder_path,
"zls.json",
}) catch return null;
defer allocator.free(full_path); defer allocator.free(full_path);
return loadConfigFile(full_path); return loadConfigFile(full_path);
} }

View File

@ -105,7 +105,7 @@ pub fn wizard(allocator: *std.mem.Allocator) !void {
.operator_completions = operator_completions, .operator_completions = operator_completions,
.include_at_in_builtins = include_at_in_builtins, .include_at_in_builtins = include_at_in_builtins,
.max_detail_length = max_detail_length, .max_detail_length = max_detail_length,
}, std.json.StringifyOptions{}, out); }, .{}, out);
write("successful.\n\n\n\n"); write("successful.\n\n\n\n");
@ -230,10 +230,7 @@ pub fn findZig(allocator: *std.mem.Allocator) !?[]const u8 {
if (std.builtin.os.tag == .windows) { if (std.builtin.os.tag == .windows) {
if (std.mem.indexOfScalar(u8, path, '/') != null) continue; if (std.mem.indexOfScalar(u8, path, '/') != null) continue;
} }
const full_path = try std.fs.path.join(allocator, &[_][]const u8{ const full_path = try std.fs.path.join(allocator, &[_][]const u8{ path, zig_exe });
path,
zig_exe,
});
defer allocator.free(full_path); defer allocator.free(full_path);
if (!std.fs.path.isAbsolute(full_path)) continue; if (!std.fs.path.isAbsolute(full_path)) continue;