solargraph 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a0cb900eab77f94ad22582f22dc8ea75c249485
-  data.tar.gz: 478c5f05faf26850590f928060b35e61903cb807
+  metadata.gz: 12ba7fd6f2f9b2393c21aba8249cd43e7c69062f
+  data.tar.gz: c102835081a9b19b74180c1f75b7ebaea695e5f1
 SHA512:
-  metadata.gz: afcd662f413015ece4a315039be1837a8f95b1a10806d75e6ac2ce8d08fa91d3e0720cd67aa1c383f34c6800f5d2c9a3a722c199a093663f6aefec0e93d92480
-  data.tar.gz: 9d9dacf3f53e4a53f69f325e9bd56d42d252cba529a91766515c2e3b9080403bd20f8dbdc801168a5b72164e12f02700b4bdc960845abb2706456391c9214e6a
+  metadata.gz: 0bd7974b55a00ec8a914e77dffe352af321bbe9e27d1a1c19c74417015bc6d7886077017313e3526489e6a12e2b0933dc586cae2252e31afb0332da75f5a9f76
+  data.tar.gz: cdc14d195c758dc1acd151e22155c41390026bb89e9a74756b9b28e24cd68f53fde8c1e8ce20f4c8a3bb1244f0bfa12f034fda91e0438a9c534483e8a61aed01

data/lib/solargraph/api_map.rb

@@ -23,7 +23,7 @@ module Solargraph
     ].freeze
 
     MAPPABLE_NODES = [
-      :array, :hash, :str, :dstr, :int, :float, :block, :class, :sclass,
+      :array, :hash, :str, :dstr, :int, :float, :sym, :block, :class, :sclass,
       :module, :def, :defs, :ivasgn, :gvasgn, :lvasgn, :cvasgn, :casgn,
       :or_asgn, :const, :lvar, :args, :kwargs
     ].freeze
@@ -35,7 +35,7 @@ module Solargraph
 
     METHODS_RETURNING_SELF = [
       'clone', 'dup', 'freeze', 'taint', 'untaint'
-    ]
+    ].freeze
 
     include NodeMethods
     include YardMethods
@@ -202,7 +202,7 @@ module Solargraph
       ip = @ivar_pins[namespace]
       unless ip.nil?
         ip.select{ |pin| pin.scope == scope }.each do |pin|
-          result.push pin.suggestion(self)
+          result.push pin.suggestion
         end
       end
       result
@@ -214,7 +214,7 @@ module Solargraph
       ip = @cvar_pins[namespace]
       unless ip.nil?
         ip.each do |pin|
-          result.push pin.suggestion(self)
+          result.push pin.suggestion
         end
       end
       result
@@ -532,15 +532,16 @@ module Solargraph
       @namespace_map = {}
       @namespace_tree = {}
       @required = []
+    end
+
+    def process_maps
+      cache.clear
       @ivar_pins = {}
       @cvar_pins = {}
       @method_pins = {}
       @attr_nodes = {}
       @namespace_includes = {}
       @superclasses = {}
-    end
-
-    def process_maps
       @parent_stack = {}
       @namespace_map = {}
       @namespace_tree = {}
@@ -840,7 +841,7 @@ module Solargraph
         # TODO: The api_map should ignore local variables.
         type = node.children[0].type
         children.push node.children[0].children[0], node.children[1]
-      elsif [:array, :hash, :str, :dstr, :int, :float].include?(node.type)
+      elsif [:array, :hash, :str, :dstr, :int, :float, :sym].include?(node.type)
         # @todo Do we really care about the details?
       end
       result = node.updated(type, children)
@@ -896,10 +897,10 @@ module Solargraph
           if c.kind_of?(AST::Node)
             if c.type == :ivasgn
               @ivar_pins[fqn] ||= []
-              @ivar_pins[fqn].push IvarPin.new(c, fqn, local_scope, get_comment_for(c))
+              @ivar_pins[fqn].push IvarPin.new(self, c, fqn, local_scope, get_comment_for(c))
             elsif c.type == :cvasgn
               @cvar_pins[fqn] ||= []
-              @cvar_pins[fqn].push CvarPin.new(c, fqn, get_comment_for(c))
+              @cvar_pins[fqn].push CvarPin.new(self, c, fqn, get_comment_for(c))
             else
               unless fqn.nil? or in_yardoc
                 if c.kind_of?(AST::Node)

data/lib/solargraph/api_map/cache.rb

@@ -21,6 +21,11 @@ module Solargraph
       def set_assignment_node_type node, namespace, value
         @assignment_node_types[[node, namespace]] = value
       end
+
+      def clear
+        @signature_types.clear
+        @assignment_node_types.clear
+      end
     end
   end
 end

data/lib/solargraph/api_map/cvar_pin.rb

@@ -5,20 +5,21 @@ module Solargraph
       attr_reader :namespace
       attr_reader :docstring
 
-      def initialize node, namespace, docstring
+      def initialize api_map, node, namespace, docstring
+        @api_map = api_map
         @node = node
         @namespace = namespace
         @docstring = docstring
       end
 
-      def suggestion(api_map)
-        @suggestion ||= generate_suggestion(api_map)
+      def suggestion
+        @suggestion ||= generate_suggestion
       end
 
       private
 
