solargraph 0.18.2 → 0.18.3

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

@@ -10,7 +10,7 @@ module Solargraph::LanguageServer::Message::TextDocument
       filename = uri_to_file(params['textDocument']['uri'])
       line = params['position']['line']
       col = params['position']['character']
-      suggestions = host.library.definitions_at(filename, line, col)
+      suggestions = host.definitions_at(filename, line, col)
       locations = suggestions.map do |pin|
         unless pin.location.nil?
           parts = pin.location.split(':')

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

@@ -4,6 +4,7 @@ module Solargraph
       module TextDocument
         class DidClose < Base
           def process
+            host.close params['textDocument']['uri']
           end
         end
       end

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

@@ -4,9 +4,7 @@ module Solargraph
       module TextDocument
         class DidSave < Base
           def process
-            STDERR.puts "TODO: TextDocument saved"
-            # host.open params['textDocument']
-            # publish_diagnostics
+            host.save params
           end
         end
       end

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

@@ -2,7 +2,7 @@ class Solargraph::LanguageServer::Message::TextDocument::DocumentSymbol < Solarg
   include Solargraph::LanguageServer::UriHelpers
 
   def process
-    pins = host.library.file_symbols(uri_to_file(params['textDocument']['uri']))
+    pins = host.file_symbols params['textDocument']['uri']
     info = pins.map do |pin|
       parts = pin.location.split(':')
       char = parts.pop.to_i

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

@@ -3,38 +3,33 @@ require 'uri'
 module Solargraph::LanguageServer::Message::TextDocument
   class Hover < Base
     def process
-      begin
-        filename = uri_to_file(params['textDocument']['uri'])
-        line = params['position']['line']
-        col = params['position']['character']
-        suggestions = host.definitions_at(filename, line, col)
-        # contents = suggestions.map(&:hover)
-        contents = []
-        last_path = nil
-        suggestions.each do |pin|
-          parts = []
-          this_path = nil
-          if pin.kind_of?(Solargraph::Pin::BaseVariable)
-            this_path = pin.return_type
-          else
-            this_path = pin.path
-          end
-          if !this_path.nil? and this_path != last_path
-            parts.push link_documentation(this_path)
-          end
-          parts.push pin.documentation unless pin.documentation.nil? or pin.documentation.empty?
-          contents.push parts.join("\n\n") unless parts.empty?
-          last_path = this_path unless this_path.nil?
+      filename = uri_to_file(params['textDocument']['uri'])
+      line = params['position']['line']
+      col = params['position']['character']
+      contents = []
+      suggestions = host.definitions_at(filename, line, col)
+      last_path = nil
+      suggestions.each do |pin|
+        parts = []
+        this_path = nil
+        if pin.kind_of?(Solargraph::Pin::BaseVariable)
+          this_path = pin.return_type
+        else
+          this_path = pin.path
         end
-        set_result(
-          contents: {
-            kind: 'markdown',
-            value: contents.join("\n\n")
-          }
-        )
-      rescue Exception => e
-        set_error Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, e.message
+        if !this_path.nil? and this_path != last_path
+          parts.push link_documentation(this_path)
+        end
+        parts.push pin.documentation unless pin.documentation.nil? or pin.documentation.empty?
+        contents.push parts.join("\n\n") unless parts.empty?
+        last_path = this_path unless this_path.nil?
       end
+      set_result(
+        contents: {
+          kind: 'markdown',
+          value: contents.join("\n\n")
+        }
+      )
     end
 
     private

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

@@ -5,7 +5,7 @@ module Solargraph
         class OnTypeFormatting < Base
           def process
             # @todo Temporarily disabled
-            set_result []
+            set_result nil
             return
             src = host.library.checkout(uri_to_file(params['textDocument']['uri']))
             offset = src.get_offset(params['position']['line'], params['position']['character'])

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

