mui-lsp 0.1.1 → 0.3.0

data/lib/mui/lsp/plugin.rb

@@ -6,7 +6,7 @@ module Mui
   module Lsp
     # Main plugin class for mui-lsp
     # Registers commands and keymaps for LSP integration
-    class Plugin < Mui::Plugin
+    class Plugin < Mui::Plugin # rubocop:disable Metrics/ClassLength
       name "lsp"
 
       def setup
@@ -44,6 +44,11 @@ module Mui
           handle_lsp_definition(ctx)
         end
 
+        # :LspTypeDefinition - Go to type definition
+        command(:LspTypeDefinition) do |ctx, _args|
+          handle_lsp_type_definition(ctx)
+        end
+
         # :LspReferences - Show references
         command(:LspReferences) do |ctx, _args|
           handle_lsp_references(ctx)
@@ -78,6 +83,11 @@ module Mui
         command(:LspOpen) do |ctx, _args|
           handle_lsp_open(ctx)
         end
+
+        # :LspFormat - Format current file
+        command(:LspFormat) do |ctx, _args|
+          handle_lsp_format(ctx)
+        end
       end
 
       def register_keymaps
@@ -87,75 +97,84 @@ module Mui
           true
         end
 
-        # Leader key (\) - start pending mode
-        keymap(:normal, "\\") do |_ctx|
-          @leader_pending = true
+        # <Space>df - Go to definition
+        keymap(:normal, "<Space>df") do |ctx|
+          handle_lsp_definition(ctx)
           true
         end
 
-        # \d - Go to definition
-        keymap(:normal, "d") do |ctx|
-          if @leader_pending
-            @leader_pending = false
-            handle_lsp_definition(ctx)
-            true
-          else
-            false # Let default 'd' handle it
-          end
+        # <Space>tf - Go to type definition (toggle between .rb and .rbs)
+        keymap(:normal, "<Space>tf") do |ctx|
+          handle_lsp_jump_to_type_file(ctx)
+          true
         end
 
-        # \r - Go to references
-        keymap(:normal, "r") do |ctx|
-          if @leader_pending
-            @leader_pending = false
-            handle_lsp_references(ctx)
-            true
-          else
-            false # Let default 'r' handle it
-          end
+        # <Space>rf - Find references
+        keymap(:normal, "<Space>rf") do |ctx|
+          handle_lsp_references(ctx)
+          true
         end
 
-        # \h - Show hover (alternative to K)
-        keymap(:normal, "h") do |ctx|
-          if @leader_pending
-            @leader_pending = false
-            handle_lsp_hover(ctx)
-            true
-          else
-            false # Let default 'h' handle it
-          end
+        # <Space>hf - Show hover (alternative to K)
+        keymap(:normal, "<Space>hf") do |ctx|
+          handle_lsp_hover(ctx)
+          true
         end
 
-        # \c - Show completion
-        keymap(:normal, "c") do |ctx|
-          if @leader_pending
-            @leader_pending = false
-            handle_lsp_completion(ctx)
-            true
-          else
-            false # Let default 'c' handle it
-          end
+        # <Space>cf - Show completion
+        keymap(:normal, "<Space>cf") do |ctx|
+          handle_lsp_completion(ctx)
+          true
         end
 
-        # \e - Show diagnostic at cursor
-        keymap(:normal, "e") do |ctx|
-          if @leader_pending
-            @leader_pending = false
-            handle_lsp_diagnostic_show(ctx)
-            true
-          else
-            false # Let default 'e' handle it
-          end
+        # <Space>ef - Show diagnostic at cursor
+        keymap(:normal, "<Space>ef") do |ctx|
+          handle_lsp_diagnostic_show(ctx)
+          true
         end
 
-        # Cancel leader pending on any other key (via Escape)
-        keymap(:normal, "\e") do |_ctx|
-          if @leader_pending
-            @leader_pending = false
-            true
-          else
-            false
-          end
+        # <Space>ff - Format current file
+        keymap(:normal, "<Space>ff") do |ctx|
+          handle_lsp_format(ctx)
+          true
+        end
+
+        # Insert mode: Ctrl+Space - Trigger LSP completion
+        keymap(:insert, "\x00") do |ctx|
+          handle_lsp_completion(ctx)
+          true
+        end
+
+        # Picker navigation: Leader+Enter - open selected
+        keymap(:normal, "<Leader><CR>") do |ctx|
+          next unless picker_active?(ctx.editor)
+
+          handle_picker_select(ctx, new_tab: false)
+          true
+        end
+
+        # Picker navigation: Ctrl+t - open in new tab
+        keymap(:normal, "<C-t>") do |ctx|
+          next unless picker_active?(ctx.editor)
+
+          handle_picker_select(ctx, new_tab: true)
+          true
+        end
+
+        # Picker navigation: Leader+q - close picker
+        keymap(:normal, "<Leader>q") do |ctx|
+          next unless picker_active?(ctx.editor)
+
+          close_picker(ctx.editor)
+          true
+        end
+
+        # Picker navigation: Leader+Esc - close picker
+        keymap(:normal, "<Leader><Esc>") do |ctx|
+          next unless picker_active?(ctx.editor)
+
+          close_picker(ctx.editor)
+          true
         end
       end
 