-      def generate_suggestion(api_map)
-        type = api_map.infer_assignment_node_type(node, namespace)
+      def generate_suggestion
+        type = @api_map.infer_assignment_node_type(node, namespace)
         Suggestion.new(node.children[0], kind: Suggestion::VARIABLE, documentation: docstring, return_type: type)
       end
     end

data/lib/solargraph/api_map/ivar_pin.rb

@@ -6,21 +6,22 @@ module Solargraph
       attr_reader :scope
       attr_reader :docstring
 
-      def initialize node, namespace, scope, docstring
+      def initialize api_map, node, namespace, scope, docstring
+        @api_map = api_map
         @node = node
         @namespace = namespace
         @scope = scope
         @docstring = docstring
       end
 
-      def suggestion(api_map)
-        @suggestion ||= generate_suggestion(api_map)
+      def suggestion
+        @suggestion ||= generate_suggestion
       end
 
       private
 
-      def generate_suggestion(api_map)
-        type = api_map.infer_assignment_node_type(node, namespace)
+      def generate_suggestion
+        type = @api_map.infer_assignment_node_type(node, namespace)
         Suggestion.new(node.children[0], kind: Suggestion::VARIABLE, documentation: docstring, return_type: type)
       end
     end

data/lib/solargraph/code_map.rb

@@ -98,6 +98,8 @@ module Solargraph
     # @return [Solargraph::ApiMap]
     def api_map
       @api_map ||= ApiMap.new(workspace)
+      @api_map.refresh
+      @api_map
     end
 
     # Get the offset of the specified line and column.
@@ -395,7 +397,11 @@ module Solargraph
         literal = node_at(index - 1)
       else
         beg_sig = get_signature_index_at(index)
-        literal = node_at(1 + beg_sig)
+        if @code[beg_sig] == '.'
+          literal = node_at(beg_sig - 1)
+        else
+          literal = node_at(1 + beg_sig)
+        end
       end
       type = infer_literal_node_type(literal)
       if type.nil?
@@ -431,11 +437,19 @@ module Solargraph
           end
         end
       else
-        if signature.empty?
+        if signature.empty? or signature == '[].'
           result = type
         else
           cursed = get_signature_index_at(index)
-          rest = signature[literal.loc.expression.end_pos+(cursed-literal.loc.expression.end_pos)..-1]
+          if signature.start_with?('[].')
+            rest = signature[3..-1]
+          else
+            if signature.start_with?('.')
+              rest = signature[literal.loc.expression.end_pos+(cursed-literal.loc.expression.end_pos)..-1]
+            else
+              rest = signature
+            end
+          end
           return type if rest.nil?
           lit_code = @code[literal.loc.expression.begin_pos..literal.loc.expression.end_pos]
           rest = rest[lit_code.length..-1] if rest.start_with?(lit_code)
@@ -541,28 +555,30 @@ module Solargraph
       signature = ''
       index -=1
       while index >= 0
-        break if brackets > 0 or parens > 0 or squares > 0
-        char = @code[index, 1]
-        if char == ')'
-          parens -=1
-        elsif char == ']'
-          squares -=1
-        elsif char == '}'
-          brackets -= 1
-        elsif char == '('
-          parens += 1
-        elsif char == '{'
-          brackets += 1
-        elsif char == '['
-          squares += 1
-          signature = ".[]#{signature}" if squares == 0 and @code[index-2] != '%'
-        end
-        if brackets == 0 and parens == 0 and squares == 0
-          break if ['"', "'", ',', ' ', "\t", "\n", ';', '%'].include?(char)
-          signature = char + signature if char.match(/[a-z0-9:\._@]/i) and @code[index - 1] != '%'
-          if char == '@'
-            signature = "@#{signature}" if @code[index-1, 1] == '@'
-            break
+        unless string_at?(index)
+          break if brackets > 0 or parens > 0 or squares > 0
+          char = @code[index, 1]
+          if char == ')'
+            parens -=1
+          elsif char == ']'
+            squares -=1
+          elsif char == '}'
+            brackets -= 1
+          elsif char == '('
+            parens += 1
+          elsif char == '{'
+            brackets += 1
+          elsif char == '['
+            squares += 1
+            signature = ".[]#{signature}" if squares == 0 and @code[index-2] != '%'
+          end
+          if brackets == 0 and parens == 0 and squares == 0
+            break if ['"', "'", ',', ' ', "\t", "\n", ';', '%'].include?(char)
+            signature = char + signature if char.match(/[a-z0-9:\._@]/i) and @code[index - 1] != '%'
+            if char == '@'
+              signature = "@#{signature}" if @code[index-1, 1] == '@'
+              break
+            end
           end
         end
         index -= 1

data/lib/solargraph/node_methods.rb

@@ -51,6 +51,8 @@ module Solargraph
         return 'Integer'
       elsif node.type == :float
         return 'Float'
+      elsif node.type == :sym
+        return 'Symbol'
       end
       nil
     end

data/lib/solargraph/suggestion.rb

@@ -93,7 +93,7 @@ module Solargraph
         arguments: @arguments,
         params: params,
         return_type: return_type,
-        documentation: @helper.html_markup_rdoc(documentation.to_s)
+        documentation: documentation.nil? ? nil : @helper.html_markup_rdoc(documentation)
       }
       obj.to_json(args)
     end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser