solargraph 0.59.1 → 0.59.2

data/lib/solargraph/environ.rb

@@ -1,52 +1,52 @@
-# frozen_string_literal: true
-
-module Solargraph
-  # A collection of additional data, such as map pins and required paths, that
-  # can be added to an ApiMap.
-  #
-  # Conventions are used to add Environs.
-  #
-  class Environ
-    # @return [Array<String>]
-    attr_reader :requires
-
-    # @return [Array<String>]
-    attr_reader :domains
-
-    # @return [Array<Pin::Base>]
-    attr_reader :pins
-
-    # @return [Array<String>]
-    attr_reader :yard_plugins
-
-    # @param requires [Array<String>]
-    # @param domains [Array<String>]
-    # @param pins [Array<Pin::Base>]
-    # @param yard_plugins [Array<String>]
-    def initialize requires: [], domains: [], pins: [], yard_plugins: []
-      @requires = requires
-      @domains = domains
-      @pins = pins
-      @yard_plugins = yard_plugins
-    end
-
-    # @return [self]
-    def clear
-      domains.clear
-      requires.clear
-      pins.clear
-      yard_plugins.clear
-      self
-    end
-
-    # @param other [Environ]
-    # @return [self]
-    def merge other
-      domains.concat other.domains
-      requires.concat other.requires
-      pins.concat other.pins
-      yard_plugins.concat other.yard_plugins
-      self
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  # A collection of additional data, such as map pins and required paths, that
+  # can be added to an ApiMap.
+  #
+  # Conventions are used to add Environs.
+  #
+  class Environ
+    # @return [Array<String>]
+    attr_reader :requires
+
+    # @return [Array<String>]
+    attr_reader :domains
+
+    # @return [Array<Pin::Base>]
+    attr_reader :pins
+
+    # @return [Array<String>]
+    attr_reader :yard_plugins
+
+    # @param requires [Array<String>]
+    # @param domains [Array<String>]
+    # @param pins [Array<Pin::Base>]
+    # @param yard_plugins [Array<String>]
+    def initialize requires: [], domains: [], pins: [], yard_plugins: []
+      @requires = requires
+      @domains = domains
+      @pins = pins
+      @yard_plugins = yard_plugins
+    end
+
+    # @return [self]
+    def clear
+      domains.clear
+      requires.clear
+      pins.clear
+      yard_plugins.clear
+      self
+    end
+
+    # @param other [Environ]
+    # @return [self]
+    def merge other
+      domains.concat other.domains
+      requires.concat other.requires
+      pins.concat other.pins
+      yard_plugins.concat other.yard_plugins
+      self
+    end
+  end
+end

data/lib/solargraph/gem_pins.rb

@@ -11,17 +11,6 @@ module Solargraph
       include Logging
     end
 
-    # @param pins [Array<Pin::Base>]
-    # @return [Array<Pin::Base>]
-    def self.combine_method_pins_by_path pins
-      method_pins, alias_pins = pins.partition { |pin| pin.instance_of?(Pin::Method) }
-      by_path = method_pins.group_by(&:path)
-      by_path.transform_values! do |pins|
-        GemPins.combine_method_pins(*pins)
-      end
-      by_path.values + alias_pins
-    end
-
     # @param pins [Array<Pin::Method>]
     # @return [Pin::Method, nil]
     def self.combine_method_pins(*pins)

data/lib/solargraph/language_server/message/extended/environment.rb

@@ -1,25 +1,25 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module Extended
-        # Update YARD documentation for installed gems. If the `rebuild`
-        # parameter is true, rebuild existing yardocs.
-        #
-        class Environment < Base
-          def process
-            # Make sure the environment page can report RuboCop's version
-            require 'rubocop'
-
-            page = Solargraph::Page.new(host.options['viewsPath'])
-            content = page.render('environment', layout: true, locals: { config: host.options, folders: host.folders })
-            set_result(
-              content: content
-            )
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module Extended
+        # Update YARD documentation for installed gems. If the `rebuild`
+        # parameter is true, rebuild existing yardocs.
+        #
+        class Environment < Base
+          def process
+            # Make sure the environment page can report RuboCop's version
+            require 'rubocop'
+
+            page = Solargraph::Page.new(host.options['viewsPath'])
+            content = page.render('environment', layout: true, locals: { config: host.options, folders: host.folders })
+            set_result(
+              content: content
+            )
+          end
+        end
+      end
+    end
+  end
+end

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