solargraph 0.59.0 → 0.59.2

data/lib/solargraph/language_server/progress.rb

@@ -1,143 +1,143 @@
-# frozen_string_literal: true
-
-require 'securerandom'
-
-module Solargraph
-  module LanguageServer
-    # Progress notification handling for language server hosts.
-    #
-    class Progress
-      WAITING = :waiting
-      CREATED = :created
-      FINISHED = :finished
-
-      # @return [String]
-      attr_reader :uuid
-
-      # @return [String]
-      attr_reader :title
-
-      # @return [String, nil]
-      attr_reader :kind
-
-      # @return [String, nil]
-      attr_reader :message
-
-      # @return [Integer]
-      attr_reader :percentage
-
-      # @return [Symbol]
-      attr_reader :status
-
-      # @param title [String]
-      def initialize title
-        @title = title
-        @uuid = SecureRandom.uuid
-        @percentage = 0
-        @status = WAITING
-      end
-
-      # @param message [String]
-      # @param percentage [Integer]
-      # @return [void]
-      def begin message, percentage
-        @kind = 'begin'
-        @message = message
-        @percentage = percentage
-      end
-
-      # @param message [String]
-      # @param percentage [Integer]
-      # @return [void]
-      def report message, percentage
-        @kind = 'report'
-        @message = message
-        @percentage = percentage
-      end
-
-      # @param message [String]
-      # @return [void]
-      def finish message
-        @kind = 'end'
-        @message = message
-        @percentage = 100
-        true
-      end
-
-      # @param host [Solargraph::LanguageServer::Host]
-      # @return [void]
-      def send host
-        return unless host.client_supports_progress? && !finished?
-
-        message = build
-        create(host)
-        host.send_notification '$/progress', message
-        @status = FINISHED if kind == 'end'
-        keep_alive host
-      end
-
-      def created?
-        [CREATED, FINISHED].include?(status)
-      end
-
-      def finished?
-        status == FINISHED
-      end
-
-      private
-
-      # @param host [Solargraph::LanguageServer::Host]
-      # @return [void]
-      def create host
-        return if created?
-
-        host.send_request 'window/workDoneProgress/create', { token: uuid }
-        @status = CREATED
-      end
-
-      # @return [Hash]
-      def build
-        {
-          token: uuid,
-          value: {
-            kind: kind,
-            cancellable: false
-          }.merge(build_value)
-        }
-      end
-
-      # @return [Hash]
-      def build_value
-        case kind
-        when 'begin'
-          { title: title, message: message, percentage: percentage }
-        when 'report'
-          { message: message, percentage: percentage }
-        when 'end'
-          { message: message }
-        else
-          raise "Invalid progress kind #{kind}"
-        end
-      end
-
-      # @param host [Host]
-      # @return [void]
-      def keep_alive host
-        mutex.synchronize { @last = Time.now }
-        @keep_alive ||= Thread.new do
-          until finished?
-            sleep 10
-            break if finished?
-            next if mutex.synchronize { Time.now - @last < 10 }
-            send host
-          end
-        end
-      end
-
-      # @return [Thread::Mutex]
-      def mutex
-        @mutex ||= Mutex.new
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'securerandom'
+
+module Solargraph
+  module LanguageServer
+    # Progress notification handling for language server hosts.
+    #
+    class Progress
+      WAITING = :waiting
+      CREATED = :created
+      FINISHED = :finished
+
+      # @return [String]
+      attr_reader :uuid
+
+      # @return [String]
+      attr_reader :title
+
+      # @return [String, nil]
+      attr_reader :kind
+
+      # @return [String, nil]
+      attr_reader :message
+
+      # @return [Integer]
+      attr_reader :percentage
+
+      # @return [Symbol]
+      attr_reader :status
+
+      # @param title [String]
+      def initialize title
+        @title = title
+        @uuid = SecureRandom.uuid
+        @percentage = 0
+        @status = WAITING
+      end
+
+      # @param message [String]
+      # @param percentage [Integer]
+      # @return [void]
+      def begin message, percentage
+        @kind = 'begin'
+        @message = message
+        @percentage = percentage
+      end
+
+      # @param message [String]
+      # @param percentage [Integer]
+      # @return [void]
+      def report message, percentage
+        @kind = 'report'
+        @message = message
+        @percentage = percentage
+      end
+
+      # @param message [String]
+      # @return [void]
+      def finish message
+        @kind = 'end'
+        @message = message
+        @percentage = 100
+        true
+      end
+
+      # @param host [Solargraph::LanguageServer::Host]
+      # @return [void]
+      def send host
+        return unless host.client_supports_progress? && !finished?
+
+        message = build
+        create(host)
+        host.send_notification '$/progress', message
+        @status = FINISHED if kind == 'end'
+        keep_alive host
+      end
+
+      def created?
+        [CREATED, FINISHED].include?(status)
+      end
+
+      def finished?
+        status == FINISHED
+      end
+
+      private
+
+      # @param host [Solargraph::LanguageServer::Host]
+      # @return [void]
+      def create host
+        return if created?
+
+        host.send_request 'window/workDoneProgress/create', { token: uuid }
+        @status = CREATED
+      end
+
+      # @return [Hash]
+      def build
+        {
+          token: uuid,
+          value: {
+            kind: kind,
+            cancellable: false
+          }.merge(build_value)
+        }
+      end
+
+      # @return [Hash]
+      def build_value
+        case kind
+        when 'begin'
+          { title: title, message: message, percentage: percentage }
+        when 'report'
+          { message: message, percentage: percentage }
+        when 'end'
+          { message: message }
+        else
+          raise "Invalid progress kind #{kind}"
+        end
+      end
+
+      # @param host [Host]
+      # @return [void]
+      def keep_alive host
+        mutex.synchronize { @last = Time.now }
+        @keep_alive ||= Thread.new do
+          until finished?
+            sleep 10
+            break if finished?
+            next if mutex.synchronize { Time.now - @last < 10 }
+            send host
+          end
+        end
+      end
+
+      # @return [Thread::Mutex]
+      def mutex
+        @mutex ||= Mutex.new
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/transport/adapter.rb

