solargraph 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39e4aebe3e312f765cc5e4d00e7d1f5322732f680ec12f5c4e84fb96c83d6a9
-  data.tar.gz: 010fb32febe1de5ade25857c023efd821b5ae2db3d64ec7941d1f987b24720b1
+  metadata.gz: 99d55308f8ad7a0f73c4432cf08789471b46a60df7db0cc59a4ca8ef6dd9360f
+  data.tar.gz: 8b81acc2451105bb669fbaa0eb215f27ef6f32306b354683c0c045374317e4f8
 SHA512:
-  metadata.gz: ce1e56113f3c61ac8af9fc3d68edb676f23655ea2cbbab4f612088bff67a29abfdee671bd4644bb31864b52e3b8f28b67dc8c1009c998525eb231239517ffed6
-  data.tar.gz: e4d80e8e3a2d7d6bbc040482ad7a75796dffe98006c67ba59748eb2c3fd70ba5876ffff1f886d92c13404f5b5a9f49e2875d671ebea166bd824f0de48afb65c7
+  metadata.gz: 482e84a980ef3385ee1f182c17681bdd97912b84055b017dd5821641a82a240945c1e080bbd11dee0a32df520069318aafef85687a24d801089574fb88154f2f
+  data.tar.gz: 14cf67e4029a2f1fcc8fdbccfd521f7db6776d010d2f4681c77db56b5f5da0a4ebdc51499ef60c5ff5fcd6fa031ab054f250491b71a2ac4394feef4b8aeaa9c5

data/lib/solargraph/api_map.rb

@@ -334,10 +334,10 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def get_method_stack fqns, name, scope: :instance
       # @todo This cache is still causing problems.
-      # cached = cache.get_method_stack(fqns, name, scope)
-      # return cached unless cached.nil?
+      cached = cache.get_method_stack(fqns, name, scope)
+      return cached unless cached.nil?
       result = get_methods(fqns, scope: scope, visibility: [:private, :protected, :public]).select{|p| p.name == name}
-      # cache.set_method_stack(fqns, name, scope, result)
+      cache.set_method_stack(fqns, name, scope, result)
       result
     end
 

data/lib/solargraph/api_map/cache.rb

@@ -2,34 +2,12 @@ module Solargraph
   class ApiMap
     class Cache
       def initialize
-        @signature_types = {}
-        @assignment_node_types = {}
         @methods = {}
         @method_stacks = {}
         @constants = {}
         @qualified_namespaces = {}
       end
 
-      def get_signature_type signature, namespace, scope
-        @signature_types[[signature, namespace, scope]]
-      end
-
-      def has_signature_type?(signature, namespace, scope)
-        @signature_types.has_key?([signature, namespace, scope])
-      end
-
-      def set_signature_type signature, namespace, scope, value
-        @signature_types[[signature, namespace, scope]] = value
-      end
-
-      def get_assignment_node_type node, namespace
-        @assignment_node_types[[node, namespace]]
-      end
-
-      def set_assignment_node_type node, namespace, value
-        @assignment_node_types[[node, namespace]] = value
-      end
-
       def get_methods fqns, scope, visibility, deep
         @methods[[fqns, scope, visibility.sort, deep]]
       end
@@ -64,8 +42,6 @@ module Solargraph
 
       # @return [void]
       def clear
-        @signature_types.clear
-        @assignment_node_types.clear
         @methods.clear
         @method_stacks.clear
         @constants.clear
@@ -74,9 +50,7 @@ module Solargraph
 
       # @return [Boolean]
       def empty?
-        @signature_types.empty? &&
-          @assignment_node_types.empty? &&
-          @methods.empty? &&
+        @methods.empty? &&
           @method_stacks.empty? &&
           @constants.empty? &&
           @qualified_namespaces.empty?

data/lib/solargraph/api_map/store.rb

