solargraph 0.32.1 → 0.32.2

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

@@ -1,31 +1,31 @@
-require 'uri'
-require 'htmlentities'
-
-module Solargraph::LanguageServer::Message::TextDocument
-  class Hover < Base
-    def process
-      line = params['position']['line']
-      col = params['position']['character']
-      contents = []
-      suggestions = host.definitions_at(params['textDocument']['uri'], line, col)
-      last_link = nil
-      suggestions.each do |pin|
-        parts = []
-        this_link = pin.link_documentation
-        if !this_link.nil? and this_link != last_link
-          parts.push this_link
-        end
-        parts.push HTMLEntities.new.encode(pin.detail) unless pin.kind == Solargraph::Pin::NAMESPACE or pin.detail.nil?
-        parts.push pin.documentation unless pin.documentation.nil? or pin.documentation.empty?
-        contents.push parts.join("\n\n") unless parts.empty?
-        last_link = this_link unless this_link.nil?
-      end
-      set_result(
-        contents: {
-          kind: 'markdown',
-          value: contents.join("\n\n")
-        }
-      )
-    end
-  end
-end
+require 'uri'
+require 'htmlentities'
+
+module Solargraph::LanguageServer::Message::TextDocument
+  class Hover < Base
+    def process
+      line = params['position']['line']
+      col = params['position']['character']
+      contents = []
+      suggestions = host.definitions_at(params['textDocument']['uri'], line, col)
+      last_link = nil
+      suggestions.each do |pin|
+        parts = []
+        this_link = pin.link_documentation
+        if !this_link.nil? and this_link != last_link
+          parts.push this_link
+        end
+        parts.push HTMLEntities.new.encode(pin.detail) unless pin.kind == Solargraph::Pin::NAMESPACE or pin.detail.nil?
+        parts.push pin.documentation unless pin.documentation.nil? or pin.documentation.empty?
+        contents.push parts.join("\n\n") unless parts.empty?
+        last_link = this_link unless this_link.nil?
+      end
+      set_result(
+        contents: {
+          kind: 'markdown',
+          value: contents.join("\n\n")
+        }
+      )
+    end
+  end
+end

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

@@ -1,32 +1,32 @@
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class OnTypeFormatting < Base
-          def process
-            # @todo Temporarily disabled due to conflicts with VSCode formatting on type
-            # src = host.send(:library).checkout(uri_to_file(params['textDocument']['uri']))
-            # fragment = src.fragment_at(params['position']['line'], params['position']['character'] - 1)
-            # offset = fragment.send(:offset)
-            # if fragment.string? and params['ch'] == '{' and src.code[offset - 1, 2] == '#{'
-            #   set_result(
-            #     [
-            #       {
-            #         range: {
-            #           start: params['position'],
-            #           end: params['position']
-            #         },
-            #         newText: '}'
-            #       }
-            #     ]
-            #   )
-            # else
-            #   # @todo Is `nil` or `[]` more appropriate here?
-            #   set_result nil
-            # end
-          end
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class OnTypeFormatting < Base
+          def process
+            # @todo Temporarily disabled due to conflicts with VSCode formatting on type
+            # src = host.send(:library).checkout(uri_to_file(params['textDocument']['uri']))
+            # fragment = src.fragment_at(params['position']['line'], params['position']['character'] - 1)
+            # offset = fragment.send(:offset)
+            # if fragment.string? and params['ch'] == '{' and src.code[offset - 1, 2] == '#{'
+            #   set_result(
+            #     [
+            #       {
+            #         range: {
+            #           start: params['position'],
+            #           end: params['position']
+            #         },
+            #         newText: '}'
+            #       }
+            #     ]
+            #   )
+            # else
+            #   # @todo Is `nil` or `[]` more appropriate here?
+            #   set_result nil
+            # end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,9 @@
-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
+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,14 +1,14 @@
-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
+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,17 +1,17 @@
-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
+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

