solargraph 0.59.1 → 0.60.0

data/lib/solargraph/language_server/message/initialized.rb

@@ -1,28 +1,28 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      class Initialized < Base
-        def process
-          # @todo Temporarily removed textDocument/codeAction
-          host.register_capabilities %w[
-            textDocument/completion
-            textDocument/hover
-            textDocument/signatureHelp
-            textDocument/formatting
-            textDocument/documentSymbol
-            textDocument/definition
-            textDocument/typeDefinition
-            textDocument/references
-            textDocument/rename
-            textDocument/prepareRename
-            textDocument/foldingRange
-            textDocument/documentHighlight
-            workspace/symbol
-          ]
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      class Initialized < Base
+        def process
+          # @todo Temporarily removed textDocument/codeAction
+          host.register_capabilities %w[
+            textDocument/completion
+            textDocument/hover
+            textDocument/signatureHelp
+            textDocument/formatting
+            textDocument/documentSymbol
+            textDocument/definition
+            textDocument/typeDefinition
+            textDocument/references
+            textDocument/rename
+            textDocument/prepareRename
+            textDocument/foldingRange
+            textDocument/documentHighlight
+            workspace/symbol
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/message/text_document.rb

@@ -1,28 +1,28 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        autoload :Base,              'solargraph/language_server/message/text_document/base'
-        autoload :Completion,        'solargraph/language_server/message/text_document/completion'
-        autoload :DidOpen,           'solargraph/language_server/message/text_document/did_open'
-        autoload :DidChange,         'solargraph/language_server/message/text_document/did_change'
-        autoload :DidClose,          'solargraph/language_server/message/text_document/did_close'
-        autoload :DidSave,           'solargraph/language_server/message/text_document/did_save'
-        autoload :Hover,             'solargraph/language_server/message/text_document/hover'
-        autoload :SignatureHelp,     'solargraph/language_server/message/text_document/signature_help'
-        autoload :OnTypeFormatting,  'solargraph/language_server/message/text_document/on_type_formatting'
-        autoload :Definition,        'solargraph/language_server/message/text_document/definition'
-        autoload :TypeDefinition,    'solargraph/language_server/message/text_document/type_definition'
-        autoload :DocumentSymbol,    'solargraph/language_server/message/text_document/document_symbol'
-        autoload :Formatting,        'solargraph/language_server/message/text_document/formatting'
-        autoload :References,        'solargraph/language_server/message/text_document/references'
-        autoload :Rename,            'solargraph/language_server/message/text_document/rename'
-        autoload :PrepareRename,     'solargraph/language_server/message/text_document/prepare_rename'
-        autoload :FoldingRange,      'solargraph/language_server/message/text_document/folding_range'
-        autoload :DocumentHighlight, 'solargraph/language_server/message/text_document/document_highlight'
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        autoload :Base,              'solargraph/language_server/message/text_document/base'
+        autoload :Completion,        'solargraph/language_server/message/text_document/completion'
+        autoload :DidOpen,           'solargraph/language_server/message/text_document/did_open'
+        autoload :DidChange,         'solargraph/language_server/message/text_document/did_change'
+        autoload :DidClose,          'solargraph/language_server/message/text_document/did_close'
+        autoload :DidSave,           'solargraph/language_server/message/text_document/did_save'
+        autoload :Hover,             'solargraph/language_server/message/text_document/hover'
+        autoload :SignatureHelp,     'solargraph/language_server/message/text_document/signature_help'
+        autoload :OnTypeFormatting,  'solargraph/language_server/message/text_document/on_type_formatting'
+        autoload :Definition,        'solargraph/language_server/message/text_document/definition'
+        autoload :TypeDefinition,    'solargraph/language_server/message/text_document/type_definition'
+        autoload :DocumentSymbol,    'solargraph/language_server/message/text_document/document_symbol'
+        autoload :Formatting,        'solargraph/language_server/message/text_document/formatting'
+        autoload :References,        'solargraph/language_server/message/text_document/references'
+        autoload :Rename,            'solargraph/language_server/message/text_document/rename'
+        autoload :PrepareRename,     'solargraph/language_server/message/text_document/prepare_rename'
+        autoload :FoldingRange,      'solargraph/language_server/message/text_document/folding_range'
+        autoload :DocumentHighlight, 'solargraph/language_server/message/text_document/document_highlight'
+      end
+    end
+  end
+end

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

@@ -102,6 +102,48 @@ module Solargraph
           signature
         end
 
+        # Convert a DSL method call argument with directly inferrable simple params.
+        # @param node [Parser::AST::Node]
+        # @return [String, Integer, Float, Symbol, Array, Hash, Source::Chain, nil]
+        # @sg-ignore "does not match inferred type ::String, ::Parser::AST::Node" - this probably comes from the
+        # `.children[0]` call, which is not recognized as returning a literal value.
+        def simple_convert node
+          return nil unless Parser.is_ast_node?(node)
+
+          case node.type
+          when :const
+            unpack_name(node)
+          when :str, :dstr, :int, :float, :sym, true, false
+            node.children[0]
+          when :array
+            simple_convert_array(node)
+          when :hash
+            simple_convert_hash(node)
+          else
+            Solargraph::Parser.chain(node)
+          end
+        end
+
+        # @param node [Parser::AST::Node]
+        # @return [Array]
+        def simple_convert_array node
+          return [] unless Parser.is_ast_node?(node) && node.type == :array
+          node.children.compact.map { |c| simple_convert(c) }
+        end
+
+        # @param node [Parser::AST::Node]
+        # @return [Hash]
+        def simple_convert_hash node
+          return {} unless Parser.is_ast_node?(node) && node.type == :hash
+          result = {}
+          # @param pair [Parser::AST::Node]
+          node.children.each do |pair|
+            next unless Parser.is_ast_node?(pair) && pair.children[0]
+            result[pair.children[0].children[0]] = simple_convert(pair.children[1])
+          end
+          result
+        end
+
         # @param node [Parser::AST::Node, nil]
         # @return [Hash{Symbol => Chain}]
         def convert_hash node