@@ -9,20 +9,21 @@ module Solargraph::LanguageServer::Message::Workspace
     include Solargraph::LanguageServer::UriHelpers
 
     def process
+      # @param change [Hash]
       params['changes'].each do |change|
         if change['type'] == CREATED
-          STDERR.puts "TODO: Need to handle a created file?"
-          # host.create change['uri']
+          # It's only necessary to create the file from if the file isn't open
+          # in the client
+          host.create change['uri'] unless host.open?(change['uri'])
         elsif change['type'] == CHANGED
-          # @todo Should this check if the source is already loaded in the source?
-          # Possibly out of sync with the disk?
-          # host.workspace.handle_changed filename
-          # host.api_map.refresh
-          STDERR.puts "TODO: Workspace changed"
+          # It's only necessary to update from here if the file isn't open in
+          # the client
+          host.create change['uri'] unless host.open?(change['uri'])
         elsif change['type'] == DELETED
           host.delete change['uri']
         else
           # @todo Handle error
+          set_error Solargraph::LanguageServer::ErrorCodes::INVALID_PARAMS, "Unknown change type ##{change['type']} for #{uri_to_file(change['uri'])}"
         end
       end
     end

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

@@ -2,7 +2,7 @@ class Solargraph::LanguageServer::Message::Workspace::WorkspaceSymbol < Solargra
   include Solargraph::LanguageServer::UriHelpers
 
   def process
-    pins = host.library.query_symbols(params['query'])
+    pins = host.query_symbols(params['query'])
     info = pins.map do |pin|
       parts = pin.location.split(':')
       char = parts.pop.to_i

data/lib/solargraph/language_server/transport/socket.rb

@@ -11,30 +11,19 @@ module Solargraph
           @content_length = 0
           @buffer = ''
           @host = Solargraph::LanguageServer::Host.new
-          EventMachine.add_periodic_timer 0.1 do
-            tmp = @host.flush
-            send_data tmp unless tmp.empty?
-            EventMachine.stop if @host.stopped?
-          end
-          @message_semaphore = Mutex.new
-          @message_stack = 0
+          start_timers
         end
-      
+
         def process request
           Thread.new do
-            @message_semaphore.synchronize do
-              @message_stack += 1
-            end
             message = @host.start(request)
             message.send
             tmp = @host.flush
             send_data tmp unless tmp.empty?
-            @message_semaphore.synchronize do
-              @message_stack -= 1
-            end
+            GC.start unless request['method'] == 'textDocument/didChange'
           end
         end
-      
+
         # @param data [String]
         def receive_data data
           data.each_char do |char|
@@ -55,9 +44,8 @@ module Solargraph
               if @buffer.bytesize == @content_length
                 begin
                   process JSON.parse(@buffer)
-                rescue Exception => e
+                rescue JSON::ParserError => e
                   STDERR.puts "Failed to parse request: #{e.message}"
-                  STDERR.puts e.backtrace.inspect
                   STDERR.puts "Buffer: #{@buffer}"
                 ensure
                   @buffer.clear
@@ -68,6 +56,16 @@ module Solargraph
             end
           end
         end
+
+        private
+
+        def start_timers
+          EventMachine.add_periodic_timer 0.1 do
+            tmp = @host.flush
+            send_data tmp unless tmp.empty?
+            EventMachine.stop if @host.stopped?
+          end
+        end
       end
     end
   end

data/lib/solargraph/library.rb

@@ -2,7 +2,6 @@ module Solargraph
   # A library handles coordination between a Workspace and an ApiMap.
   #
   class Library
-    class FileNotFoundError < Exception; end
 
     # @param workspace [Solargraph::Workspace]
     def initialize workspace = Solargraph::Workspace.new(nil)
@@ -24,6 +23,14 @@ module Solargraph
       api_map.refresh
     end
 