@@ -27,7 +27,7 @@ module Solargraph
       # @return [Array<Solargraph::Pin::Base>]
       def get_methods fqns, scope: :instance, visibility: [:public]
         namespace_children(fqns).select{ |pin|
-          [Pin::METHOD, Pin::ATTRIBUTE].include?(pin.kind) and (pin.scope == scope or fqns == '') and visibility.include?(pin.visibility)
+          [Pin::METHOD, Pin::ATTRIBUTE].include?(pin.kind) && pin.scope == scope && visibility.include?(pin.visibility)
         }
       end
 

data/lib/solargraph/complex_type.rb

@@ -1,4 +1,6 @@
 module Solargraph
+  # A container for type data based on YARD type tags.
+  #
   class ComplexType < Array
     # @todo Figure out how to add the basic type methods here without actually
     #   including the module. One possibility:
@@ -8,7 +10,7 @@ module Solargraph
 
     autoload :TypeMethods, 'solargraph/complex_type/type_methods'
     autoload :UniqueType,  'solargraph/complex_type/unique_type'
-  
+
     # @param types [Array<ComplexType>]
     def initialize types = [ComplexType::UNDEFINED]
       super()
@@ -17,6 +19,7 @@ module Solargraph
 
     # @param api_map [ApiMap]
     # @param context [String]
+    # @return [ComplexType]
     def qualify api_map, context = ''
       types = map do |t|
         t.qualify api_map, context
@@ -95,7 +98,6 @@ module Solargraph
               curly_stack -= 1
               subtype_string += char
               raise ComplexTypeError, "Invalid close in type #{type_string}" if curly_stack < 0
-              # types.push ComplexType.parse(subtype_string[1..-2]) if curly_stack == 0
               next
             elsif char == '('
               paren_stack += 1

data/lib/solargraph/complex_type/type_methods.rb

@@ -1,5 +1,7 @@
 module Solargraph
   class ComplexType
+    # Methods for accessing type data.
+    #
     module TypeMethods
       # @return [String]
       attr_reader :name
@@ -69,13 +71,13 @@ module Solargraph
       def namespace
         @namespace ||= 'Object' if duck_type?
         @namespace ||= 'NilClass' if nil_type?
-        @namespace ||= ((name == 'Class' or name == 'Module') and !subtypes.empty?) ? subtypes.first.name : name
+        @namespace ||= (name == 'Class' || name == 'Module') && !subtypes.empty? ? subtypes.first.name : name
       end
 
       # @return [Symbol] :class or :instance
       def scope
-        @scope ||= :instance if duck_type? or nil_type?
-        @scope ||= ((name == 'Class' or name == 'Module') and !subtypes.empty?) ? :class : :instance
+        @scope ||= :instance if duck_type? || nil_type?
+        @scope ||= (name == 'Class' || name == 'Module') && !subtypes.empty? ? :class : :instance
       end
 
       def == other

data/lib/solargraph/complex_type/unique_type.rb

@@ -1,11 +1,14 @@
 module Solargraph
   class ComplexType
+    # An individual type signature. A complex type can consist of multiple
+    # unique types.
+    #
     class UniqueType
       include TypeMethods
 
-      # Create a BasicType with the specified name and an optional substring.
-      # The substring is the parameter section of a parametrized type, e.g., for
-      # the type `Array<String>`, the name is `Array` and the substring is
+      # Create a UniqueType with the specified name and an optional substring.
+      # The substring is the parameter section of a parametrized type, e.g.,
+      # for the type `Array<String>`, the name is `Array` and the substring is
       # `<String>`.
       #
       # @param name [String] The name of the type

data/lib/solargraph/language_server/host.rb

@@ -143,8 +143,22 @@ module Solargraph
         library.overwrite filename, version
       end
 
+      # @param uri [String]
       def diagnose uri