@@ -1,68 +1,68 @@
-# frozen_string_literal: true
-
-require 'backport'
-
-module Solargraph
-  module LanguageServer
-    module Transport
-      # A common module for running language servers in Backport.
-      #
-      module Adapter
-        # This runs in the context of Backport::Adapter, which
-        # provides write() - but if we didn't hide this behind a parse
-        # tag, it would override the one in the class.
-        #
-        # @!method write(text)
-        #   @abstract
-        #   Write the change to the specified text.
-        #   @param text [String] The text to be changed.
-        #   @return [String] The updated text.
-
-        # @return [void]
-        def opening
-          @host = Solargraph::LanguageServer::Host.new
-          @host.add_observer self
-          @host.start
-          @data_reader = Solargraph::LanguageServer::Transport::DataReader.new
-          @data_reader.set_message_handler do |message|
-            process message
-          end
-        end
-
-        # @return [void]
-        def closing
-          @host.stop
-        end
-
-        # @param data [String]
-        # @return [void]
-        def receiving data
-          @data_reader.receive data
-        end
-
-        # @return [void]
-        def update
-          if @host.stopped?
-            shutdown
-          else
-            tmp = @host.flush
-            write tmp unless tmp.empty?
-          end
-        end
-
-        private
-
-        # @param request [Hash]
-        # @return [void]
-        def process request
-          @host.process(request)
-        end
-
-        # @return [void]
-        def shutdown
-          Backport.stop unless @host.options['transport'] == 'external'
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'backport'
+
+module Solargraph
+  module LanguageServer
+    module Transport
+      # A common module for running language servers in Backport.
+      #
+      module Adapter
+        # This runs in the context of Backport::Adapter, which
+        # provides write() - but if we didn't hide this behind a parse
+        # tag, it would override the one in the class.
+        #
+        # @!method write(text)
+        #   @abstract
+        #   Write the change to the specified text.
+        #   @param text [String] The text to be changed.
+        #   @return [String] The updated text.
+
+        # @return [void]
+        def opening
+          @host = Solargraph::LanguageServer::Host.new
+          @host.add_observer self
+          @host.start
+          @data_reader = Solargraph::LanguageServer::Transport::DataReader.new
+          @data_reader.set_message_handler do |message|
+            process message
+          end
+        end
+
+        # @return [void]
+        def closing
+          @host.stop
+        end
+
+        # @param data [String]
+        # @return [void]
+        def receiving data
+          @data_reader.receive data
+        end
+
+        # @return [void]
+        def update
+          if @host.stopped?
+            shutdown
+          else
+            tmp = @host.flush
+            write tmp unless tmp.empty?
+          end
+        end
+
+        private
+
+        # @param request [Hash]
+        # @return [void]
+        def process request
+          @host.process(request)
+        end
+
+        # @return [void]
+        def shutdown
+          Backport.stop unless @host.options['transport'] == 'external'
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/language_server.rb

@@ -1,20 +1,20 @@
-# frozen_string_literal: true
-
-require 'solargraph/language_server/error_codes'
-require 'solargraph/language_server/completion_item_kinds'
-require 'solargraph/language_server/symbol_kinds'
-
-module Solargraph
-  # The LanguageServer namespace contains the classes and modules that compose
-  # concrete implementations of language servers.
-  #
-  module LanguageServer
-    autoload :Host,         'solargraph/language_server/host'
-    autoload :Message,      'solargraph/language_server/message'
-    autoload :UriHelpers,   'solargraph/language_server/uri_helpers'
-    autoload :MessageTypes, 'solargraph/language_server/message_types'
-    autoload :Request,      'solargraph/language_server/request'
-    autoload :Transport,    'solargraph/language_server/transport'
-    autoload :Progress,     'solargraph/language_server/progress'
-  end
-end
+# frozen_string_literal: true
+
+require 'solargraph/language_server/error_codes'
+require 'solargraph/language_server/completion_item_kinds'
+require 'solargraph/language_server/symbol_kinds'
+
+module Solargraph
+  # The LanguageServer namespace contains the classes and modules that compose
+  # concrete implementations of language servers.
+  #
+  module LanguageServer
+    autoload :Host,         'solargraph/language_server/host'
+    autoload :Message,      'solargraph/language_server/message'
+    autoload :UriHelpers,   'solargraph/language_server/uri_helpers'
+    autoload :MessageTypes, 'solargraph/language_server/message_types'
+    autoload :Request,      'solargraph/language_server/request'
+    autoload :Transport,    'solargraph/language_server/transport'
+    autoload :Progress,     'solargraph/language_server/progress'
+  end
+end

data/lib/solargraph/parser/parser_gem/node_chainer.rb

@@ -153,6 +153,7 @@ module Solargraph
           else
             lit = infer_literal_node_type(n)
             result.push(lit ? Chain::Literal.new(lit, n) : Chain::Link.new)
+            # result.push Chain::Link.new
           end
           result
         end

data/lib/solargraph/parser/parser_gem/node_methods.rb

@@ -4,6 +4,7 @@ require 'parser'
 require 'ast'
 
 # https://github.com/whitequark/parser
+# rubocop:disable Metrics/ModuleLength
 module Solargraph
   module Parser
     module ParserGem
@@ -246,15 +247,100 @@ module Solargraph
             end
             prev = node
           end
-          nil
+          find_recipient_node_by_text(source, offset)
+        end
+
+        # Text-based fallback for finding a method call recipient when the AST
+        # is unavailable (e.g., unparseable source with syntax errors).
+        #
+        # Scans backward from cursor offset to find '(' and the method name
+        # before it, then creates a minimal :send node.
+        #
+        # @param source [Solargraph::Source]
+        # @param offset [Integer]
+        # @return [Parser::AST::Node, nil]
+        def find_recipient_node_by_text source, offset
+          code = source.code
+          return nil if offset.nil? || offset <= 0 || offset > code.length
+
+          # The '(' could be at offset-1 (cursor after '(') or at offset (cursor on '(')
+          start_pos = offset - 1
+          if start_pos.positive? && code[start_pos] != '(' && code[offset] == '('
+            start_pos = offset
+          end
+
+          # Scan backward to find the matching '(' (handle nested parens)
+          depth = 0
+          paren_pos = nil
+          pos = start_pos
+          while pos >= 0
+            case code[pos]
+            when ')'
+              depth += 1
+            when '('
+              if depth.zero?
+                paren_pos = pos
+                break
+              end
+              depth -= 1
+            end
+            pos -= 1
+          end
+          return nil if paren_pos.nil?
+
+          # Skip whitespace before '(' to find method name
+          idx = paren_pos - 1
+          idx -= 1 while idx >= 0 && code[idx] =~ /\s/
+          return nil if idx.negative?
+
+          # Read method name (including ? and !)
+          name_end = idx + 1
+          idx -= 1 while idx >= 0 && code[idx] =~ /[a-zA-Z0-9_?!]/
+          name_start = idx + 1
+          return nil if name_start >= name_end
+          method_name = code[name_start...name_end]
+          return nil if method_name.empty?
+
+          # Check for receiver pattern: receiver.method( or receiver::method(
+          idx = name_start - 1
+          idx -= 1 while idx >= 0 && code[idx] =~ /\s/
+          if idx >= 0 && code[idx] == '.'
+            idx -= 1
+            idx -= 1 while idx >= 0 && code[idx] =~ /\s/
+            recv_end = idx + 1
+            idx -= 1 while idx >= 0 && code[idx] =~ /[a-zA-Z0-9_@$]/
+            recv_start = idx + 1
+            if recv_start < recv_end
+              recv_name = code[recv_start...recv_end]
+              unless recv_name.empty?
+                receiver_node = ::Parser::AST::Node.new(:send, [nil, recv_name.to_sym])
+                return ::Parser::AST::Node.new(:send, [receiver_node, method_name.to_sym])
+              end
+            end
+          elsif idx >= 0 && idx.positive? && code[idx - 1] == ':' && code[idx] == ':'
+            const_end = idx - 1
+            const_start = const_end
+            const_start -= 1 while const_start.positive? && code[const_start - 1] =~ /[a-zA-Z0-9_]/
+            const_name = code[const_start...const_end]
+            unless const_name.empty? || method_name.empty?
+              const_node = ::Parser::AST::Node.new(:const, [nil, const_name.to_sym])
+              return ::Parser::AST::Node.new(:send, [const_node, method_name.to_sym])
+            end
+          end
+
+          # Simple method call without receiver
+          ::Parser::AST::Node.new(:send, [nil, method_name.to_sym])
         end
 
         # @param cursor [Solargraph::Source::Cursor]
         # @return [Parser::AST::Node, nil]
         def repaired_find_recipient_node cursor
-          cursor = cursor.source.cursor_at([cursor.position.line, cursor.position.column - 1])
-          node = cursor.source.tree_at(cursor.position.line, cursor.position.column).first
-          node if node && node.type == :send
+          c = cursor.source.cursor_at([cursor.position.line, cursor.position.column - 1])
+          tree = c.source.tree_at(c.position.line, c.position.column)
+          tree.each do |node|
+            return node if node.type == :send
+          end
+          find_recipient_node_by_text(cursor.source, cursor.offset)
         end
 
         #
@@ -505,3 +591,4 @@ module Solargraph
     end
   end
 end
+# rubocop:enable Metrics/ModuleLength

data/lib/solargraph/parser/parser_gem/node_processors/alias_node.rb

@@ -1,24 +1,24 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Parser
-    module ParserGem
-      module NodeProcessors
-        class AliasNode < Parser::NodeProcessor::Base
-          def process
-            loc = get_node_location(node)
-            pins.push Solargraph::Pin::MethodAlias.new(
-              location: loc,
-              closure: region.closure,
-              name: node.children[0].children[0].to_s,
-              original: node.children[1].children[0].to_s,
-              scope: region.scope || :instance,
-              source: :parser
-            )
-            process_children
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module Parser
+    module ParserGem
+      module NodeProcessors
+        class AliasNode < Parser::NodeProcessor::Base
+          def process
+            loc = get_node_location(node)
+            pins.push Solargraph::Pin::MethodAlias.new(
+              location: loc,
+              closure: region.closure,
+              name: node.children[0].children[0].to_s,
+              original: node.children[1].children[0].to_s,
+              scope: region.scope || :instance,
+              source: :parser
+            )
+            process_children
+          end
+        end
+      end
+    end
+  end
+end