+    # True if the specified file is currently open in the workspace.
+    #
+    # @param filename [String]
+    # @return [Boolean]
+    def open? filename
+      source_hash.has_key? filename
+    end
+
     # Create a file source to be added to the workspace. The source is ignored
     # if the workspace is not configured to include the file.
     #
@@ -31,16 +38,11 @@ module Solargraph
     # @param text [String] The contents of the file
     # @return [Boolean] True if the file was added to the workspace.
     def create filename, text
-      result = false
-      if workspace.would_merge?(filename)
-        source = Solargraph::Source.load_string(text, filename)
-        if workspace.merge(source)
-          source_hash[filename] = source
-          api_map.refresh
-          result = true
-        end
-      end
-      result
+      return false unless workspace.would_merge?(filename)
+      source = Solargraph::Source.load_string(text, filename)
+      workspace.merge(source)
+      api_map.refresh
+      true
     end
 
     # Delete a file from the library. Deleting a file will make it unavailable
@@ -62,6 +64,17 @@ module Solargraph
     # @param filename [String]
     def close filename
       source_hash.delete filename
+      if workspace.has_file?(filename)
+        source = Solargraph::Source.load(filename)
+        workspace.merge source
+      end
+    end
+
+    def overwrite filename, version
+      source = source_hash[filename]
+      return if source.nil?
+      STDERR.puts "Save out of sync for #{filename}" if source.version > version
+      open filename, File.read(filename), version
     end
 
     # Get completion suggestions at the specified file and location.
@@ -71,9 +84,8 @@ module Solargraph
     # @param column [Integer] The zero-based column number
     # @return [ApiMap::Completion]
     def completions_at filename, line, column
-      # @type [Solargraph::Source]
-      source = nil
       source = read(filename)
+      api_map.virtualize source
       fragment = source.fragment_at(line, column)
       api_map.complete(fragment)
     end
@@ -87,9 +99,9 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def definitions_at filename, line, column
       source = read(filename)
+      api_map.virtualize source
       fragment = source.fragment_at(line, column)
-      result = api_map.define(fragment)
-      result
+      api_map.define(fragment)
     end
 
     # Get signature suggestions for the method at the specified file and
@@ -101,6 +113,7 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def signatures_at filename, line, column
       source = read(filename)
+      api_map.virtualize source
       fragment = source.fragment_at(line, column)
       api_map.signify(fragment)
     end
@@ -163,6 +176,11 @@ module Solargraph
       api_map.get_path_suggestions(path)
     end
 
+    def synchronize updater
+      source = read(updater.filename)
+      source.synchronize updater
+    end
+
     # Get the current text of a file in the library.
     #
     # @param filename [String]
@@ -202,7 +220,7 @@ module Solargraph
     def read filename
       source = source_hash[filename]
       raise FileNotFoundError, "Source not found for #{filename}" if source.nil?
-      api_map.virtualize source
+      # api_map.virtualize source
       source
     end
   end

data/lib/solargraph/node_methods.rb