-        library.diagnose uri_to_file(uri)
+        begin
+          results = library.diagnose uri_to_file(uri)
+          send_notification "textDocument/publishDiagnostics", {
+            uri: uri,
+            diagnostics: results
+          }
+        rescue DiagnosticsError => e
+          STDERR.puts "Error in diagnostics: #{e.message}"
+          options['diagnostics'] = false
+          send_notification 'window/showMessage', {
+            type: LanguageServer::MessageTypes::ERROR,
+            message: "Error in diagnostics: #{e.message}"
+          }
+        end
       end
 
       def change params

data/lib/solargraph/language_server/host/diagnoser.rb

@@ -45,25 +45,11 @@ module Solargraph
                 mutex.synchronize { queue.clear }
                 next
               end
-              begin
-                current = nil
-                mutex.synchronize { current = queue.shift }
-                next if queue.include?(current)
-                results = []
-                results.concat host.diagnose(current) if host.open?(current)
-                host.send_notification "textDocument/publishDiagnostics", {
-                  uri: current,
-                  diagnostics: results
-                }
-                sleep 0.5
-              rescue DiagnosticsError => e
-                STDERR.puts "Error in diagnostics: #{e.message}"
-                options['diagnostics'] = false
-                host.send_notification 'window/showMessage', {
-                  type: LanguageServer::MessageTypes::ERROR,
-                  message: "Error in diagnostics: #{e.message}"
-                }
-              end
+              current = nil
+              mutex.synchronize { current = queue.shift }
+              next if queue.include?(current)
+              host.diagnose current
+              sleep 0.5
             end
           end
           self

data/lib/solargraph/position.rb

@@ -1,5 +1,6 @@
 module Solargraph
-
+  # The zero-based line and column numbers of a position in a string.
+  #
   class Position
     # @return [Integer]
     attr_reader :line
@@ -7,15 +8,15 @@ module Solargraph
     # @return [Integer]
     attr_reader :character
 
+    alias column character
+
+    # @param line [Integer]
+    # @param character [Integer]
     def initialize line, character
       @line = line
       @character = character
     end
 
-    def column
-      character
-    end
-
     # Get a hash of the position. This representation is suitable for use in
     # the language server protocol.
     #

data/lib/solargraph/source/source_chainer.rb

@@ -42,7 +42,7 @@ module Solargraph
             node = source.node_at(position.line, position.column)
           else
             node = nil
-            node = source.node_at(fixed_position.line, fixed_position.column) unless source.error_ranges.any?{|r| r.include?(fixed_position)}
+            node = source.node_at(fixed_position.line, fixed_position.column) unless source.error_ranges.any?{|r| r.nil? || r.include?(fixed_position)}
             node = Source.parse(fixed_phrase) if node.nil?
           end
         rescue Parser::SyntaxError

data/lib/solargraph/source_map/clip.rb

@@ -24,10 +24,22 @@ module Solargraph
         return package_completions(api_map.get_symbols) if cursor.chain.literal? && cursor.chain.links.last.word == '<Symbol>'
         return Completion.new([], cursor.range) if cursor.chain.literal? || cursor.comment?
         result = []
-        type = cursor.chain.base.infer(api_map, context_pin, locals)
         if cursor.chain.constant? || cursor.start_of_constant?
+          if cursor.chain.undefined?
+            type = cursor.chain.base.infer(api_map, context_pin, locals)
+          else
+            full = cursor.chain.links.first.word
+            if full.include?('::')
+              type = ComplexType.parse(full.split('::')[0..-2].join('::'))
+            elsif cursor.chain.links.length > 1
+              type = ComplexType.parse(full)
+            else
+              type = ComplexType::UNDEFINED
+            end
+          end
           result.concat api_map.get_constants(type.undefined? ? '' : type.namespace, cursor.start_of_constant? ? '' : context_pin.context.namespace)
         else
+          type = cursor.chain.base.infer(api_map, context_pin, locals)
           result.concat api_map.get_complex_type_methods(type, context_pin.context.namespace, cursor.chain.links.length == 1)
           if cursor.chain.links.length == 1
             if cursor.word.start_with?('@@')

