solargraph 0.58.3 → 0.59.0.dev.1

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

@@ -1,16 +1,16 @@
-# frozen_string_literal: true
-
-module Solargraph::LanguageServer::Message::TextDocument
-  class References < Base
-    def process
-      locs = host.references_from(params['textDocument']['uri'], params['position']['line'], params['position']['character'])
-      result = locs.map do |loc|
-        {
-          uri: file_to_uri(loc.filename),
-          range: loc.range.to_hash
-        }
-      end
-      set_result result
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::TextDocument
+  class References < Base
+    def process
+      locs = host.references_from(params['textDocument']['uri'], params['position']['line'], params['position']['character'])
+      result = locs.map do |loc|
+        {
+          uri: file_to_uri(loc.filename),
+          range: loc.range.to_hash
+        }
+      end
+      set_result result
+    end
+  end
+end

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

@@ -1,19 +1,19 @@
-# frozen_string_literal: true
-
-module Solargraph::LanguageServer::Message::TextDocument
-  class Rename < Base
-    def process
-      locs = host.references_from(params['textDocument']['uri'], params['position']['line'], params['position']['character'], strip: true)
-      changes = {}
-      locs.each do |loc|
-        uri = file_to_uri(loc.filename)
-        changes[uri] ||= []
-        changes[uri].push({
-          range: loc.range.to_hash,
-          newText: params['newName']
-        })
-      end
-      set_result changes: changes
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::TextDocument
+  class Rename < Base
+    def process
+      locs = host.references_from(params['textDocument']['uri'], params['position']['line'], params['position']['character'], strip: true)
+      changes = {}
+      locs.each do |loc|
+        uri = file_to_uri(loc.filename)
+        changes[uri] ||= []
+        changes[uri].push({
+          range: loc.range.to_hash,
+          newText: params['newName']
+        })
+      end
+      set_result changes: changes
+    end
+  end
+end

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

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

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

@@ -13,7 +13,9 @@ module Solargraph::LanguageServer::Message::TextDocument
     # @return [Array<Hash>, nil]
     def code_location
       suggestions = host.type_definitions_at(params['textDocument']['uri'], @line, @column)
+      # @sg-ignore Need to add nil check here
       return nil if suggestions.empty?
