solargraph 0.58.3 → 0.59.2

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.class == 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)
@@ -46,7 +35,7 @@ module Solargraph
     # @param yard_plugins [Array<String>] The names of YARD plugins to use.
     # @param gemspec [Gem::Specification]
     # @return [Array<Pin::Base>]
-    def self.build_yard_pins(yard_plugins, gemspec)
+    def self.build_yard_pins yard_plugins, gemspec
       Yardoc.cache(yard_plugins, gemspec) unless Yardoc.cached?(gemspec)
       return [] unless Yardoc.cached?(gemspec)
       yardoc = Yardoc.load!(gemspec)
@@ -57,13 +46,13 @@ module Solargraph
     # @param rbs_pins [Array<Pin::Base>]
     #
     # @return [Array<Pin::Base>]
-    def self.combine(yard_pins, rbs_pins)
+    def self.combine yard_pins, rbs_pins
       in_yard = Set.new
       rbs_api_map = Solargraph::ApiMap.new(pins: rbs_pins)
       combined = yard_pins.map do |yard_pin|
         in_yard.add yard_pin.path
         rbs_pin = rbs_api_map.get_path_pins(yard_pin.path).filter { |pin| pin.is_a? Pin::Method }.first
-        next yard_pin unless rbs_pin && yard_pin.class == Pin::Method
+        next yard_pin unless rbs_pin && yard_pin.instance_of?(Pin::Method)
 
         unless rbs_pin
           # @sg-ignore https://github.com/castwide/solargraph/pull/1114
@@ -91,7 +80,7 @@ module Solargraph
       # @param choices [Array<ComplexType>]
       # @return [ComplexType]
       def best_return_type *choices
-        choices.find { |pin| pin.defined? } || choices.first || ComplexType::UNDEFINED
+        choices.find(&:defined?) || choices.first || ComplexType::UNDEFINED
       end
     end
   end

data/lib/solargraph/language_server/error_codes.rb

@@ -5,16 +5,16 @@ module Solargraph
     # The ErrorCode constants for the language server protocol.
     #
     module ErrorCodes
-      PARSE_ERROR =            -32700
-      INVALID_REQUEST =        -32600
-      METHOD_NOT_FOUND =       -32601
-      INVALID_PARAMS =         -32602
-      INTERNAL_ERROR =         -32603
-      SERVER_ERROR_START =     -32099
-      SERVER_ERROR_END =       -32000
-      SERVER_NOT_INITIALIZED = -32002
-      UNKNOWN_ERROR_CODE =     -32001
-      REQUEST_CANCELLED =      -32800
+      PARSE_ERROR =            -32_700
+      INVALID_REQUEST =        -32_600
+      METHOD_NOT_FOUND =       -32_601
+      INVALID_PARAMS =         -32_602
+      INTERNAL_ERROR =         -32_603
+      SERVER_ERROR_START =     -32_099
+      SERVER_ERROR_END =       -32_000
+      SERVER_NOT_INITIALIZED = -32_002
+      UNKNOWN_ERROR_CODE =     -32_001
+      REQUEST_CANCELLED =      -32_800
     end
   end
 end

data/lib/solargraph/language_server/host/diagnoser.rb

@@ -56,7 +56,7 @@ module Solargraph
         # @return [void]
         def tick
           return if queue.empty? || host.synchronizing?
-          if !host.options['diagnostics']
+          unless host.options['diagnostics']
             mutex.synchronize { queue.clear }
             return
           end

data/lib/solargraph/language_server/host/dispatch.rb

@@ -33,6 +33,7 @@ module Solargraph
         # @return [void]
         def update_libraries uri
           src = sources.find(uri)
+          # @sg-ignore Need to add nil check here
           using = libraries.select { |lib| lib.contain?(src.filename) }
           using.push library_for(uri) if using.empty?
           using.each { |lib| lib.merge src }
@@ -44,12 +45,11 @@ module Solargraph
         # @param uri [String]
         # @return [Library]
         def library_for uri
-          result = explicit_library_for(uri) ||
+          explicit_library_for(uri) ||
             implicit_library_for(uri) ||
             generic_library_for(uri)
           # previous library for already call attach. avoid call twice
           # result.attach sources.find(uri) if sources.include?(uri)
-          result
         end
 
         # Find an explicit library match for the given URI. An explicit match
@@ -118,8 +118,8 @@ module Solargraph
                                                   .tap { |lib| lib.add_observer self }
         end
 
-        # @param library [Solargraph::Library]
         # @param progress [Solargraph::LanguageServer::Progress, nil]
+        #
         # @return [void]
         def update progress
           progress&.send(self)

