solargraph 0.58.2 → 0.58.3

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

@@ -1,191 +1,191 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    module Message
-      class Initialize < Base
-        def process
-          host.configure params['initializationOptions']
-          host.client_capabilities = params['capabilities']
-          if support_workspace_folders?
-            host.prepare_folders params['workspaceFolders']
-          elsif params['rootUri']
-            host.prepare UriHelpers.uri_to_file(params['rootUri'])
-          else
-            host.prepare params['rootPath']
-          end
-          result = {
-            capabilities: {
-              textDocumentSync: 2, # @todo What should this be?
-              workspace: {
-                workspaceFolders: {
-                  supported: true,
-                  changeNotifications: true
-                }
-              }
-            }
-          }
-          # FIXME: lsp default is utf-16, may have different position
-          result[:capabilities][:positionEncoding] = "utf-32" if params.dig("capabilities", "general", "positionEncodings")&.include?("utf-32")
-          result[:capabilities].merge! static_completion unless dynamic_registration_for?('textDocument', 'completion')
-          result[:capabilities].merge! static_signature_help unless dynamic_registration_for?('textDocument', 'signatureHelp')
-          # result[:capabilities].merge! static_on_type_formatting unless dynamic_registration_for?('textDocument', 'onTypeFormatting')
-          result[:capabilities].merge! static_hover unless dynamic_registration_for?('textDocument', 'hover')
-          result[:capabilities].merge! static_document_formatting unless dynamic_registration_for?('textDocument', 'formatting')
-          result[:capabilities].merge! static_document_symbols unless dynamic_registration_for?('textDocument', 'documentSymbol')
-          result[:capabilities].merge! static_definitions unless dynamic_registration_for?('textDocument', 'definition')
-          result[:capabilities].merge! static_type_definitions unless dynamic_registration_for?('textDocument', 'typeDefinition')
-          result[:capabilities].merge! static_rename unless dynamic_registration_for?('textDocument', 'rename')
-          result[:capabilities].merge! static_references unless dynamic_registration_for?('textDocument', 'references')
-          result[:capabilities].merge! static_workspace_symbols unless dynamic_registration_for?('workspace', 'symbol')
-          result[:capabilities].merge! static_folding_range unless dynamic_registration_for?('textDocument', 'foldingRange')
-          result[:capabilities].merge! static_highlights unless dynamic_registration_for?('textDocument', 'documentHighlight')
-          # @todo Temporarily disabled
-          # result[:capabilities].merge! static_code_action unless dynamic_registration_for?('textDocument', 'codeAction')
-          set_result result
-        end
-
-        private
-
-        # @todo '?' methods should type like RBS 'boolish' rather than a strict true or false
-        # @sg-ignore
-        def support_workspace_folders?
-          params['capabilities'] &&
-            params['capabilities']['workspace'] &&
-            params['capabilities']['workspace']['workspaceFolders'] &&
-            params['workspaceFolders']
-        end
-
-        # @return [Hash{Symbol => undefined}]
-        def static_completion
-          return {} unless host.options['completion']
-          {
-            completionProvider: {
-              resolveProvider: true,
-              triggerCharacters: ['.', ':', '@']
-            }
-          }
-        end
-
-        # @return [Hash{Symbol => BasicObject}]
-        def static_code_action
-          {
-            codeActionProvider: true,
-            codeActionKinds: ["quickfix"]
-          }
-        end
-
-        # @return [Hash{Symbol => BasicObject}]
-        def static_signature_help
-          {
-            signatureHelpProvider: {
-              triggerCharacters: ['(', ',']
-            }
-          }
-        end
-
-        # @return [Hash{Symbol => Hash{Symbol => String, Array<String>}}]
-        def static_on_type_formatting
-          {
-            documentOnTypeFormattingProvider: {
-              firstTriggerCharacter: '{',
-              moreTriggerCharacter: ['(']
-            }
-          }
-        end
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_hover
-          return {} unless host.options['hover']
-          {
-            hoverProvider: true
-          }
-        end
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_document_formatting
-          return {} unless host.options['formatting']
-          {
-            documentFormattingProvider: true
-          }
-        end
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_document_symbols
-          return {} unless host.options['symbols']
-          {
-            documentSymbolProvider: true
-          }
-        end
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_workspace_symbols
-          {
-            workspaceSymbolProvider: true
-          }
-        end
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_definitions
-          return {} unless host.options['definitions']
-          {
-            definitionProvider: true
-          }
-        end
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_type_definitions
-          return {} unless host.options['typeDefinitions']
-          {
-            typeDefinitionProvider: true
-          }
-        end
-
-        # @return [Hash{Symbol => Hash{Symbol => Boolean}}]
-        def static_rename
-          {
-            renameProvider: {prepareProvider: true}
-          }
-        end
-
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_references
-          return {} unless host.options['references']
-          {
-            referencesProvider: true
-          }
-        end
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_folding_range
-          return {} unless host.options['folding']
-          {
-            foldingRangeProvider: true
-          }
-        end
-
-        # @return [Hash{Symbol => Boolean}]
-        def static_highlights
-          {
-            documentHighlightProvider: true
-          }
-        end
-
-        # @param section [String]
-        # @param capability [String]
-        # @todo Need support for RBS' boolish "type", which doesn't
-        #   enforce strict true/false-ness
-        # @sg-ignore
-        def dynamic_registration_for? section, capability
-          result = (params['capabilities'] &&
-            params['capabilities'][section] &&
-            params['capabilities'][section][capability] &&
-            params['capabilities'][section][capability]['dynamicRegistration'])
-          host.allow_registration("#{section}/#{capability}") if result
-          result
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  module LanguageServer
+    module Message
+      class Initialize < Base
+        def process
+          host.configure params['initializationOptions']
+          host.client_capabilities = params['capabilities']
+          if support_workspace_folders?
+            host.prepare_folders params['workspaceFolders']
+          elsif params['rootUri']
+            host.prepare UriHelpers.uri_to_file(params['rootUri'])
+          else
+            host.prepare params['rootPath']
+          end
+          result = {
+            capabilities: {
+              textDocumentSync: 2, # @todo What should this be?
+              workspace: {
+                workspaceFolders: {
+                  supported: true,
+                  changeNotifications: true
+                }
+              }
+            }
+          }
+          # FIXME: lsp default is utf-16, may have different position
+          result[:capabilities][:positionEncoding] = "utf-32" if params.dig("capabilities", "general", "positionEncodings")&.include?("utf-32")
+          result[:capabilities].merge! static_completion unless dynamic_registration_for?('textDocument', 'completion')
+          result[:capabilities].merge! static_signature_help unless dynamic_registration_for?('textDocument', 'signatureHelp')
+          # result[:capabilities].merge! static_on_type_formatting unless dynamic_registration_for?('textDocument', 'onTypeFormatting')
+          result[:capabilities].merge! static_hover unless dynamic_registration_for?('textDocument', 'hover')
+          result[:capabilities].merge! static_document_formatting unless dynamic_registration_for?('textDocument', 'formatting')
+          result[:capabilities].merge! static_document_symbols unless dynamic_registration_for?('textDocument', 'documentSymbol')
+          result[:capabilities].merge! static_definitions unless dynamic_registration_for?('textDocument', 'definition')
+          result[:capabilities].merge! static_type_definitions unless dynamic_registration_for?('textDocument', 'typeDefinition')
+          result[:capabilities].merge! static_rename unless dynamic_registration_for?('textDocument', 'rename')
+          result[:capabilities].merge! static_references unless dynamic_registration_for?('textDocument', 'references')
+          result[:capabilities].merge! static_workspace_symbols unless dynamic_registration_for?('workspace', 'symbol')
+          result[:capabilities].merge! static_folding_range unless dynamic_registration_for?('textDocument', 'foldingRange')
+          result[:capabilities].merge! static_highlights unless dynamic_registration_for?('textDocument', 'documentHighlight')
+          # @todo Temporarily disabled
+          # result[:capabilities].merge! static_code_action unless dynamic_registration_for?('textDocument', 'codeAction')
+          set_result result
+        end
+
+        private
+
+        # @todo '?' methods should type like RBS 'boolish' rather than a strict true or false
+        # @sg-ignore
+        def support_workspace_folders?
+          params['capabilities'] &&
+            params['capabilities']['workspace'] &&
+            params['capabilities']['workspace']['workspaceFolders'] &&
+            params['workspaceFolders']
+        end
+
+        # @return [Hash{Symbol => undefined}]
+        def static_completion
+          return {} unless host.options['completion']
+          {
+            completionProvider: {
+              resolveProvider: true,
+              triggerCharacters: ['.', ':', '@']
+            }
+          }
+        end
+
+        # @return [Hash{Symbol => BasicObject}]
+        def static_code_action
+          {
+            codeActionProvider: true,
+            codeActionKinds: ["quickfix"]
+          }
+        end
+
+        # @return [Hash{Symbol => BasicObject}]
+        def static_signature_help
+          {
+            signatureHelpProvider: {
+              triggerCharacters: ['(', ',']
+            }
+          }
+        end
+
+        # @return [Hash{Symbol => Hash{Symbol => String, Array<String>}}]
+        def static_on_type_formatting
+          {
+            documentOnTypeFormattingProvider: {
+              firstTriggerCharacter: '{',
+              moreTriggerCharacter: ['(']
+            }
+          }
+        end
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_hover
+          return {} unless host.options['hover']
+          {
+            hoverProvider: true
+          }
+        end
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_document_formatting
+          return {} unless host.options['formatting']
+          {
+            documentFormattingProvider: true
+          }
+        end
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_document_symbols
+          return {} unless host.options['symbols']
+          {
+            documentSymbolProvider: true
+          }
+        end
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_workspace_symbols
+          {
+            workspaceSymbolProvider: true
+          }
+        end
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_definitions
+          return {} unless host.options['definitions']
+          {
+            definitionProvider: true
+          }
+        end
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_type_definitions
+          return {} unless host.options['typeDefinitions']
+          {
+            typeDefinitionProvider: true
+          }
+        end
+
+        # @return [Hash{Symbol => Hash{Symbol => Boolean}}]
+        def static_rename
+          {
+            renameProvider: {prepareProvider: true}
+          }
+        end
+
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_references
+          return {} unless host.options['references']
+          {
+            referencesProvider: true
+          }
+        end
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_folding_range
+          return {} unless host.options['folding']
+          {
+            foldingRangeProvider: true
+          }
+        end
+
+        # @return [Hash{Symbol => Boolean}]
+        def static_highlights
+          {
+            documentHighlightProvider: true
+          }
+        end
+
+        # @param section [String]
+        # @param capability [String]
+        # @todo Need support for RBS' boolish "type", which doesn't
+        #   enforce strict true/false-ness
+        # @sg-ignore
+        def dynamic_registration_for? section, capability
+          result = (params['capabilities'] &&
+            params['capabilities'][section] &&
+            params['capabilities'][section][capability] &&
+            params['capabilities'][section][capability]['dynamicRegistration'])
+          host.allow_registration("#{section}/#{capability}") if result
+          result
+        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/prepare_rename.rb

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
-module Solargraph::LanguageServer::Message::TextDocument
-  class PrepareRename < Base
-    def process
-      line = params['position']['line']
-      col = params['position']['character']
-      set_result host.sources.find(params['textDocument']['uri']).cursor_at(Solargraph::Position.new(line, col)).range.to_hash
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph::LanguageServer::Message::TextDocument
+  class PrepareRename < Base
+    def process
+      line = params['position']['line']
+      col = params['position']['character']
+      set_result host.sources.find(params['textDocument']['uri']).cursor_at(Solargraph::Position.new(line, col)).range.to_hash
+    end
+  end
+end

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/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