data/lib/solargraph/source_map/mapper.rb

@@ -279,7 +279,7 @@ module Solargraph
                     end
                   end
                 end
-              elsif c.type == :send and [:attr_reader, :attr_writer, :attr_accessor].include?(c.children[1])
+              elsif c.type == :send && [:attr_reader, :attr_writer, :attr_accessor].include?(c.children[1])
                 c.children[2..-1].each do |a|
                   if c.children[1] == :attr_reader or c.children[1] == :attr_accessor
                     pins.push Solargraph::Pin::Attribute.new(get_node_location(c), fqn || '', "#{a.children[0]}", comments_for(c), :reader, scope, visibility)
@@ -288,10 +288,19 @@ module Solargraph
                     pins.push Solargraph::Pin::Attribute.new(get_node_location(c), fqn || '', "#{a.children[0]}=", comments_for(c), :writer, scope, visibility)
                   end
                 end
-              elsif c.type == :sclass and c.children[0].type == :self
+              elsif c.type == :alias
+                pin = pins.select{|p| p.name == c.children[1].children[0].to_s && p.namespace == fqn && p.scope == scope}.first
+                unless pin.nil?
+                  if pin.is_a?(Solargraph::Pin::Method)
+                    pins.push Solargraph::Pin::Method.new(get_node_location(c), pin.namespace, c.children[0].children[0].to_s, comments_for(c) || pin.comments, pin.scope, pin.visibility, pin.parameters)
+                  elsif pin.is_a?(Solargraph::Pin::Attribute)
+                    pins.push Solargraph::Pin::Attribute.new(get_node_location(c), pin.namespace, c.children[0].children[0].to_s, comments_for(c) || pin.comments, pin.access, pin.scope, pin.visibility)
+                  end
+                end
+              elsif c.type == :sclass && c.children[0].type == :self
                 process c, tree, :public, :class, fqn || '', stack
                 next
-              elsif c.type == :send and c.children[1] == :require
+              elsif c.type == :send && c.children[1] == :require
                 if c.children[2].kind_of?(AST::Node) and c.children[2].type == :str
                   # @requires.push Solargraph::Pin::Reference.new(get_node_location(c), fqn, c.children[2].children[0].to_s)
                   pins.push Pin::Reference::Require.new(get_node_location(c), c.children[2].children[0].to_s)

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.28.1'
+  VERSION = '0.28.2'
 end

data/lib/solargraph/yard_map.rb

@@ -122,7 +122,15 @@ module Solargraph
       if code_object.is_a?(YARD::CodeObjects::NamespaceObject)
         result.push Solargraph::Pin::YardPin::Namespace.new(code_object, location)
         if code_object.is_a?(YARD::CodeObjects::ClassObject) and !code_object.superclass.nil?
-          result.push Solargraph::Pin::Reference::Superclass.new(location, code_object.path, code_object.superclass.path)
+          # @todo This method of superclass detection is a bit of a hack. If
+          #   the superclass is a Proxy, it is assumed to be undefined in its
+          #   yardoc and converted to a fully qualified namespace.
+          if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
+            superclass = "::#{code_object.superclass}"
+          else
+            superclass = code_object.superclass.to_s
+          end
+          result.push Solargraph::Pin::Reference::Superclass.new(location, code_object.path, superclass)
         end
         code_object.class_mixins.each do |m|
           result.push Solargraph::Pin::Reference::Extend.new(location, code_object.path, m.path)

data/lib/solargraph/yard_map/core_docs.rb

@@ -5,8 +5,9 @@ require 'fileutils'
 
 module Solargraph
   class YardMap
+    # Tools for managing core documentation.
+    #
     module CoreDocs
-      
       SOURCE = 'https://solargraph.org/download'
 
       class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser