diff --git a/src/file_type_lsp.zig b/src/file_type_lsp.zig index 01cae91..18f19c6 100644 --- a/src/file_type_lsp.zig +++ b/src/file_type_lsp.zig @@ -104,8 +104,7 @@ pub const julia = .{ pub const kdl = .{}; pub const lua = .{ - .language_server = .{"lua-language-server"}, - .formatter = .{ "stylua", "--indent-type", "{{indent_mode}}", "--indent-width", "{{indent_size}}", "-" }, + .language_server = .{"lua-lsp"}, }; pub const mail = .{}; diff --git a/src/tui/expansion.zig b/src/tui/expansion.zig index 5f34a0c..721509f 100644 --- a/src/tui/expansion.zig +++ b/src/tui/expansion.zig @@ -6,9 +6,7 @@ /// {{selection}} - The current selection of the primary cursor /// {{selections}} - All current selections seperated by NL characters /// {{selectionsZ}} - All current selections separated by NULL characters -/// {{selections*}} - All current selections expanded to multiple quoted arguments -/// {{indent_mode}} - The current indent mode ("tabs" or "spaces") -/// {{indent_size}} - The current indent size (in columns) +/// {{selections*}} All current selections expanded to multiple quoted arguments pub fn expand(allocator: Allocator, arg: []const u8) Error![]const u8 { var result: std.Io.Writer.Allocating = .init(allocator); defer result.deinit(); @@ -142,24 +140,6 @@ const functions = struct { // }; // return results.toOwnedSlice(allocator); // } - - /// {{indent_mode}} - The current indent mode ("tabs" or "spaces") - pub fn indent_mode(allocator: Allocator) Error![]const u8 { - const mv = tui.mainview() orelse return &.{}; - const ed = mv.get_active_editor() orelse return &.{}; - var stream: std.Io.Writer.Allocating = .init(allocator); - try stream.writer.print("{t}", .{ed.indent_mode}); - return stream.toOwnedSlice(); - } - - /// {{indent_size}} - The current indent size (in columns) - pub fn indent_size(allocator: Allocator) Error![]const u8 { - const mv = tui.mainview() orelse return &.{}; - const ed = mv.get_active_editor() orelse return &.{}; - var stream: std.Io.Writer.Allocating = .init(allocator); - try stream.writer.print("{d}", .{ed.indent_size}); - return stream.toOwnedSlice(); - } }; fn get_functions() []struct { []const u8, Function } {