@@ -1,96 +1,96 @@
-module Solargraph
-  module NodeMethods
-    # @return [String]
-    def unpack_name(node)
-      pack_name(node).join("::")
-    end
-
-    # @return [Array<String>]
-    def pack_name(node)
-      parts = []
-      if node.kind_of?(AST::Node)
-        node.children.each { |n|
-          if n.kind_of?(AST::Node)
-            if n.type == :cbase
-              parts = pack_name(n)
-            else
-              parts += pack_name(n)
-            end
-          else
-            parts.push n unless n.nil?
-          end
-        }
-      end
-      parts
-    end
-
-    # @return [String]
-    def const_from node
-      if node.kind_of?(AST::Node) and node.type == :const
-        result = ''
-        unless node.children[0].nil?
-          result = const_from(node.children[0])
-        end
-        if result == ''
-          result = node.children[1].to_s
-        else
-          result = result + '::' + node.children[1].to_s
-        end
-        result
-      else
-        nil
-      end
-    end
-
-    # @return [String]
-    def infer_literal_node_type node
-      return nil unless node.kind_of?(AST::Node)
-      if node.type == :str or node.type == :dstr
-        return 'String'
-      elsif node.type == :array
-        return 'Array'
-      elsif node.type == :hash
-        return 'Hash'
-      elsif node.type == :int
-        return 'Integer'
-      elsif node.type == :float
-        return 'Float'
-      elsif node.type == :sym
-        return 'Symbol'
-      end
-      nil
-    end
-
-    # Get a call signature from a node.
-    # The result should be a string in the form of a method path, e.g.,
-    # String.new or variable.method.
-    #
-    # @return [String]
-    def resolve_node_signature node
-      drill_signature node, ''
-    end
-
-    private
-
-    def drill_signature node, signature
-      return signature unless node.kind_of?(AST::Node)
-      if node.type == :const or node.type == :cbase
-        unless node.children[0].nil?
-          signature += drill_signature(node.children[0], signature)
-        end
-        signature += '::' unless signature.empty?
-        signature += node.children[1].to_s
-      elsif node.type == :lvar or node.type == :ivar or node.type == :cvar
-        signature += '.' unless signature.empty?
-        signature += node.children[0].to_s
-      elsif node.type == :send
-        unless node.children[0].nil?
-          signature += drill_signature(node.children[0], signature)
-        end
-        signature += '.' unless signature.empty?
-        signature += node.children[1].to_s
-      end
-      signature
-    end
-  end
-end
+module Solargraph
+  module NodeMethods
+    # @return [String]
+    def unpack_name(node)
+      pack_name(node).join("::")
+    end
+
+    # @return [Array<String>]
+    def pack_name(node)
+      parts = []
+      if node.kind_of?(AST::Node)
+        node.children.each { |n|
+          if n.kind_of?(AST::Node)
+            if n.type == :cbase
+              parts = pack_name(n)
+            else
+              parts += pack_name(n)
+            end
+          else
+            parts.push n unless n.nil?
+          end
+        }
+      end
+      parts
+    end
+
+    # @return [String]
+    def const_from node
+      if node.kind_of?(AST::Node) and node.type == :const
+        result = ''
+        unless node.children[0].nil?
+          result = const_from(node.children[0])
+        end
+        if result == ''
+          result = node.children[1].to_s
+        else
+          result = result + '::' + node.children[1].to_s
+        end
+        result
+      else
+        nil
+      end
+    end
+
+    # @return [String]
+    def infer_literal_node_type node
+      return nil unless node.kind_of?(AST::Node)
+      if node.type == :str or node.type == :dstr
+        return 'String'
+      elsif node.type == :array
+        return 'Array'
+      elsif node.type == :hash
+        return 'Hash'
+      elsif node.type == :int
+        return 'Integer'
+      elsif node.type == :float
+        return 'Float'
+      elsif node.type == :sym
+        return 'Symbol'
+      end
+      nil
+    end
+
+    # Get a call signature from a node.
+    # The result should be a string in the form of a method path, e.g.,
+    # String.new or variable.method.
+    #
+    # @return [String]
+    def resolve_node_signature node
+      drill_signature node, ''
+    end
+
+    private
+
+    def drill_signature node, signature
+      return signature unless node.kind_of?(AST::Node)
+      if node.type == :const or node.type == :cbase
+        unless node.children[0].nil?
+          signature += drill_signature(node.children[0], signature)
+        end
+        signature += '::' unless signature.empty?
+        signature += node.children[1].to_s
+      elsif node.type == :lvar or node.type == :ivar or node.type == :cvar
+        signature += '.' unless signature.empty?
+        signature += node.children[0].to_s
+      elsif node.type == :send
+        unless node.children[0].nil?
+          signature += drill_signature(node.children[0], signature)
+        end
+        signature += '.' unless signature.empty?
+        signature += node.children[1].to_s
+      end
+      signature
+    end
+  end
+end