@@ -194,6 +213,11 @@ module Mui
 
           get_manager(ctx.editor).did_close(file_path: file_path)
         end
+
+        # Hook into insert completion trigger (. and @ characters)
+        autocmd(:InsertCompletion) do |ctx|
+          handle_lsp_completion(ctx)
+        end
       end
 
       def setup_default_servers
@@ -272,6 +296,18 @@ module Mui
         get_manager(ctx.editor).definition(file_path: file_path, line: line, character: character)
       end
 
+      def handle_lsp_jump_to_type_file(ctx)
+        file_path = ctx.buffer.file_path
+        unless file_path
+          ctx.set_message("LSP: no file path")
+          return
+        end
+
+        line = ctx.window.cursor_row
+        character = ctx.window.cursor_col
+        get_manager(ctx.editor).jump_to_type_file(file_path: file_path, line: line, character: character)
+      end
+
       def handle_lsp_references(ctx)
         file_path = ctx.buffer.file_path
         unless file_path
@@ -291,9 +327,15 @@ module Mui
           return
         end
 
+        mgr = get_manager(ctx.editor)
+        text = ctx.buffer.lines.join("\n")
+
+        # Force re-open document to ensure LSP has latest content
+        mgr.force_reopen(file_path: file_path, text: text)
+
         line = ctx.window.cursor_row
         character = ctx.window.cursor_col
-        get_manager(ctx.editor).completion(file_path: file_path, line: line, character: character)
+        mgr.completion(file_path: file_path, line: line, character: character)
       end
 
       def handle_lsp_diagnostics(ctx)
@@ -439,6 +481,22 @@ module Mui
         ctx.set_message("LSP: opened #{File.basename(file_path)}")
       end
 
+      def handle_lsp_format(ctx)
+        file_path = ctx.buffer.file_path
+        unless file_path
+          ctx.set_message("LSP: no file path")
+          return
+        end
+
+        mgr = get_manager(ctx.editor)
+        text = ctx.buffer.lines.join("\n")
+
+        # Sync document before formatting
+        mgr.sync_now(file_path: file_path, text: text)
+
+        mgr.format(file_path: file_path)
+      end
+
       public
 
       def get_manager(editor)
@@ -461,14 +519,80 @@ module Mui
                    ServerConfig.rubocop_lsp(auto_start: true)
                  when :kanayago
                    ServerConfig.kanayago(auto_start: true)
+                 when :steep
+                   ServerConfig.steep(auto_start: true)
                  else
-                   raise ArgumentError, "Unknown server: #{name}. Use :solargraph, :ruby_lsp, :rubocop, or :kanayago"
+                   raise ArgumentError, "Unknown server: #{name}. Use :solargraph, :ruby_lsp, :rubocop, :kanayago, or :steep"
                  end
         register_server(config)
       end
 
       private
 
+      # Picker helpers
+
+      def picker_active?(editor)
+        # Check if current buffer is the picker buffer
+        editor.buffer&.file_path == "[LSP Picker]"
+      end
+
+      def handle_picker_select(ctx, new_tab:)
+        locations = ctx.editor.instance_variable_get(:@lsp_picker_locations)
+        return unless locations
+
+        # Get selected index from cursor position (line 3+ are the items, 0-indexed)
+        cursor_row = ctx.window.cursor_row
+        index = cursor_row - 2 # Skip header lines
+        return if index.negative? || index >= locations.length
+
+        location = locations[index]
+        close_picker(ctx.editor)
+        jump_to_location(ctx, location, new_tab: new_tab)
+      end
+
+      def close_picker(editor)
+        editor.instance_variable_set(:@lsp_picker_locations, nil)
+        editor.instance_variable_set(:@lsp_picker_type, nil)
+        # Close the picker window
+        editor.window_manager.close_current_window
+      end
+
+      def jump_to_location(ctx, location, new_tab:)
+        file_path = location.file_path
+        unless file_path
+          ctx.set_message("Cannot open: #{location.uri}")
+          return
+        end
+
+        line = location.range.start.line
+        character = location.range.start.character
+
+        if new_tab
+          # Open in new tab (same as :tabnew command)
+          tab_manager = ctx.editor.tab_manager
+          new_tab_obj = tab_manager.add
+          new_buffer = Mui::Buffer.new
+          new_buffer.load(file_path)
+          new_buffer.undo_manager = Mui::UndoManager.new
+          new_tab_obj.window_manager.add_window(new_buffer)
+        else
+          # Open in current window
+          current_buffer = ctx.buffer
+          if current_buffer.file_path != file_path
+            new_buffer = Mui::Buffer.new
+            new_buffer.load(file_path)
+            ctx.editor.window.buffer = new_buffer
+          end
+        end
+
+        window = ctx.editor.window
+        window.cursor_row = line
+        window.cursor_col = character
+        window.ensure_cursor_visible
+
+        ctx.set_message("#{File.basename(file_path)}:#{line + 1}")
+      end
+
       def create_manager(editor)
         mgr = Manager.new(editor: editor)
         # Register configured servers
@@ -509,8 +633,13 @@ module Mui
                    ServerConfig.rubocop_lsp(auto_start: true)
                  when :kanayago
                    ServerConfig.kanayago(auto_start: true)
+                 when :typeprof
+                   ServerConfig.typeprof(auto_start: true)
+                 when :steep
+                   ServerConfig.steep(auto_start: true)
                  else
-                   raise ArgumentError, "Unknown server: #{name}. Use :solargraph, :ruby_lsp, :rubocop, or :kanayago"
+                   raise ArgumentError,
+                         "Unknown server: #{name}. Use :solargraph, :ruby_lsp, :rubocop, :kanayago, :typeprof, or :steep"
                  end
         @server_configs << config
       end

data/lib/mui/lsp/server_config.rb

@@ -26,6 +26,8 @@ module Mui
         case ext
         when ".rb", ".rake", ".gemspec", ".ru"
           "ruby"
+        when ".rbs"
+          "rbs"
         when ".js"
           "javascript"
         when ".ts"
@@ -99,6 +101,26 @@ module Mui
           )
         end
 
+        def typeprof(auto_start: false)
+          new(
+            name: "typeprof",
+            command: "typeprof --lsp --stdio",
+            language_ids: ["ruby"],
+            file_patterns: ["**/*.rb", "**/*.rake", "**/Gemfile", "**/Rakefile", "**/*.gemspec"],
+            auto_start: auto_start
+          )
+        end
+
+        def steep(auto_start: false)
+          new(
+            name: "steep",
+            command: "steep langserver",
+            language_ids: %w[ruby rbs],
+            file_patterns: ["**/*.rb", "**/*.rbs", "**/*.rake", "**/Gemfile", "**/Rakefile", "**/*.gemspec"],
+            auto_start: auto_start
+          )
+        end
+
         def custom(name:, command:, language_ids:, file_patterns:, auto_start: true, sync_on_change: true)
           new(
             name: name,

data/lib/mui/lsp/text_document_sync.rb

@@ -8,6 +8,8 @@ module Mui
     class TextDocumentSync
       DEFAULT_DEBOUNCE_MS = 300
 
+      attr_reader :client
+
       def initialize(client:, server_config:, debounce_ms: DEFAULT_DEBOUNCE_MS)
         @client = client
         @server_config = server_config
@@ -38,9 +40,9 @@ module Mui
         )
       end
 
-      def did_change(uri:, text:, debounce: true)
-        # Skip if sync_on_change is disabled for this server
-        return unless @server_config.sync_on_change
+      def did_change(uri:, text:, debounce: true, force: false)
+        # Skip if sync_on_change is disabled for this server (unless forced)
+        return unless force || @server_config.sync_on_change
 
         @mutex.synchronize do
           return unless @open_documents.key?(uri)

data/lib/mui/lsp/version.rb

@@ -2,6 +2,6 @@
 
 module Mui
   module Lsp
-    VERSION = "0.1.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mui-lsp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - S-H-GAMELINKS
@@ -43,8 +43,10 @@ files:
 - lib/mui/lsp/handlers/completion.rb
 - lib/mui/lsp/handlers/definition.rb
 - lib/mui/lsp/handlers/diagnostics.rb
+- lib/mui/lsp/handlers/formatting.rb
 - lib/mui/lsp/handlers/hover.rb
 - lib/mui/lsp/handlers/references.rb
+- lib/mui/lsp/handlers/type_definition.rb
 - lib/mui/lsp/highlighters/diagnostic_highlighter.rb
 - lib/mui/lsp/json_rpc_io.rb
 - lib/mui/lsp/manager.rb
@@ -83,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.2
 specification_version: 4
 summary: LSP (Language Server Protocol) plugin for Mui editor
 test_files: []