solargraph 0.46.0 → 0.54.5

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

@@ -1,27 +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/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/method_not_found.rb

@@ -1,16 +1,16 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      class MethodNotFound < Base
-        def process
-          set_error(
-            Solargraph::LanguageServer::ErrorCodes::METHOD_NOT_FOUND,
-            "Method not found: #{request['method']}"
-          )
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      class MethodNotFound < Base
+        def process
+          set_error(
+            Solargraph::LanguageServer::ErrorCodes::METHOD_NOT_FOUND,
+            "Method not found: #{request['method']}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      class MethodNotImplemented < Base
-        def process
-          # This method ignores optional requests, e.g., any method that
-          # starts with `$/`.
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      class MethodNotImplemented < Base
+        def process
+          # This method ignores optional requests, e.g., any method that
+          # starts with `$/`.
+        end
+      end
+    end
+  end
+end

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

@@ -1,13 +1,13 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      class Shutdown < Base
-        def process
-          # Nothing to do?
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      class Shutdown < Base
+        def process
+          # Nothing to do?
+        end
+      end
+    end
+  end
+end

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

@@ -1,19 +1,19 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class Base < Solargraph::LanguageServer::Message::Base
-          include Solargraph::LanguageServer::UriHelpers
-
-          attr_reader :filename
-
-          def post_initialize
-            @filename = uri_to_file(params['textDocument']['uri'])
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class Base < Solargraph::LanguageServer::Message::Base
+          include Solargraph::LanguageServer::UriHelpers
+
+          attr_reader :filename
+
+          def post_initialize
+            @filename = uri_to_file(params['textDocument']['uri'])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
-
-require 'open3'
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class CodeAction < Base
-          def process
-            # @todo Find code actions
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'open3'
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class CodeAction < Base
+          def process
+            # @todo Find code actions
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,59 +1,56 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class Completion < Base
-          def process
-            return set_error(ErrorCodes::REQUEST_CANCELLED, "cancelled by so many request") if host.has_pending_completions?
-
-            line = params['position']['line']
-            col = params['position']['character']
-            begin
-              completion = host.completions_at(params['textDocument']['uri'], line, col)
-              if host.cancel?(id)
-                return set_result(empty_result) if host.cancel?(id)
-              end
-              items = []
-              last_context = nil
-              idx = -1
-              completion.pins.each do |pin|
-                idx += 1 if last_context != pin.context
-                items.push pin.completion_item.merge({
-                  textEdit: {
-                    range: completion.range.to_hash,
-                    newText: pin.name.sub(/=$/, ' = ').sub(/:$/, ': ')
-                  },
-                  sortText: "#{idx.to_s.rjust(4, '0')}#{pin.name}"
-                })
-                items.last[:data][:uri] = params['textDocument']['uri']
-                last_context = pin.context
-              end
-              set_result(
-                isIncomplete: false,
-                items: items
-              )
-            rescue InvalidOffsetError => e
-              Logging.logger.info "Completion ignored invalid offset: #{params['textDocument']['uri']}, line #{line}, character #{col}"
-              set_result empty_result
-            end
-          rescue FileNotFoundError => e
-            Logging.logger.warn "[#{e.class}] #{e.message}"
-            Logging.logger.warn e.backtrace.join("\n")
-            set_result empty_result
-          end
-
-          # @param incomplete [Boolean]
-          # @return [Hash]
-          def empty_result incomplete = false
-            {
-              isIncomplete: incomplete,
-              items: []
-            }
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class Completion < Base
+          def process
+            return set_error(ErrorCodes::REQUEST_CANCELLED, "cancelled by so many request") if host.has_pending_completions?
+
+            line = params['position']['line']
+            col = params['position']['character']
+            begin
+              completion = host.completions_at(params['textDocument']['uri'], line, col)
+              items = []
+              last_context = nil
+              idx = -1
+              completion.pins.each do |pin|
+                idx += 1 if last_context != pin.context
+                items.push pin.completion_item.merge({
+                  textEdit: {
+                    range: completion.range.to_hash,
+                    newText: pin.name.sub(/=$/, ' = ').sub(/:$/, ': ')
+                  },
+                  sortText: "#{idx.to_s.rjust(4, '0')}#{pin.name}"
+                })
+                items.last[:data][:uri] = params['textDocument']['uri']
+                last_context = pin.context
+              end
+              set_result(
+                isIncomplete: false,
+                items: items
+              )
+            rescue InvalidOffsetError => e
+              Logging.logger.info "Completion ignored invalid offset: #{params['textDocument']['uri']}, line #{line}, character #{col}"
+              set_result empty_result
+            end
+          rescue FileNotFoundError => e
+            Logging.logger.warn "[#{e.class}] #{e.message}"
+            Logging.logger.warn e.backtrace.join("\n")
+            set_result empty_result
+          end
+
+          # @param incomplete [Boolean]
+          # @return [Hash]
+          def empty_result incomplete = false
+            {
+              isIncomplete: incomplete,
+              items: []
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,38 +1,38 @@
-# frozen_string_literal: true
-
-module Solargraph::LanguageServer::Message::TextDocument
-  class Definition < Base
-    def process
-      @line = params['position']['line']
-      @column = params['position']['character']
-      set_result(code_location || require_location || [])
-    end
-
-    private
-
-    def code_location
-      suggestions = host.definitions_at(params['textDocument']['uri'], @line, @column)
-      return nil if suggestions.empty?
-      suggestions.reject { |pin| pin.location.nil? || pin.location.filename.nil? }.map do |pin|
-        {
-          uri: file_to_uri(pin.location.filename),
-          range: pin.location.range.to_hash
-        }
-      end
-    end
-
-    def require_location
-      # @todo Terrible hack
-      lib = host.library_for(params['textDocument']['uri'])
-      rloc = Solargraph::Location.new(uri_to_file(params['textDocument']['uri']), Solargraph::Range.from_to(@line, @column, @line, @column))
-      dloc = lib.locate_ref(rloc)
-      return nil if dloc.nil?
-      [
-        {
-          uri: file_to_uri(dloc.filename),
-          range: dloc.range.to_hash
-        }
-      ]
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::TextDocument
+  class Definition < Base
+    def process
+      @line = params['position']['line']
+      @column = params['position']['character']
+      set_result(code_location || require_location || [])
+    end
+
+    private
+
+    def code_location
+      suggestions = host.definitions_at(params['textDocument']['uri'], @line, @column)
+      return nil if suggestions.empty?
+      suggestions.reject { |pin| pin.best_location.nil? || pin.best_location.filename.nil? }.map do |pin|
+        {
+          uri: file_to_uri(pin.best_location.filename),
+          range: pin.best_location.range.to_hash
+        }
+      end
+    end
+
+    def require_location
+      # @todo Terrible hack
+      lib = host.library_for(params['textDocument']['uri'])
+      rloc = Solargraph::Location.new(uri_to_file(params['textDocument']['uri']), Solargraph::Range.from_to(@line, @column, @line, @column))
+      dloc = lib.locate_ref(rloc)
+      return nil if dloc.nil?
+      [
+        {
+          uri: file_to_uri(dloc.filename),
+          range: dloc.range.to_hash
+        }
+      ]
+    end
+  end
+end

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

@@ -1,15 +1,15 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class DidChange < Base
-          def process
-            host.change params
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class DidChange < Base
+          def process
+            host.change params
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,15 +1,15 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class DidClose < Base
-          def process
-            host.close params['textDocument']['uri']
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class DidClose < Base
+          def process
+            host.close params['textDocument']['uri']
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,15 +1,15 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class DidOpen < Base
-          def process
-            host.open params['textDocument']['uri'], params['textDocument']['text'], params['textDocument']['version']
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class DidOpen < Base
+          def process
+            host.open params['textDocument']['uri'], params['textDocument']['text'], params['textDocument']['version']
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,17 +1,17 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class DidSave < Base
-          def process
-            # @todo The server might not need to do anything in response to
-            #   this notification. See https://github.com/castwide/solargraph/issues/73
-            # host.save params
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class DidSave < Base
+          def process
+            # @todo The server might not need to do anything in response to
+            #   this notification. See https://github.com/castwide/solargraph/issues/73
+            # host.save params
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,23 +1,26 @@
-# frozen_string_literal: true
-
-class Solargraph::LanguageServer::Message::TextDocument::DocumentSymbol < Solargraph::LanguageServer::Message::Base
-  include Solargraph::LanguageServer::UriHelpers
-
-  def process
-    pins = host.document_symbols params['textDocument']['uri']
-    info = pins.map do |pin|
-      result = {
-        name: pin.name,
-        containerName: pin.namespace,
-        kind: pin.symbol_kind,
-        location: {
-          uri: file_to_uri(pin.location.filename),
-          range: pin.location.range.to_hash
-        },
-        deprecated: pin.deprecated?
-      }
-      result
-    end
-    set_result info
-  end
-end
+# frozen_string_literal: true
+
+class Solargraph::LanguageServer::Message::TextDocument::DocumentSymbol < Solargraph::LanguageServer::Message::Base
+  include Solargraph::LanguageServer::UriHelpers
+
+  def process
+    pins = host.document_symbols params['textDocument']['uri']
+    info = pins.map do |pin|
+      next nil unless pin.best_location&.filename
+
+      result = {
+        name: pin.name,
+        containerName: pin.namespace,
+        kind: pin.symbol_kind,
+        location: {
+          uri: file_to_uri(pin.best_location.filename),
+          range: pin.best_location.range.to_hash
+        },
+        deprecated: pin.deprecated?
+      }
+      result
+    end.compact
+
+    set_result info
+  end
+end