mui-lsp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0edc6ad5bdcfb8d3c4705d7246ee8d49ea823e4693de1bf437a5ba4d60e264
-  data.tar.gz: 59e0fb00ab3c379304615e114fc94bc02e1693bb856d4c908f4f3b62b3b0d170
+  metadata.gz: 265b2178245c88fe87ea19d4b97323cd4bc47cc104ed89258fed1e542d6c2c57
+  data.tar.gz: 762e6e1dcb1dc49f22bf866647b9a2c7637806e16d1f8070b46a899290db93f1
 SHA512:
-  metadata.gz: df47053646164f89d037b3b8fcc06a08cf77243efe6ded43ce7571cee66a32d355b7d628466eb1f7879f55e18bfdc5fabb7386bcd73d101866c4263843998c94
-  data.tar.gz: 4231151ca03b149edf198725ee8e82b42a57db7bc99f0e8f8e85c77fb124ff981976b40180f1c4512716c97750d2b8ae3ecc6669c60a745c365ba7e8d0c10a11
+  metadata.gz: b20c948e1fe4171cf1a87db8d738f758375f5094b2463c64dbe3b9ed6c803fb666f5692158516d543b62acbed82cb1bfe5103a6224a4d2fb7435daaa124b14da
+  data.tar.gz: a24ed8994311f2db029ef9a9cde459a27fe9669eff27f332f60fedc7e51838d9647a37f40e61e2b2ba8e3707d5b84c6ff51237d9725d06d1155632d25f245d1b

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 ## [Unreleased]
 
+## [0.2.0] - 2025-12-12
+
+### Added
+- Insert mode LSP completion support:
+  - Auto-trigger completion after `.`, `@`, and `::` characters via `InsertCompletion` autocmd
+  - Uses `textEdit` for precise text replacement (e.g., `@user` replaces properly)
+  - `force_reopen` ensures LSP has latest buffer content before completion
+  - Completion items include `label`, `kind`, `detail`, `documentation`, and `text_edit`
+- `Ctrl+Space` keymap in Insert mode to manually trigger LSP completion
+
+## [0.1.1] - 2025-12-11
+
+### Changed
+
+- `Mui::Lsp::ConfigDsl` now imports configurations from `Mui::LspConfigStub`:
+  - Allows `Mui.lsp { ... }` to be called in `.muirc` before mui-lsp gem is loaded
+  - Configurations stored in the stub are automatically migrated when the gem loads
+  - Requires Mui v0.2.0+ which provides `LspConfigStub`
+
 ## [0.1.0] - 2025-12-11
 
 ### Added

data/lib/mui/lsp/handlers/completion.rb

@@ -84,8 +84,30 @@ module Mui
         end
 
         def display_completions(items)
-          # For now, show first few items in message
-          # TODO: Integrate with Mui's popup menu or completion system
+          # Use Mui's insert completion API if available
+          if @editor.respond_to?(:start_insert_completion)
+            prefix = get_current_prefix
+            @editor.start_insert_completion(items, prefix:)
+          else
+            # Fallback: show message
+            show_message_fallback(items)
+          end
+        end
+
+        def get_current_prefix
+          window = @editor.window
+          buffer = window.buffer
+          line = buffer.line(window.cursor_row)
+          col = window.cursor_col
+
+          # Find word start
+          start_col = col
+          start_col -= 1 while start_col > 0 && line[start_col - 1] =~ /\w/
+
+          line[start_col...col] || ""
+        end
+
+        def show_message_fallback(items)
           count = items.length
 
           # Build a summary message
@@ -94,13 +116,6 @@ module Mui
           summary += ", ..." if count > 3
 
           @editor.message = "#{count} completion#{"s" unless count == 1}: #{summary}"
-
-          # Store items for potential insertion
-          store_completions(items)
-        end
-
-        def store_completions(items)
-          @editor.instance_variable_set(:@lsp_completions, items)
         end
 
         def kind_to_string(kind)

data/lib/mui/lsp/manager.rb

@@ -162,6 +162,23 @@ module Mui
         end
       end
 
+      # Sync immediately without debounce (for completion requests)
+      def sync_now(file_path:, text:)
+        uri = TextDocumentSync.path_to_uri(file_path)
+        text_syncs_for(file_path).each do |text_sync|
+          text_sync.did_change(uri: uri, text: text, debounce: false, force: true)
+        end
+      end
+
+      # Force close and re-open document to reset LSP state
+      def force_reopen(file_path:, text:)
+        uri = TextDocumentSync.path_to_uri(file_path)
+        text_syncs_for(file_path).each do |text_sync|
+          text_sync.did_close(uri: uri) if text_sync.open?(uri)
+          text_sync.did_open(uri: uri, text: text)
+        end
+      end
+
       def did_save(file_path:, text: nil)
         uri = TextDocumentSync.path_to_uri(file_path)
         # Broadcast to all matching servers

data/lib/mui/lsp/plugin.rb

@@ -157,6 +157,12 @@ module Mui
             false
           end
         end
+
+        # Insert mode: Ctrl+Space - Trigger LSP completion
+        keymap(:insert, "\x00") do |ctx|
+          handle_lsp_completion(ctx)
+          true
+        end
       end
 
       def register_autocmds
@@ -194,6 +200,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
@@ -291,9 +302,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)
@@ -485,26 +502,17 @@ end
 Mui.plugin_manager.register(:lsp, Mui::Lsp::Plugin)
 
 # DSL for .muirc configuration
+# This replaces Mui.lsp stub method from mui core with the real implementation
 module Mui
-  class << self
-    def lsp(&block)
-      @lsp_config ||= Lsp::ConfigDsl.new
-      @lsp_config.instance_eval(&block) if block
-      @lsp_config
-    end
-
-    def lsp_server_configs
-      @lsp_config&.server_configs || []
-    end
-  end
-
   module Lsp
     # DSL class for configuring LSP in .muirc
     class ConfigDsl
       attr_reader :server_configs
 
-      def initialize
+      def initialize(existing_configs = [])
         @server_configs = []
+        # Import configs from LspConfigStub if any were defined before gem load
+        import_stub_configs(existing_configs)
       end
 
       def use(name, sync_on_change: nil)
@@ -534,6 +542,45 @@ module Mui
           sync_on_change: sync_on_change
         )
       end
+
+      private
+
+      def import_stub_configs(configs)
+        configs.each do |cfg|
+          case cfg[:type]
+          when :preset
+            use(cfg[:name], **cfg.fetch(:options, {}))
+          when :custom
+            server(
+              name: cfg[:name],
+              command: cfg[:command],
+              language_ids: cfg[:language_ids],
+              file_patterns: cfg[:file_patterns],
+              auto_start: cfg.fetch(:auto_start, true),
+              sync_on_change: cfg.fetch(:sync_on_change, true)
+            )
+          end
+        end
+      end
+    end
+  end
+
+  class << self
+    def lsp(&block)
+      # Migrate from LspConfigStub to real ConfigDsl on first access after gem load
+      if @lsp_config.is_a?(LspConfigStub)
+        existing_configs = @lsp_config.server_configs
+        @lsp_config = Lsp::ConfigDsl.new(existing_configs)
+      end
+      @lsp_config ||= Lsp::ConfigDsl.new
+      @lsp_config.instance_eval(&block) if block
+      @lsp_config
+    end
+
+    def lsp_server_configs
+      # Ensure migration happens
+      lsp unless @lsp_config.is_a?(Lsp::ConfigDsl)
+      @lsp_config&.server_configs || []
     end
   end
 end

data/lib/mui/lsp/text_document_sync.rb

@@ -38,9 +38,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.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mui-lsp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - S-H-GAMELINKS