diff --git a/src/file_type_lsp.zig b/src/file_type_lsp.zig index 83f0bf3b..d7bf03d3 100644 --- a/src/file_type_lsp.zig +++ b/src/file_type_lsp.zig @@ -183,9 +183,7 @@ pub const python = .{ pub const regex = .{}; -pub const rpmspec = .{ - .language_server = .{ "python3", "-mrpm_spec_language_server", "--stdio" }, -}; +pub const rpmspec = .{}; pub const rst = .{ .language_server = .{"esbonio"}, @@ -235,10 +233,7 @@ pub const xml = .{ .formatter = .{ "xmllint", "--format", "-" }, }; -pub const yaml = .{ - .language_server = .{ "yaml-language-server", "--stdio" }, - .formatter = .{ "prettier", "--parser", "yaml" }, -}; +pub const yaml = .{}; pub const zig = .{ .language_server = .{"zls"}, diff --git a/src/tui/mode/overlay/completion_dropdown.zig b/src/tui/mode/overlay/completion_dropdown.zig index a9a20786..ceb7a340 100644 --- a/src/tui/mode/overlay/completion_dropdown.zig +++ b/src/tui/mode/overlay/completion_dropdown.zig @@ -87,9 +87,8 @@ pub fn load_entries(self: *Type) !usize { const less_fn = struct { fn less_fn(_: void, lhs: Entry, rhs: Entry) bool { - const sort_text_equal = std.mem.eql(u8, lhs.sort_text, rhs.sort_text); - const lhs_str = if (!sort_text_equal and lhs.sort_text.len > 0) lhs.sort_text else lhs.label; - const rhs_str = if (!sort_text_equal and rhs.sort_text.len > 0) rhs.sort_text else rhs.label; + const lhs_str = if (lhs.sort_text.len > 0) lhs.sort_text else lhs.label; + const rhs_str = if (rhs.sort_text.len > 0) rhs.sort_text else rhs.label; return std.mem.order(u8, lhs_str, rhs_str) == .lt; } }.less_fn; diff --git a/src/tui/mode/overlay/completion_palette.zig b/src/tui/mode/overlay/completion_palette.zig index c6e6723a..ae8f9d26 100644 --- a/src/tui/mode/overlay/completion_palette.zig +++ b/src/tui/mode/overlay/completion_palette.zig @@ -69,9 +69,8 @@ pub fn load_entries(palette: *Type) !usize { const less_fn = struct { fn less_fn(_: void, lhs: Entry, rhs: Entry) bool { - const sort_text_equal = std.mem.eql(u8, lhs.sort_text, rhs.sort_text); - const lhs_str = if (!sort_text_equal and lhs.sort_text.len > 0) lhs.sort_text else lhs.label; - const rhs_str = if (!sort_text_equal and rhs.sort_text.len > 0) rhs.sort_text else rhs.label; + const lhs_str = if (lhs.sort_text.len > 0) lhs.sort_text else lhs.label; + const rhs_str = if (rhs.sort_text.len > 0) rhs.sort_text else rhs.label; return std.mem.order(u8, lhs_str, rhs_str) == .lt; } }.less_fn;