solargraph 0.32.5 → 0.33.0

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

@@ -19,6 +19,7 @@ module Solargraph
         autoload :Rename,           'solargraph/language_server/message/text_document/rename'
         autoload :PrepareRename,    'solargraph/language_server/message/text_document/prepare_rename'
         autoload :FoldingRange,     'solargraph/language_server/message/text_document/folding_range'
+        autoload :CodeAction,       'solargraph/language_server/message/text_document/code_action'
       end
     end
   end

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

@@ -0,0 +1,15 @@
+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

@@ -36,7 +36,7 @@ module Solargraph
             end
           rescue FileNotFoundError => e
             Logging.logger.warn "[#{e.class}] #{e.message}"
-            Logging.logger.warn e.backtrace
+            Logging.logger.warn e.backtrace.join("\n")
             set_result empty_result
           end
 

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

@@ -3,16 +3,36 @@ require 'uri'
 module Solargraph::LanguageServer::Message::TextDocument
   class Definition < Base
     def process
-      line = params['position']['line']
-      col = params['position']['character']
-      suggestions = host.definitions_at(params['textDocument']['uri'], line, col)
-      locations = suggestions.reject{|pin| pin.location.nil?}.map do |pin|
+      @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?}.map do |pin|
         {
           uri: file_to_uri(pin.location.filename),
           range: pin.location.range.to_hash
         }
       end
-      set_result locations
+    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/hover.rb

@@ -31,7 +31,7 @@ module Solargraph
             )
           rescue FileNotFoundError => e
             Logging.logger.warn "[#{e.class}] #{e.message}"
-            Logging.logger.warn e.backtrace
+            Logging.logger.warn e.backtrace.join("\n")
             set_result nil
           end
         end

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

@@ -11,6 +11,10 @@ module Solargraph
             set_result({
               signatures: info
             })
+          rescue FileNotFoundError => e
+            Logging.logger.warn "[#{e.class}] #{e.message}"
+            Logging.logger.warn e.backtrace.join("\n")
+            set_result nil
           end
         end
       end

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

@@ -9,21 +9,25 @@ module Solargraph::LanguageServer::Message::Workspace
     include Solargraph::LanguageServer::UriHelpers
 
     def process
+      need_catalog = false
       # @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'])
+          host.create change['uri']
+          need_catalog = true
         elsif change['type'] == CHANGED
-          host.create change['uri'] #unless host.open?(change['uri'])
+          next if host.open?(change['uri'])
+          host.create change['uri']
+          need_catalog = true
         elsif change['type'] == DELETED
           host.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
       # Force host to catalog libraries after file changes (see castwide/solargraph#139)
-      host.catalog
+      host.catalog if need_catalog
     end
   end
 end

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

@@ -8,12 +8,12 @@ module Solargraph
       module Adapter
         def opening
           @host = Solargraph::LanguageServer::Host.new
+          @host.add_observer self
           @host.start
           @data_reader = Solargraph::LanguageServer::Transport::DataReader.new
           @data_reader.set_message_handler do |message|
             process message
           end
-          start_timer
         end
 
         def closing
@@ -28,6 +28,15 @@ module Solargraph
         #   the Backport API
         alias sending receiving
 
+        def update
+          if @host.stopped?
+            shutdown
+          else
+            tmp = @host.flush
+            write tmp unless tmp.empty?
+          end
+        end
+
         private
 
         # @param request [String]
@@ -35,20 +44,8 @@ module Solargraph
         def process request
           message = @host.receive(request)
           message.send_response
-          tmp = @host.flush
-          write tmp unless tmp.empty?
-        end
-
-        def start_timer
-          Backport.prepare_interval 0.1 do |server|
-            if @host.stopped?
-              server.stop
-              shutdown
-            else
-              tmp = @host.flush
-              write tmp unless tmp.empty?
-            end
-          end
+          # tmp = @host.flush
+          # write tmp unless tmp.empty?
         end
 
         def shutdown

