solargraph 0.58.2 → 0.59.0.dev.2

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

@@ -1,60 +1,58 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module CompletionItem
-        # completionItem/resolve message handler
-        #
-        class Resolve < Base
-          def process
-            pins = host.locate_pins(params)
-            set_result merge(pins)
-          end
-
-          private
-
-          # @param pins [Array<Pin::Base>]
-          # @return [Hash]
-          def merge pins
-            return params if pins.empty?
-            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)))
-            result[:detail] = pins.first.detail
-            result
-          end
-
-          # @param text [String]
-          # @return [Hash{Symbol => String}, nil]
-          def markup_content text
-            return nil if text.strip.empty?
-            {
-              kind: 'markdown',
-              value: text
-            }
-          end
-
-          # @param pins [Array<Pin::Base>]
-          # @return [String]
-          def join_docs pins
-            result = []
-            last_link = nil
-            pins.each_with_index 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)
-              last_link = this_link
-            end
-            result.join("\n\n")
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module CompletionItem
+        # completionItem/resolve message handler
+        #
+        class Resolve < Base
+          def process
+            pins = host.locate_pins(params)
+            set_result merge(pins)
+          end
+
+          private
+
+          # @param pins [Array<Pin::Base>]
+          # @return [Hash]
+          def merge pins
+            return params if pins.empty?
+            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)))
+            result[:detail] = pins.first.detail
+            result
+          end
+
+          # @param text [String]
+          # @return [Hash{Symbol => String}, nil]
+          def markup_content text
+            return nil if text.strip.empty?
+            {
+              kind: 'markdown',
+              value: text
+            }
+          end
+
+          # @param pins [Array<Pin::Base>]
+          # @return [String]
+          def join_docs pins
+            result = []
+            last_link = nil
+            pins.each do |pin|
+              this_link = host.options['enablePages'] ? pin.link_documentation : pin.text_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")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,32 +1,32 @@
-# frozen_string_literal: true
-
-require 'open3'
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module Extended
-        # Update YARD documentation for installed gems. If the `rebuild`
-        # parameter is true, rebuild existing yardocs.
-        #
-        class DocumentGems < Base
-          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
-              set_result({
-                status: 'err'
-              })
-            else
-              set_result({
-                status: 'ok'
-              })
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'open3'
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module Extended
+        # Update YARD documentation for installed gems. If the `rebuild`
+        # parameter is true, rebuild existing yardocs.
+        #
+        class DocumentGems < Base
+          def process
+            cmd = [host.command_path, 'gems']
+            cmd.push '--rebuild' if params['rebuild']
+            _, s = Open3.capture2(*cmd)
+            if s == 0
+              set_result({
+                           status: 'ok'
+                         })
+            else
+              host.show_message 'An error occurred while building gem documentation.', LanguageServer::MessageTypes::ERROR
+              set_result({
+                           status: 'err'
+                         })
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,19 +1,20 @@
-# frozen_string_literal: true
-
-require 'open3'
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module Extended
-        # Update core Ruby documentation.
-        #
-        class DownloadCore < Base
-          def process
-            host.show_message "Downloading cores is deprecated. Solargraph currently uses RBS for core and stdlib documentation", LanguageServer::MessageTypes::INFO
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'open3'
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module Extended
+        # Update core Ruby documentation.
+        #
+        class DownloadCore < Base
+          def process
+            host.show_message 'Downloading cores is deprecated. Solargraph currently uses RBS for core and stdlib documentation',
+                              LanguageServer::MessageTypes::INFO
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,20 +1,20 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module Extended
-        class Search < Base
-          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})
-            set_result(
-              content: content
-            )
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module Extended
+        class Search < Base
+          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 })
+            set_result(
+              content: content
+            )
+          end
+        end
+      end
+    end
+  end
+end