@@ -1,19 +1,19 @@
-module Solargraph
-  module LanguageServer
-    module Message
-      module TextDocument
-        class SignatureHelp < TextDocument::Base
-          def process
-            line = params['position']['line']
-            col = params['position']['character']
-            suggestions = host.signatures_at(params['textDocument']['uri'], line, col)
-            info = suggestions.map(&:signature_help)
-            set_result({
-              signatures: info
-            })
-          end
-        end
-      end
-    end
-  end
-end
+module Solargraph
+  module LanguageServer
+    module Message
+      module TextDocument
+        class SignatureHelp < TextDocument::Base
+          def process
+            line = params['position']['line']
+            col = params['position']['character']
+            suggestions = host.signatures_at(params['textDocument']['uri'], line, col)
+            info = suggestions.map(&:signature_help)
+            set_result({
+              signatures: info
+            })
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,12 +1,12 @@
-module Solargraph
-  module LanguageServer
-    module Message
-      module Workspace
-        autoload :DidChangeWatchedFiles,     'solargraph/language_server/message/workspace/did_change_watched_files'
-        autoload :WorkspaceSymbol,           'solargraph/language_server/message/workspace/workspace_symbol'
-        autoload :DidChangeConfiguration,    'solargraph/language_server/message/workspace/did_change_configuration'
-        autoload :DidChangeWorkspaceFolders, 'solargraph/language_server/message/workspace/did_change_workspace_folders'
-      end
-    end
-  end
-end
+module Solargraph
+  module LanguageServer
+    module Message
+      module Workspace
+        autoload :DidChangeWatchedFiles,     'solargraph/language_server/message/workspace/did_change_watched_files'
+        autoload :WorkspaceSymbol,           'solargraph/language_server/message/workspace/workspace_symbol'
+        autoload :DidChangeConfiguration,    'solargraph/language_server/message/workspace/did_change_configuration'
+        autoload :DidChangeWorkspaceFolders, 'solargraph/language_server/message/workspace/did_change_workspace_folders'
+      end
+    end
+  end
+end

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

@@ -1,29 +1,29 @@
-require 'uri'
-
-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
-
-    def register_from_options
-      y = []
-      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['references'] ? y : n).push('textDocument/references')
-      (host.options['folding'] ? y : n).push('textDocument/folding')
-      host.register_capabilities y
-      host.unregister_capabilities n
-    end
-  end
-end
+require 'uri'
+
+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
+
+    def register_from_options
+      y = []
+      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['references'] ? y : n).push('textDocument/references')
+      (host.options['folding'] ? y : n).push('textDocument/folding')
+      host.register_capabilities y
+      host.unregister_capabilities n
+    end
+  end
+end

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

@@ -1,27 +1,29 @@
-require 'uri'
-
-module Solargraph::LanguageServer::Message::Workspace
-  class DidChangeWatchedFiles < Solargraph::LanguageServer::Message::Base
-    CREATED = 1
-    CHANGED = 2
-    DELETED = 3
-
-    include Solargraph::LanguageServer::UriHelpers
-
-    def process
-      # @param change [Hash]
-      params['changes'].each do |change|
-        # @todo Changes might need to be handled here even if the file is open
-        if change['type'] == CREATED
-          host.create change['uri'] #unless host.open?(change['uri'])
-        elsif change['type'] == CHANGED
-          host.create change['uri'] #unless host.open?(change['uri'])
-        elsif change['type'] == DELETED
-          host.delete change['uri']
-        else
-          set_error Solargraph::LanguageServer::ErrorCodes::INVALID_PARAMS, "Unknown change type ##{change['type']} for #{uri_to_file(change['uri'])}"
-        end
-      end
-    end
-  end
-end
+require 'uri'
+
+module Solargraph::LanguageServer::Message::Workspace
+  class DidChangeWatchedFiles < Solargraph::LanguageServer::Message::Base
+    CREATED = 1
+    CHANGED = 2
+    DELETED = 3
+
+    include Solargraph::LanguageServer::UriHelpers
+
+    def process
+      # @param change [Hash]
+      params['changes'].each do |change|
+        # @todo Changes might need to be handled here even if the file is open
+        if change['type'] == CREATED
+          host.create change['uri'] #unless host.open?(change['uri'])
+        elsif change['type'] == CHANGED
+          host.create change['uri'] #unless host.open?(change['uri'])
+        elsif change['type'] == DELETED
+          host.delete change['uri']
+        else
+          set_error Solargraph::LanguageServer::ErrorCodes::INVALID_PARAMS, "Unknown change type ##{change['type']} for #{uri_to_file(change['uri'])}"
+        end
+      end
+      # Force host to catalog libraries after file changes (see castwide/solargraph#139)
+      host.catalog
+    end
+  end
+end

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

@@ -1,24 +1,24 @@
-require 'uri'
-
-module Solargraph::LanguageServer::Message::Workspace
-  class DidChangeWorkspaceFolders < Solargraph::LanguageServer::Message::Base
-    def process
-      add_folders
-      remove_folders
-    end
-
-    private
-
-    def add_folders
-      return unless params['event'] && params['event']['added']
-      host.prepare_folders params['event']['added']
-    end
-
-    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
+require 'uri'
+
+module Solargraph::LanguageServer::Message::Workspace
+  class DidChangeWorkspaceFolders < Solargraph::LanguageServer::Message::Base
+    def process
+      add_folders
+      remove_folders
+    end
+
+    private
+
+    def add_folders
+      return unless params['event'] && params['event']['added']
+      host.prepare_folders params['event']['added']
+    end
+
+    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