data/lib/solargraph/library.rb

@@ -174,7 +174,7 @@ module Solargraph
     def definitions_at filename, line, column
       position = Position.new(line, column)
       cursor = Source::Cursor.new(checkout(filename), position)
-      api_map.clip(cursor).define
+      api_map.clip(cursor).define.map { |pin| pin.realize(api_map) }
     end
 
     # Get signature suggestions for the method at the specified file and
@@ -232,7 +232,11 @@ module Solargraph
     # @param location [Location]
     # @return [Solargraph::Pin::Base]
     def locate_pins location
-      api_map.locate_pins location
+      api_map.locate_pins(location).map { |pin| pin.realize(api_map) }
+    end
+
+    def locate_ref location
+      api_map.require_reference_at location
     end
 
     # Get an array of pins that match a path.
@@ -329,10 +333,23 @@ module Solargraph
       catalog
       result = []
       source = read(filename)
-      workspace.config.reporters.each do |name|
-        reporter = Diagnostics.reporter(name)
-        raise DiagnosticsError, "Diagnostics reporter #{name} does not exist" if reporter.nil?
-        result.concat reporter.new.diagnose(source, api_map)
+      repargs = {}
+      workspace.config.reporters.each do |line|
+        if line == 'all!'
+          Diagnostics.reporters.each do |reporter|
+            repargs[reporter] ||= []
+          end
+        else
+          args = line.split(':').map(&:strip)
+          name = args.shift
+            reporter = Diagnostics.reporter(name)
+          raise DiagnosticsError, "Diagnostics reporter #{name} does not exist" if reporter.nil?
+          repargs[reporter] ||= []
+          repargs[reporter].concat args
+        end
+      end
+      repargs.each_pair do |reporter, args|
+        result.concat reporter.new(*args.uniq).diagnose(source, api_map)
       end
       result
     end

data/lib/solargraph/location.rb

@@ -27,5 +27,9 @@ module Solargraph
       return false unless other.is_a?(Location)
       filename == other.filename and range == other.range
     end
+
+    def inspect
+      "#<#{self.class} #{filename}, #{range.inspect}>"
+    end
   end
 end

data/lib/solargraph/pin.rb

@@ -2,6 +2,7 @@ module Solargraph
   # The namespace for pins used in maps.
   #
   module Pin
+    autoload :Common,           'solargraph/pin/common'
     autoload :Conversions,      'solargraph/pin/conversions'
     autoload :Base,             'solargraph/pin/base'
     autoload :BaseMethod,       'solargraph/pin/base_method'
@@ -15,10 +16,10 @@ module Solargraph
     autoload :GlobalVariable,   'solargraph/pin/global_variable'
     autoload :Constant,         'solargraph/pin/constant'
     autoload :Symbol,           'solargraph/pin/symbol'
+    autoload :Closure,          'solargraph/pin/closure'
     autoload :Namespace,        'solargraph/pin/namespace'
     autoload :Keyword,          'solargraph/pin/keyword'
-    autoload :MethodParameter,  'solargraph/pin/method_parameter'
-    autoload :BlockParameter,   'solargraph/pin/block_parameter'
+    autoload :Parameter,        'solargraph/pin/parameter'
     autoload :Reference,        'solargraph/pin/reference'
     autoload :Documenting,      'solargraph/pin/documenting'
     autoload :Block,            'solargraph/pin/block'
@@ -26,6 +27,7 @@ module Solargraph
     autoload :ProxyType,        'solargraph/pin/proxy_type'
     autoload :DuckMethod,       'solargraph/pin/duck_method'
     autoload :YardPin,          'solargraph/pin/yard_pin'
+    autoload :Singleton,        'solargraph/pin/singleton'
 
     ATTRIBUTE = 1
     CLASS_VARIABLE = 2
@@ -44,7 +46,9 @@ module Solargraph
     INCLUDE_REFERENCE = 15
     EXTEND_REFERENCE = 16
     METHOD_ALIAS = 17