data/lib/solargraph/language_server/host/message_worker.rb

@@ -20,7 +20,7 @@ module Solargraph
         ].freeze
 
         # @param host [Host]
-        def initialize(host)
+        def initialize host
           @host = host
           @mutex = Mutex.new
           @resource = ConditionVariable.new
@@ -28,7 +28,7 @@ module Solargraph
         end
 
         # pending handle messages
-        # @return [Array<Hash>]
+        # @return [Array<Hash{String => undefined}>]
         def messages
           @messages ||= []
         end
@@ -44,7 +44,7 @@ module Solargraph
 
         # @param message [Hash] The message to handle. Will be forwarded to Host#receive
         # @return [void]
-        def queue(message)
+        def queue message
           @mutex.synchronize do
             messages.push(message)
             @resource.signal
@@ -66,6 +66,7 @@ module Solargraph
             @resource.wait(@mutex) if messages.empty?
             next_message
           end
+          # @sg-ignore Need to add nil check here
           handler = @host.receive(message)
           handler&.send_response
         end

data/lib/solargraph/language_server/host/sources.rb

@@ -13,7 +13,7 @@ module Solargraph
 
         # @param uri [String]
         # @return [void]
-        def add_uri(uri)
+        def add_uri uri
           queue.push(uri)
         end
 
@@ -55,6 +55,7 @@ module Solargraph
         # @raise [FileNotFoundError] if the URI does not match an open source.
         #
         # @param uri [String]
+        # @sg-ignore flow ensitive typing should understand raise
         # @return [Solargraph::Source]
         def find uri
           open_source_hash[uri] || raise(Solargraph::FileNotFoundError, "Host could not find #{uri}")

data/lib/solargraph/language_server/host.rb

@@ -53,7 +53,7 @@ module Solargraph
         logger.level = LOG_LEVELS[options['logLevel']] || DEFAULT_LOG_LEVEL
       end
 
-      # @return [Hash{String => [Boolean, String]}]
+      # @return [Hash{String => Boolean, String}]
       def options
         @options ||= default_configuration
       end
@@ -105,6 +105,7 @@ module Solargraph
             message.process unless cancel?(request['id'])
           rescue StandardError => e
             logger.warn "Error processing request: [#{e.class}] #{e.message}"
+            # @sg-ignore Need to add nil check here
             logger.warn e.backtrace.join("\n")
             message.set_error Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}"
           end
@@ -118,7 +119,7 @@ module Solargraph
             nil
           end
         else
-          logger.warn "Invalid message received."
+          logger.warn 'Invalid message received.'
           logger.debug request
           nil
         end
@@ -153,7 +154,7 @@ module Solargraph
           lib.delete(*filenames)
         end
         uris.each do |uri|
-          send_notification "textDocument/publishDiagnostics", {
+          send_notification 'textDocument/publishDiagnostics', {
             uri: uri,
             diagnostics: []
           }
@@ -208,7 +209,7 @@ module Solargraph
             logger.info "Diagnosing #{uri}"
             begin
               results = library.diagnose uri_to_file(uri)
-              send_notification "textDocument/publishDiagnostics", {
+              send_notification 'textDocument/publishDiagnostics', {
                 uri: uri,
                 diagnostics: results
               }
@@ -300,8 +301,11 @@ module Solargraph
         end
       end
 
+      # @sg-ignore Need to validate config
       # @return [String]
+      # @sg-ignore Need to validate config
       def command_path
+        # @type [String]
         options['commandPath'] || 'solargraph'
       end
 
@@ -350,7 +354,7 @@ module Solargraph
       # @return [void]
       def send_notification method, params
         response = {
-          jsonrpc: "2.0",
+          jsonrpc: '2.0',
           method: method,
           params: params
         }
@@ -373,7 +377,7 @@ module Solargraph
       def send_request method, params, &block
         @request_mutex.synchronize do
           message = {
-            jsonrpc: "2.0",
+            jsonrpc: '2.0',
             method: method,
             params: params,
             id: @next_request_id
@@ -415,13 +419,13 @@ module Solargraph
       # @return [void]
       def unregister_capabilities methods
         logger.debug "Unregistering capabilities: #{methods}"
-        unregisterations = methods.select{|m| registered?(m)}.map{ |m|
+        unregisterations = methods.select { |m| registered?(m) }.map do |m|
           @registered_capabilities.delete m
           {
             id: m,
             method: m
           }
-        }
+        end
         return if unregisterations.empty?
         send_request 'client/unregisterCapability', { unregisterations: unregisterations }
       end
@@ -489,7 +493,7 @@ module Solargraph
               params['data']['location']['range']['end']['character']
             )
           )
-          result.concat library.locate_pins(location).select{ |pin| pin.name == params['label'] }
+          result.concat(library.locate_pins(location).select { |pin| pin.name == params['label'] })
         end
         if params['data']['path']
           result.concat library.path_pins(params['data']['path'])
@@ -543,7 +547,7 @@ module Solargraph
       end
 
       # @return [Bool] if has pending completion request
-      def has_pending_completions?
+      def pending_completions?
         message_worker.messages.reverse_each.any? { |req| req['method'] == 'textDocument/completion' }
       end
 
@@ -644,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 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
@@ -663,7 +666,7 @@ module Solargraph
         requests.keys
       end
 
-      # @return [Hash{String => [Boolean,String]}]
+      # @return [Hash{String => Boolean,String}]
       def default_configuration
         {
           'completion' => true,
@@ -729,9 +732,11 @@ module Solargraph
       end
 
       # @param path [String]
+      # @sg-ignore Need to be able to choose signature on String#gsub
       # @return [String]
       def normalize_separators path
         return path if File::ALT_SEPARATOR.nil?
+        # @sg-ignore flow sensitive typing needs to handle constants
         path.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
       end
 
@@ -742,9 +747,12 @@ module Solargraph
         params['contentChanges'].each do |recvd|
           chng = check_diff(params['textDocument']['uri'], recvd)
           changes.push Solargraph::Source::Change.new(
-            (chng['range'].nil? ?
-              nil :
-              Solargraph::Range.from_to(chng['range']['start']['line'], chng['range']['start']['character'], chng['range']['end']['line'], chng['range']['end']['character'])
+            (if chng['range'].nil?
+               nil
+             else
+               Solargraph::Range.from_to(chng['range']['start']['line'], chng['range']['start']['character'],
+                                         chng['range']['end']['line'], chng['range']['end']['character'])
+             end
             ),
             chng['text']
           )
@@ -764,8 +772,7 @@ module Solargraph
         source = sources.find(uri)
         return change if source.code.length + 1 != change['text'].length
         diffs = Diff::LCS.diff(source.code, change['text'])
-        return change if diffs.length.zero? || diffs.length > 1 || diffs.first.length > 1
-        # @sg-ignore push this upstream
+        return change if diffs.empty? || diffs.length > 1 || diffs.first.length > 1
         # @type [Diff::LCS::Change]
         diff = diffs.first.first
         return change unless diff.adding? && ['.', ':', '(', ',', ' '].include?(diff.element)
@@ -808,10 +815,10 @@ module Solargraph
           # documentSymbolProvider: true,
           # workspaceSymbolProvider: true,
           # workspace: {
-            # workspaceFolders: {
-              # supported: true,
-              # changeNotifications: true
-            # }
+          # workspaceFolders: {
+          # supported: true,
+          # changeNotifications: true
+          # }
           # }
           'textDocument/definition' => {
             definitionProvider: true
@@ -858,7 +865,7 @@ module Solargraph
       end
 
       # @param library [Library]
-      # @param uuid [String, nil]
+      #
       # @return [void]
       def sync_library_map library
         total = library.workspace.sources.length

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

@@ -69,7 +69,7 @@ module Solargraph
           }
           response[:result] = result unless result.nil?
           response[:error] = error unless error.nil?
-          response[:result] = nil if result.nil? and error.nil?
+          response[:result] = nil if result.nil? && error.nil?
           json = response.to_json
           envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
           Solargraph.logger.debug envelope

data/lib/solargraph/language_server/message/client/register_capability.rb

@@ -5,9 +5,7 @@ module Solargraph
     module Message
       module Client
         class RegisterCapability < Solargraph::LanguageServer::Message::Base
-          def process
-            
-          end
+          def process; end
         end
       end
     end

data/lib/solargraph/language_server/message/completion_item/resolve.rb

@@ -21,9 +21,9 @@ module Solargraph
             docs = pins
                    .reject { |pin| pin.documentation.empty? && pin.return_type.undefined? }
             result = params
-              .transform_keys(&:to_sym)
-              .merge(pins.first.resolve_completion_item)
-              .merge(documentation: markup_content(join_docs(docs)))
+                     .transform_keys(&:to_sym)
+                     .merge(pins.first.resolve_completion_item)
+                     .merge(documentation: markup_content(join_docs(docs)))
             result[:detail] = pins.first.detail
             result
           end
@@ -43,12 +43,10 @@ module Solargraph
           def join_docs pins
             result = []
             last_link = nil
-            pins.each_with_index do |pin|
+            pins.each do |pin|
               this_link = host.options['enablePages'] ? pin.link_documentation : pin.text_documentation
-              if this_link && this_link != last_link && this_link != 'undefined'
-                result.push this_link
-              end
-              result.push pin.documentation unless result.last && result.last.end_with?(pin.documentation)
+              result.push this_link if this_link && this_link != last_link && this_link != 'undefined'
+              result.push pin.documentation unless result.last&.end_with?(pin.documentation)
               last_link = this_link
             end
             result.join("\n\n")

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

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-
-# @todo PR the RBS gem to add this
-# @!parse
-#   module ::Gem
-#    class SpecFetcher; end
-#   end
-
 module Solargraph
   module LanguageServer
     module Message
@@ -23,8 +16,8 @@ module Solargraph
 
           # @param obj [Gem::SpecFetcher]
           # @return [Gem::SpecFetcher]
-          def self.fetcher= obj
-            @fetcher = obj
+          class << self
+            attr_writer :fetcher
           end
 
           GEM_ZERO = Gem::Version.new('0.0.0')
@@ -47,11 +40,11 @@ module Solargraph
                                           ['Update now'] do |result|
                                             next unless result == 'Update now'
                                             cmd = if host.options['useBundler']
-                                              'bundle update solargraph'
-                                            else
-                                              'gem update solargraph'
-                                            end
-                                            o, s = Open3.capture2(cmd)
+                                                    'bundle update solargraph'
+                                                  else
+                                                    'gem update solargraph'
+                                                  end
+                                            _, s = Open3.capture2(cmd)
                                             if s == 0
                                               host.show_message 'Successfully updated the Solargraph gem.', LanguageServer::MessageTypes::INFO
                                               host.send_notification '$/solargraph/restart', {}
@@ -64,12 +57,13 @@ module Solargraph
               end
             elsif fetched?
               Solargraph::Logging.logger.warn error
+              # @sg-ignore Need to add nil check here
               host.show_message(error, MessageTypes::ERROR) if params['verbose']
             end
             set_result({
-              installed: current,
-              available: available
-            })
+                         installed: current,
+                         available: available
+                       })
           end
 
           private
@@ -78,12 +72,12 @@ module Solargraph
           attr_reader :current
 
           # @return [Gem::Version]
+          # @sg-ignore Need to add nil check here
           def available
             if !@available && !@fetched
               @fetched = true
               begin
                 @available ||= begin
-                  # @sg-ignore Variable type could not be inferred for tuple
                   # @type [Gem::Dependency, nil]
                   tuple = CheckGemVersion.fetcher.search_for_dependency(Gem::Dependency.new('solargraph')).flatten.first
                   if tuple.nil?

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

@@ -14,6 +14,7 @@ module Solargraph
             )
           rescue StandardError => e
             Solargraph.logger.warn "Error processing document: [#{e.class}] #{e.message}"