+      # @sg-ignore Need to add nil check here
       suggestions.reject { |pin| pin.best_location.nil? || pin.best_location.filename.nil? }.map do |pin|
         {
           uri: file_to_uri(pin.best_location.filename),

data/lib/solargraph/language_server/message/workspace/did_change_configuration.rb

@@ -1,35 +1,35 @@
-# frozen_string_literal: true
-
-module Solargraph::LanguageServer::Message::Workspace
-  class DidChangeConfiguration < Solargraph::LanguageServer::Message::Base
-    def process
-      return unless params['settings']
-      update = params['settings']['solargraph']
-      host.configure update
-      register_from_options
-    end
-
-    private
-
-    # @return [void]
-    def register_from_options
-      Solargraph.logger.debug "Registering capabilities from options: #{host.options.inspect}"
-      # @type [Array<String>]
-      y = []
-      # @type [Array<String>]
-      n = []
-      (host.options['completion'] ? y : n).push('textDocument/completion')
-      (host.options['hover'] ? y : n).push('textDocument/hover', 'textDocument/signatureHelp')
-      (host.options['autoformat'] ? y : n).push('textDocument/onTypeFormatting')
-      (host.options['formatting'] ? y : n).push('textDocument/formatting')
-      (host.options['symbols'] ? y : n).push('textDocument/documentSymbol', 'workspace/symbol')
-      (host.options['definitions'] ? y : n).push('textDocument/definition')
-      (host.options['typeDefinitions'] ? y : n).push('textDocument/typeDefinition')
-      (host.options['references'] ? y : n).push('textDocument/references')
-      (host.options['folding'] ? y : n).push('textDocument/folding')
-      (host.options['highlights'] ? y : n).push('textDocument/documentHighlight')
-      host.register_capabilities y
-      host.unregister_capabilities n
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::Workspace
+  class DidChangeConfiguration < Solargraph::LanguageServer::Message::Base
+    def process
+      return unless params['settings']
+      update = params['settings']['solargraph']
+      host.configure update
+      register_from_options
+    end
+
+    private
+
+    # @return [void]
+    def register_from_options
+      Solargraph.logger.debug "Registering capabilities from options: #{host.options.inspect}"
+      # @type [Array<String>]
+      y = []
+      # @type [Array<String>]
+      n = []
+      (host.options['completion'] ? y : n).push('textDocument/completion')
+      (host.options['hover'] ? y : n).push('textDocument/hover', 'textDocument/signatureHelp')
+      (host.options['autoformat'] ? y : n).push('textDocument/onTypeFormatting')
+      (host.options['formatting'] ? y : n).push('textDocument/formatting')
+      (host.options['symbols'] ? y : n).push('textDocument/documentSymbol', 'workspace/symbol')
+      (host.options['definitions'] ? y : n).push('textDocument/definition')
+      (host.options['typeDefinitions'] ? y : n).push('textDocument/typeDefinition')
+      (host.options['references'] ? y : n).push('textDocument/references')
+      (host.options['folding'] ? y : n).push('textDocument/folding')
+      (host.options['highlights'] ? y : n).push('textDocument/documentHighlight')
+      host.register_capabilities y
+      host.unregister_capabilities n
+    end
+  end
+end

data/lib/solargraph/language_server/message/workspace/did_change_watched_files.rb

@@ -1,40 +1,40 @@
-# frozen_string_literal: true
-
-module Solargraph::LanguageServer::Message::Workspace
-  class DidChangeWatchedFiles < Solargraph::LanguageServer::Message::Base
-    CREATED = 1
-    CHANGED = 2
-    DELETED = 3
-
-    include Solargraph::LanguageServer::UriHelpers
-
-    def process
-      need_catalog = false
-      to_create = []
-      to_delete = []
-
-      # @param change [Hash]
-      params['changes'].each do |change|
-        if change['type'] == CREATED
-          to_create << change['uri']
-          need_catalog = true
-        elsif change['type'] == CHANGED
-          next if host.open?(change['uri'])
-          to_create << change['uri']
-          need_catalog = true
-        elsif change['type'] == DELETED
-          to_delete << change['uri']
-          need_catalog = true
-        else
-          set_error Solargraph::LanguageServer::ErrorCodes::INVALID_PARAMS, "Unknown change type ##{change['type']} for #{uri_to_file(change['uri'])}"
-        end
-      end
-
-      host.create *to_create
-      host.delete *to_delete
-
-      # Force host to catalog libraries after file changes (see castwide/solargraph#139)
-      host.catalog if need_catalog
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::Workspace
+  class DidChangeWatchedFiles < Solargraph::LanguageServer::Message::Base
+    CREATED = 1
+    CHANGED = 2
+    DELETED = 3
+
+    include Solargraph::LanguageServer::UriHelpers
+
+    def process
+      need_catalog = false
+      to_create = []
+      to_delete = []
+
+      # @param change [Hash]
+      params['changes'].each do |change|
+        if change['type'] == CREATED
+          to_create << change['uri']
+          need_catalog = true
+        elsif change['type'] == CHANGED
+          next if host.open?(change['uri'])
+          to_create << change['uri']
+          need_catalog = true
+        elsif change['type'] == DELETED
+          to_delete << change['uri']
+          need_catalog = true
+        else
+          set_error Solargraph::LanguageServer::ErrorCodes::INVALID_PARAMS, "Unknown change type ##{change['type']} for #{uri_to_file(change['uri'])}"
+        end
+      end
+
+      host.create *to_create
+      host.delete *to_delete
+
+      # Force host to catalog libraries after file changes (see castwide/solargraph#139)
+      host.catalog if need_catalog
+    end
+  end
+end

data/lib/solargraph/language_server/message/workspace/did_change_workspace_folders.rb

@@ -1,26 +1,26 @@
-# frozen_string_literal: true
-
-module Solargraph::LanguageServer::Message::Workspace
-  class DidChangeWorkspaceFolders < Solargraph::LanguageServer::Message::Base
-    def process
-      add_folders
-      remove_folders
-    end
-
-    private
-
-    # @return [void]
-    def add_folders
-      return unless params['event'] && params['event']['added']
-      host.prepare_folders params['event']['added']
-    end
-
-    # @return [void]
-    def remove_folders
-      return unless params['event'] && params['event']['removed']
-      params['event']['removed'].each do |folder|
-        host.remove_folders params['event']['removed']
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::Workspace
+  class DidChangeWorkspaceFolders < Solargraph::LanguageServer::Message::Base
+    def process
+      add_folders
+      remove_folders
+    end
+
+    private
+
+    # @return [void]
+    def add_folders
+      return unless params['event'] && params['event']['added']
+      host.prepare_folders params['event']['added']
+    end
+
+    # @return [void]
+    def remove_folders
+      return unless params['event'] && params['event']['removed']
+      params['event']['removed'].each do |folder|
+        host.remove_folders params['event']['removed']
+      end
+    end
+  end
+end

data/lib/solargraph/language_server/message/workspace/workspace_symbol.rb

@@ -6,6 +6,7 @@ class Solargraph::LanguageServer::Message::Workspace::WorkspaceSymbol < Solargra
   def process
     pins = host.query_symbols(params['query'])
     info = pins.map do |pin|
+      # @sg-ignore Need to add nil check here
       uri = file_to_uri(pin.best_location.filename)
       {
         name: pin.path,
@@ -13,6 +14,7 @@ class Solargraph::LanguageServer::Message::Workspace::WorkspaceSymbol < Solargra
         kind: pin.symbol_kind,
         location: {
           uri: uri,
+          # @sg-ignore Need to add nil check here
           range: pin.best_location.range.to_hash
         },
         deprecated: pin.deprecated?

data/lib/solargraph/language_server/message.rb

@@ -1,94 +1,94 @@
-# frozen_string_literal: true
-
-require 'solargraph'
-
-module Solargraph
-  module LanguageServer
-    # The Message namespace contains classes that implement language server
-    # protocol methods.
-    #
-    module Message
-      autoload :Base,                 'solargraph/language_server/message/base'
-      autoload :Initialize,           'solargraph/language_server/message/initialize'
-      autoload :Initialized,          'solargraph/language_server/message/initialized'
-      autoload :TextDocument,         'solargraph/language_server/message/text_document'
-      autoload :CompletionItem,       'solargraph/language_server/message/completion_item'
-      autoload :CancelRequest,        'solargraph/language_server/message/cancel_request'
-      autoload :MethodNotFound,       'solargraph/language_server/message/method_not_found'
-      autoload :MethodNotImplemented, 'solargraph/language_server/message/method_not_implemented'
-      autoload :Extended,             'solargraph/language_server/message/extended'
-      autoload :Shutdown,             'solargraph/language_server/message/shutdown'
-      autoload :ExitNotification,     'solargraph/language_server/message/exit_notification'
-      autoload :Workspace,            'solargraph/language_server/message/workspace'
-
-      class << self
-        # Register a method name and message for handling by the language
-        # server.
-        #
-        # @example
-        #   Message.register 'initialize', Solargraph::Message::Initialize
-        #
-        # @param path [String] The method name
-        # @param message_class [Class<Message::Base>] The message class
-        # @return [void]
-        def register path, message_class
-          method_map[path] = message_class
-        end
-
-        # @param path [String]
-        # @return [Class<Solargraph::LanguageServer::Message::Base>]
-        def select path
-          if method_map.has_key?(path)
-            method_map[path]
-          elsif path.start_with?('$/')
-            MethodNotImplemented
-          else
-            MethodNotFound
-          end
-        end
-
-        private
-
-        # @return [Hash{String => Class<Message::Base>}]
-        def method_map
-          @method_map ||= {}
-        end
-      end
-
-      register 'initialize',                          Initialize
-      register 'initialized',                         Initialized
-      register 'textDocument/completion',             TextDocument::Completion
-      register 'completionItem/resolve',              CompletionItem::Resolve
-      register 'textDocument/signatureHelp',          TextDocument::SignatureHelp
-      register 'textDocument/didOpen',                TextDocument::DidOpen
-      register 'textDocument/didChange',              TextDocument::DidChange
-      register 'textDocument/didSave',                TextDocument::DidSave
-      register 'textDocument/didClose',               TextDocument::DidClose
-      register 'textDocument/hover',                  TextDocument::Hover
-      register 'textDocument/definition',             TextDocument::Definition
-      register 'textDocument/typeDefinition',         TextDocument::TypeDefinition
-      register 'textDocument/formatting',             TextDocument::Formatting
-      register 'textDocument/onTypeFormatting',       TextDocument::OnTypeFormatting
-      register 'textDocument/documentSymbol',         TextDocument::DocumentSymbol
-      register 'textDocument/references',             TextDocument::References
-      register 'textDocument/rename',                 TextDocument::Rename
-      register 'textDocument/prepareRename',          TextDocument::PrepareRename
-      register 'textDocument/foldingRange',           TextDocument::FoldingRange
-      # register 'textDocument/codeAction',             TextDocument::CodeAction
-      register 'textDocument/documentHighlight',      TextDocument::DocumentHighlight
-      register 'workspace/didChangeWatchedFiles',     Workspace::DidChangeWatchedFiles
-      register 'workspace/didChangeConfiguration',    Workspace::DidChangeConfiguration
-      register 'workspace/didChangeWorkspaceFolders', Workspace::DidChangeWorkspaceFolders
-      register 'workspace/symbol',                    Workspace::WorkspaceSymbol
-      register '$/cancelRequest',                     CancelRequest
-      register '$/solargraph/document',               Extended::Document
-      register '$/solargraph/search',                 Extended::Search
-      register '$/solargraph/checkGemVersion',        Extended::CheckGemVersion
-      register '$/solargraph/documentGems',           Extended::DocumentGems
-      register '$/solargraph/downloadCore',           Extended::DownloadCore
-      register '$/solargraph/environment',            Extended::Environment
-      register 'shutdown',                            Shutdown
-      register 'exit',                                ExitNotification
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'solargraph'
+
+module Solargraph
+  module LanguageServer
+    # The Message namespace contains classes that implement language server
+    # protocol methods.
+    #
+    module Message
+      autoload :Base,                 'solargraph/language_server/message/base'
+      autoload :Initialize,           'solargraph/language_server/message/initialize'
+      autoload :Initialized,          'solargraph/language_server/message/initialized'
+      autoload :TextDocument,         'solargraph/language_server/message/text_document'
+      autoload :CompletionItem,       'solargraph/language_server/message/completion_item'
+      autoload :CancelRequest,        'solargraph/language_server/message/cancel_request'
+      autoload :MethodNotFound,       'solargraph/language_server/message/method_not_found'
+      autoload :MethodNotImplemented, 'solargraph/language_server/message/method_not_implemented'
+      autoload :Extended,             'solargraph/language_server/message/extended'
+      autoload :Shutdown,             'solargraph/language_server/message/shutdown'
+      autoload :ExitNotification,     'solargraph/language_server/message/exit_notification'
+      autoload :Workspace,            'solargraph/language_server/message/workspace'
+
+      class << self
+        # Register a method name and message for handling by the language
+        # server.
+        #
+        # @example
+        #   Message.register 'initialize', Solargraph::Message::Initialize
+        #
+        # @param path [String] The method name
+        # @param message_class [Class<Message::Base>] The message class
+        # @return [void]
+        def register path, message_class
+          method_map[path] = message_class
+        end
+
+        # @param path [String]
+        # @return [Class<Solargraph::LanguageServer::Message::Base>]
+        def select path
+          if method_map.has_key?(path)
+            method_map[path]
+          elsif path.start_with?('$/')
+            MethodNotImplemented
+          else
+            MethodNotFound
+          end
+        end
+
+        private
+
+        # @return [Hash{String => Class<Message::Base>}]
+        def method_map
+          @method_map ||= {}
+        end
+      end
+
+      register 'initialize',                          Initialize
+      register 'initialized',                         Initialized
+      register 'textDocument/completion',             TextDocument::Completion
+      register 'completionItem/resolve',              CompletionItem::Resolve
+      register 'textDocument/signatureHelp',          TextDocument::SignatureHelp
+      register 'textDocument/didOpen',                TextDocument::DidOpen
+      register 'textDocument/didChange',              TextDocument::DidChange
+      register 'textDocument/didSave',                TextDocument::DidSave
+      register 'textDocument/didClose',               TextDocument::DidClose
+      register 'textDocument/hover',                  TextDocument::Hover
+      register 'textDocument/definition',             TextDocument::Definition
+      register 'textDocument/typeDefinition',         TextDocument::TypeDefinition
+      register 'textDocument/formatting',             TextDocument::Formatting
+      register 'textDocument/onTypeFormatting',       TextDocument::OnTypeFormatting
+      register 'textDocument/documentSymbol',         TextDocument::DocumentSymbol
+      register 'textDocument/references',             TextDocument::References
+      register 'textDocument/rename',                 TextDocument::Rename
+      register 'textDocument/prepareRename',          TextDocument::PrepareRename
+      register 'textDocument/foldingRange',           TextDocument::FoldingRange
+      # register 'textDocument/codeAction',             TextDocument::CodeAction
+      register 'textDocument/documentHighlight',      TextDocument::DocumentHighlight
+      register 'workspace/didChangeWatchedFiles',     Workspace::DidChangeWatchedFiles
+      register 'workspace/didChangeConfiguration',    Workspace::DidChangeConfiguration
+      register 'workspace/didChangeWorkspaceFolders', Workspace::DidChangeWorkspaceFolders
+      register 'workspace/symbol',                    Workspace::WorkspaceSymbol
+      register '$/cancelRequest',                     CancelRequest
+      register '$/solargraph/document',               Extended::Document
+      register '$/solargraph/search',                 Extended::Search
+      register '$/solargraph/checkGemVersion',        Extended::CheckGemVersion
+      register '$/solargraph/documentGems',           Extended::DocumentGems
+      register '$/solargraph/downloadCore',           Extended::DownloadCore
+      register '$/solargraph/environment',            Extended::Environment
+      register 'shutdown',                            Shutdown
+      register 'exit',                                ExitNotification
+    end
+  end
+end

data/lib/solargraph/language_server/request.rb

@@ -1,27 +1,27 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    class Request
-      # @param id [Integer]
-      # @param &block The block that processes the client's response
-      def initialize id, &block
-        @id = id
-        @block = block
-      end
-
-      # @param result [Object]
-      # @generic T
-      # @yieldreturn [generic<T>]
-      # @return [generic<T>, nil]
-      def process result
-        @block.call(result) unless @block.nil?
-      end
-
-      # @return [void]
-      def send_response
-        # noop
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    class Request
+      # @param id [Integer]
+      # @param &block The block that processes the client's response
+      def initialize id, &block
+        @id = id
+        @block = block
+      end
+
+      # @param result [Object]
+      # @generic T
+      # @yieldreturn [generic<T>]
+      # @return [generic<T>, nil]
+      def process result
+        @block.call(result) unless @block.nil?
+      end
+
+      # @return [void]
+      def send_response
+        # noop
+      end
+    end
+  end
+end