solargraph 0.59.0 → 0.59.2

data/lib/solargraph/diagnostics.rb

@@ -1,55 +1,55 @@
-# frozen_string_literal: true
-
-module Solargraph
-  # The Diagnostics library provides reporters for analyzing problems in code
-  # and providing the results to language server clients.
-  #
-  module Diagnostics
-    autoload :Base,            'solargraph/diagnostics/base'
-    autoload :Severities,      'solargraph/diagnostics/severities'
-    autoload :Rubocop,         'solargraph/diagnostics/rubocop'
-    autoload :RubocopHelpers,  'solargraph/diagnostics/rubocop_helpers'
-    autoload :RequireNotFound, 'solargraph/diagnostics/require_not_found'
-    autoload :UpdateErrors,    'solargraph/diagnostics/update_errors'
-    autoload :TypeCheck,       'solargraph/diagnostics/type_check'
-
-    class << self
-      # Add a reporter with a name to identify it in .solargraph.yml files.
-      #
-      # @param name [String] The name
-      # @param klass [Class<Solargraph::Diagnostics::Base>] The class implementation
-      # @return [void]
-      def register name, klass
-        reporter_hash[name] = klass
-      end
-
-      # Get an array of reporter names.
-      #
-      # @return [Array<String>]
-      def reporters
-        reporter_hash.keys - ['type_not_defined'] # @todo Hide type_not_defined for now
-      end
-
-      # Find a reporter by name.
-      #
-      # @param name [String] The name with which the reporter was registered
-      # @return [Class<Solargraph::Diagnostics::Base>, nil]
-      def reporter name
-        reporter_hash[name]
-      end
-
-      private
-
-      # @return [Hash{String => Class<Solargraph::Diagnostics::Base>}]
-      def reporter_hash
-        @reporter_hash ||= {}
-      end
-    end
-
-    register 'rubocop', Rubocop
-    register 'require_not_found', RequireNotFound
-    register 'typecheck', TypeCheck
-    register 'update_errors', UpdateErrors
-    register 'type_not_defined', TypeCheck # @todo Retained for backwards compatibility
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  # The Diagnostics library provides reporters for analyzing problems in code
+  # and providing the results to language server clients.
+  #
+  module Diagnostics
+    autoload :Base,            'solargraph/diagnostics/base'
+    autoload :Severities,      'solargraph/diagnostics/severities'
+    autoload :Rubocop,         'solargraph/diagnostics/rubocop'
+    autoload :RubocopHelpers,  'solargraph/diagnostics/rubocop_helpers'
+    autoload :RequireNotFound, 'solargraph/diagnostics/require_not_found'
+    autoload :UpdateErrors,    'solargraph/diagnostics/update_errors'
+    autoload :TypeCheck,       'solargraph/diagnostics/type_check'
+
+    class << self
+      # Add a reporter with a name to identify it in .solargraph.yml files.
+      #
+      # @param name [String] The name
+      # @param klass [Class<Solargraph::Diagnostics::Base>] The class implementation
+      # @return [void]
+      def register name, klass
+        reporter_hash[name] = klass
+      end
+
+      # Get an array of reporter names.
+      #
+      # @return [Array<String>]
+      def reporters
+        reporter_hash.keys - ['type_not_defined'] # @todo Hide type_not_defined for now
+      end
+
+      # Find a reporter by name.
+      #
+      # @param name [String] The name with which the reporter was registered
+      # @return [Class<Solargraph::Diagnostics::Base>, nil]
+      def reporter name
+        reporter_hash[name]
+      end
+
+      private
+
+      # @return [Hash{String => Class<Solargraph::Diagnostics::Base>}]
+      def reporter_hash
+        @reporter_hash ||= {}
+      end
+    end
+
+    register 'rubocop', Rubocop
+    register 'require_not_found', RequireNotFound
+    register 'typecheck', TypeCheck
+    register 'update_errors', UpdateErrors
+    register 'type_not_defined', TypeCheck # @todo Retained for backwards compatibility
+  end
+end

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/host.rb

@@ -648,15 +648,14 @@ module Solargraph
       # @param text [String]
       # @param type [Integer] A MessageType constant
       # @param actions [Array<String>] Response options for the client
-      # @param block [Proc] The block that processes the response
       # @yieldparam [String] The action received from the client
       # @return [void]
-      def show_message_request text, type, actions, &block
-        send_request 'window/showMessageRequest', {
-          type: type,
-          message: text,
-          actions: actions
-        }, &block
+      def show_message_request(text, type, actions, &)
+        send_request('window/showMessageRequest', {
+                       type: type,
+                       message: text,
+                       actions: actions
+                     }, &)
       end
 
       # Get a list of IDs for server requests that are waiting for responses

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