+            # @sg-ignore Need to add nil check here
             Solargraph.logger.debug e.backtrace.join("\n")
           end
         end

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

@@ -13,16 +13,16 @@ module Solargraph
           def process
             cmd = [host.command_path, 'gems']
             cmd.push '--rebuild' if params['rebuild']
-            o, s = Open3.capture2(*cmd)
-            if s != 0
-              host.show_message "An error occurred while building gem documentation.", LanguageServer::MessageTypes::ERROR
+            _, s = Open3.capture2(*cmd)
+            if s == 0
               set_result({
-                status: 'err'
-              })
+                           status: 'ok'
+                         })
             else
+              host.show_message 'An error occurred while building gem documentation.', LanguageServer::MessageTypes::ERROR
               set_result({
-                status: 'ok'
-              })
+                           status: 'err'
+                         })
             end
           end
         end

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

@@ -10,7 +10,8 @@ module Solargraph
         #
         class DownloadCore < Base
           def process
-            host.show_message "Downloading cores is deprecated. Solargraph currently uses RBS for core and stdlib documentation", LanguageServer::MessageTypes::INFO
+            host.show_message 'Downloading cores is deprecated. Solargraph currently uses RBS for core and stdlib documentation',
+                              LanguageServer::MessageTypes::INFO
           end
         end
       end

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/extended/search.rb

@@ -8,7 +8,7 @@ module Solargraph
           def process
             results = host.search(params['query'])
             page = Solargraph::Page.new(host.options['viewsPath'])
-            content = page.render('search', layout: true, locals: {query: params['query'], results: results})
+            content = page.render('search', layout: true, locals: { query: params['query'], results: results })
             set_result(
               content: content
             )