+    OVERRIDE_REFERENCE = 18
 
-    ROOT_PIN = Pin::Namespace.new(nil, '', '', '', :class, :public)
+    # ROOT_PIN = Pin::Namespace.new(nil, '', '', '', :class, :public)
+    ROOT_PIN = Pin::Namespace.new(type: :class, name: '', closure: nil)
   end
 end

data/lib/solargraph/pin/attribute.rb

@@ -1,14 +1,12 @@
 module Solargraph
   module Pin
     class Attribute < BaseMethod
-      # @return [Symbol] :reader or :writer
+      # @return [::Symbol] :reader or :writer
       attr_reader :access
 
-      def initialize location, namespace, name, comments, access, scope, visibility
-        super(location, namespace, name, comments)
+      def initialize access: :reader, **splat
+        super(splat)
         @access = access
-        @scope = scope
-        @visibility = visibility
       end
 
       def kind
@@ -27,14 +25,17 @@ module Solargraph
         @path ||= namespace + (scope == :instance ? '#' : '.') + name
       end
 
-      def parameters
-        # Since attributes are generally equivalent to methods, treat
-        # them as methods without parameters
-        []
-      end
-
-      def parameter_names
-        []
+      def probe api_map
+        types = []
+        varname = "@#{name.gsub(/=$/, '')}"
+        pins = api_map.get_instance_variable_pins(binder.namespace, binder.scope).select { |iv| iv.name == varname }
+        pins.each do |pin|
+          type = pin.typify(api_map)
+          type = pin.probe(api_map) if type.undefined?
+          types.push type if type.defined?
+        end
+        return ComplexType::UNDEFINED if types.empty?
+        ComplexType.try_parse(*types.map(&:tag).uniq)
       end
     end
   end

data/lib/solargraph/pin/base.rb

@@ -3,18 +3,16 @@ module Solargraph
     # The base class for map pins.
     #
     class Base
+      include Common
       include Conversions
       include Documenting
 
+      # @return [YARD::CodeObjects::Base]
+      attr_reader :code_object
+
       # @return [Solargraph::Location]
       attr_reader :location
 
-      # The namespace in which this pin is defined.
-      # The root namespace is an empty string.
-      #
-      # @return [String]
-      attr_reader :namespace
-
       # @return [String]
       attr_reader :name
 
@@ -25,12 +23,14 @@ module Solargraph
       attr_reader :path
 
       # @param location [Solargraph::Location]
-      # @param namespace [String]
+      # @param kind [Integer]
+      # @param closure [String]
       # @param name [String]
       # @param comments [String]
-      def initialize location, namespace, name, comments
+      def initialize location: nil, kind: KEYWORD, closure: nil, name: '', comments: ''
         @location = location
-        @namespace = namespace
+        @kind = kind
+        @closure = closure
         @name = name
         @comments = comments
       end
@@ -65,11 +65,6 @@ module Solargraph
         false
       end
 
-      # @return [ComplexType]
-      def context
-        @context ||= ComplexType.try_parse(namespace || '')
-      end
-
       # Pin equality is determined using the #nearly? method and also
       # requiring both pins to have the same location.
       #
@@ -86,26 +81,19 @@ module Solargraph
       # @return [Boolean]
       def nearly? other
         self.class == other.class &&
-          namespace == other.namespace &&
           name == other.name &&
+          (closure == other.closure || (closure && closure.nearly?(other.closure))) &&
           (comments == other.comments ||
             (((maybe_directives? == false && other.maybe_directives? == false) || compare_directives(directives, other.directives)) &&
             compare_docstring_tags(docstring, other.docstring))
           )
       end
 
-      # An alias for return_complex_type.
+      # The pin's return type.
       #
       # @return [ComplexType]
       def return_type
-        return_complex_type
-      end
-
-      # All of the pin's return types as an array of ComplexTypes.
-      #
-      # @return [ComplexType]
-      def return_complex_type
-        @return_complex_type ||= ComplexType::UNDEFINED
+        @return_type ||= ComplexType::UNDEFINED
       end
 
       # @return [YARD::Docstring]
@@ -152,7 +140,7 @@ module Solargraph
       # @param api_map [ApiMap]
       # @return [ComplexType]
       def typify api_map
-        return_complex_type.qualify(api_map, namespace)
+        return_type.qualify(api_map, namespace)
       end
 
       # Infer the pin's return type via static code analysis.
@@ -182,10 +170,11 @@ module Solargraph
       def try_merge! pin
         return false unless nearly?(pin)
         @location = pin.location
+        @closure = pin.closure
         return true if comments == pin.comments
         @comments = pin.comments
         @docstring = pin.docstring
-        @return_complex_type = pin.return_complex_type
+        @return_type = pin.return_type
         @documentation = nil
         @deprecated = nil
         reset_conversions
@@ -196,6 +185,23 @@ module Solargraph
         @proxied ||= false
       end
 
+      def probed?
+        @probed ||= false
+      end
+
+      # @param api_map [ApiMap]
+      # @return [self]
+      def realize api_map
+        return self if return_type.defined?
+        type = typify(api_map)
+        return proxy(type) if type.defined?
+        type = probe(api_map)
+        return self if type.undefined?
+        result = proxy(type)
+        result.probed = true
+        result
+      end
+
       # Return a proxy for this pin with the specified return type. Other than
       # the return type and the #proxied? setting, the proxy should be a clone
       # of the original.
@@ -204,18 +210,25 @@ module Solargraph
       # @return [self]
       def proxy return_type
         result = dup
-        result.return_complex_type = return_type
+        result.return_type = return_type
         result.proxied = true
         result
       end
 
+      def inspect
+        "#<#{self.class} at #{self.location.inspect}>"
+      end
+
       protected
 
+      # @return [Boolean]
+      attr_writer :probed
+
       # @return [Boolean]
       attr_writer :proxied
 
       # @return [ComplexType]
-      attr_writer :return_complex_type
+      attr_writer :return_type
 
       private
 
@@ -238,7 +251,7 @@ module Solargraph
       #
       # @param d1 [YARD::Docstring]
       # @param d2 [YARD::Docstring]
-      # @return [boolean]
+      # @return [Boolean]
       def compare_docstring_tags d1, d2
         return false if d1.tags.length != d2.tags.length
         d1.tags.each_index do |i|
@@ -247,26 +260,26 @@ module Solargraph
         true
       end
 
-      # @param d1 [Array<YARD::Tags::Directive>]
-      # @param d2 [Array<YARD::Tags::Directive>]
+      # @param dir1 [Array<YARD::Tags::Directive>]
+      # @param dir2 [Array<YARD::Tags::Directive>]
       # @return [Boolean]
-      def compare_directives d1, d2
-        return false if d1.length != d2.length
-        d1.each_index do |i|
-          return false unless compare_tags(d1[i].tag, d2[i].tag)
+      def compare_directives dir1, dir2
+        return false if dir1.length != dir2.length
+        dir1.each_index do |i|
+          return false unless compare_tags(dir1[i].tag, dir2[i].tag)
         end
         true
       end
 
-      # @param t1 [YARD::Tags::Tag]
-      # @param t2 [YARD::Tags::Tag]
+      # @param tag1 [YARD::Tags::Tag]
+      # @param tag2 [YARD::Tags::Tag]
       # @return [Boolean]
-      def compare_tags t1, t2
-        t1.class == t2.class &&
-          t1.tag_name == t2.tag_name &&
-          t1.text == t2.text &&
-          t1.name == t2.name &&
-          t1.types == t2.types
+      def compare_tags tag1, tag2
+        tag1.class == tag2.class &&
+          tag1.tag_name == tag2.tag_name &&
+          tag1.text == tag2.text &&
+          tag1.name == tag2.name &&
+          tag1.types == tag2.types
       end
 
       # @return [Array<YARD::Tags::Handlers::Directive>]