solargraph 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0eee03f14aa3abbcaad7015b94ad8c33df50acc
-  data.tar.gz: b4485de9e9cf36aa8df184687cd9e5476e6b627d
+  metadata.gz: 9e75af30aa57a99e118082d7c337d889f7aa6151
+  data.tar.gz: 2937ed78501b758858b304127987eb822540163f
 SHA512:
-  metadata.gz: 3845660c58589e9d5222d9800fb3a48aa3970aa548468f643363d653b28b6b086c2d3b5c7d38afb322e6f45271292096acec3af7be24088d726957de7cbcbd1b
-  data.tar.gz: 3040f8716959d1378a2478dd23d76c8232f0451669860267f5cbb07b7be6ed2bda987039912d6501665e3cf7d3af6ff1d9e71e01792cdca949bfdf45c09f42b6
+  metadata.gz: 110b41dcd353afc575f30a096e9e83d311ff8d664e37847097d4618ab8bfe76f7d4825ff730838f971ba3af503015cde7b156e7a1d8afef504dfa3b1515dc13e
+  data.tar.gz: 5e0bc35e2d8c06a73e452451ddb3167f06f00fc8e52add97f9ea4152387e14ea366d4e2b715491697f65194d601feb0d04d23c2b09d5bef31ec5136d29dc3b50

data/lib/solargraph/api_map.rb

@@ -104,7 +104,7 @@ module Solargraph
           true
         end
       end
-      if filename.nil? or filename.end_with?('.rb')
+      if filename.nil? or filename.end_with?('.rb') or filename.end_with?('.erb')
         eliminate @virtual_filename unless @virtual_source.nil? or @virtual_filename == filename or workspace_files.include?(@virtual_filename)
         @virtual_filename = filename
         @virtual_source = Source.fix(code, filename, cursor)
@@ -208,16 +208,22 @@ module Solargraph
       result = []
       skip = []
       fqns = find_fully_qualified_namespace(namespace, root)
+      return [] if fqns.nil?
       if fqns.empty?
-        result.concat inner_get_constants('', skip, false, :public)
+        result.concat inner_get_constants('', skip, false, [:public])
       else
         parts = fqns.split('::')
-        resolved = find_namespace_pins(parts.join('::'))
-        resolved.each do |pin|
-          visi = :public
-          visi = :private if namespace == '' and root != '' and pin.path == fqns
-          result.concat inner_get_constants(pin.path, skip, true, visi)
+        while parts.length > 0
+          resolved = find_namespace_pins(parts.join('::'))
+          resolved.each do |pin|
+            visi = :public
+            visi = :private if namespace == '' and root != '' and pin.path == fqns
+            result.concat inner_get_constants(pin.path, skip, true, visi)
+          end
+          parts.pop
+          break unless namespace.empty?
         end
+        result.concat inner_get_constants('', [], false) if namespace.empty?
       end
       result.concat yard_map.get_constants(fqns)
       result
@@ -832,7 +838,9 @@ module Solargraph
         unless sc.nil?
           sc_visi = [:public]
           sc_visi.push :protected if root == fqns
-          meths.concat get_methods(sc, fqns, visibility: sc_visi)
+          nfqns = find_fully_qualified_namespace(sc, fqns)
+          meths.concat inner_get_methods('', nfqns, skip, sc_visi)
+          meths.concat yard_map.get_methods(nfqns, '', visibility: sc_visi)
         end
       end
       em = @namespace_extends[fqns]
@@ -866,13 +874,16 @@ module Solargraph
         unless sc.nil?
           sc_visi = [:public]
           sc_visi.push :protected if sc == fqns
-          meths.concat get_instance_methods(sc, fqns, visibility: sc_visi)
+          nfqns = find_fully_qualified_namespace(sc, fqns)
+          meths.concat inner_get_instance_methods('', nfqns, skip, sc_visi)
+          meths.concat yard_map.get_instance_methods(nfqns, '', visibility: sc_visi)
         end
       end
       im = @namespace_includes[fqns]
       unless im.nil?
         im.each do |i|
-          meths.concat inner_get_instance_methods(i, fqns, skip, visibility)
+          nfqns = find_fully_qualified_namespace(i, fqns)
+          meths.concat inner_get_instance_methods('', nfqns, skip, visibility)
         end
       end
       meths.uniq
@@ -949,7 +960,7 @@ module Solargraph
       type
     end
 
-    def inner_get_constants here, skip = [], deep = true, visibility
+    def inner_get_constants here, skip = [], deep = true, visibility = [:public]
       return [] if skip.include?(here)
       skip.push here
       result = []

data/lib/solargraph/api_map/source_to_yard.rb

@@ -2,8 +2,6 @@ module Solargraph
   class ApiMap
     module SourceToYard
 
-      private
-
       # Get the YARD CodeObject at the specified path.
       #
       # @return [YARD::CodeObjects::Base]
@@ -15,14 +13,6 @@ module Solargraph
         code_object_map.keys
       end
 
-      def code_object_map
-        @code_object_map ||= {}
-      end
-
-      def root_code_object
-        @root_code_object ||= YARD::CodeObjects::RootObject.new(nil, 'root')
-      end
-
       # @param sources [Array<Solargraph::ApiMap::Source>] Sources for code objects
       def rake_yard sources
         code_object_map.clear
@@ -37,7 +27,9 @@ module Solargraph
             code_object_map[pin.path].files.push pin.source.filename
           end
           s.namespace_includes.each_pair do |n, i|
-            code_object_map[n].mixins.push code_object_map[i] unless code_object_map[i].nil?
+            i.each do |inc|
+              code_object_map[n].instance_mixins.push code_object_map[inc] unless code_object_map[inc].nil?
+            end
           end
           s.attribute_pins.each do |pin|
             code_object_map[pin.path] ||= YARD::CodeObjects::MethodObject.new(code_object_at(pin.namespace), pin.name, :instance)
@@ -60,6 +52,16 @@ module Solargraph
           end
         end
       end
+
+      private
+
+      def code_object_map
+        @code_object_map ||= {}
+      end
+
+      def root_code_object
+        @root_code_object ||= YARD::CodeObjects::RootObject.new(nil, 'root')
+      end
     end
   end
 end

data/lib/solargraph/code_map.rb

@@ -2,8 +2,6 @@ require 'parser/current'
 
 module Solargraph
   class CodeMap
-    autoload :Statement, 'solargraph/code_map/statement'
-
     # The root node of the parsed code.
     #
     # @return [Parser::AST::Node]
@@ -32,7 +30,11 @@ module Solargraph
       filename = filename.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless filename.nil? or File::ALT_SEPARATOR.nil?
       @filename = filename
       @api_map = api_map
-      @source = self.api_map.virtualize code, filename, cursor
+      if !filename.nil? and filename.end_with?('.erb')
+        @source = self.api_map.virtualize(convert_erb(code), filename, cursor)
+      else
+        @source = self.api_map.virtualize(code, filename, cursor)
+      end
       @node = @source.node
       @code = @source.code
       @comments = @source.comments
@@ -813,5 +815,46 @@ module Solargraph
       return [] if match.nil?
       match[1].split(',').map(&:strip)
     end
+
+    # @param template [String]
+    def convert_erb template
+      result = ''
+      i = 0
+      in_code = false
+      if template.start_with?('<%=')
+        i += 3
+        result += ';;;'
+        in_code = true
+      elsif template.start_with? '<%'
+        i += 2
+        result += ';;'
+        in_code = true
+      end
+      while i < template.length
+        if in_code
+          if template[i, 2] == '%>'
+            i += 2
+            result += ';;'
+            in_code = false
+          else
+            result += template[i]
+          end
+        else
+          if template[i, 3] == '<%='
+            i += 2
+            result += ';;;'
+            in_code = true
+          elsif template[i, 2] == '<%'
+            i += 1
+            result += ';;'
+            in_code = true
+          else
+            result += template[i].sub(/[^\s]/, ' ')
+          end
+        end
+        i += 1
+      end
+      result
+    end
   end
 end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.17.0'
+  VERSION = '0.17.1'
 end

data/lib/solargraph/yard_map.rb

@@ -22,6 +22,8 @@ module Solargraph
       # HACK: YardMap needs its own copy of this array
       @required = required.clone
       @namespace_yardocs = {}
+      @gem_paths = {}
+      process_gem_paths
       if !workspace.nil? and File.exist?(File.join workspace, 'Gemfile')
         Bundler.with_clean_env do
           Bundler.environment.chdir(workspace) do
@@ -246,7 +248,7 @@ module Solargraph
               meths = obj.meths(scope: [:instance]).keep_if{|m| m.name.to_s == parts[1]}
               meths.each do |m|
                 args = get_method_args(m)
-                result.push Solargraph::Suggestion.new(m.name, kind: 'Method', detail: m.path, code_object: m, arguments: args)
+                result.push Solargraph::Suggestion.new(m.name, kind: 'Method', detail: m.path, code_object: m, arguments: args, location: object_location(m))
               end
             end
           else
@@ -254,7 +256,7 @@ module Solargraph
               args = []
               args = get_method_args(obj) if obj.kind_of?(YARD::CodeObjects::MethodObject)
               kind = kind_of_object(obj)
-              result.push Solargraph::Suggestion.new(obj.name, kind: kind, detail: obj.path, code_object: obj, arguments: args)
+              result.push Solargraph::Suggestion.new(obj.name, kind: kind, detail: obj.path, code_object: obj, arguments: args, location: object_location(obj))
             end
           end
         end
@@ -374,6 +376,37 @@ module Solargraph
       end
     end
 
+    def process_gem_paths
+      if !has_bundle?
+        required.each do |r|
+          spec = Gem::Specification.find_by_path(r)
+          if spec.nil?
+            STDERR.puts "Required path not found: #{r}"
+          else
+            @gem_paths[spec.name] = spec.full_gem_path
+          end
+        end
+      else
+        Bundler.with_clean_env do
+          Bundler.environment.chdir(workspace) do
+            Bundler.environment.gems.to_a.each do |g|
+              @gem_paths[g.name] = g.full_gem_path
+            end
+          end
+          #Bundler.environment.chdir(workspace) do
+          #  required.each do |r|
+          #    spec = Bundler.rubygems.gem_from_path(r)
+          #    if spec.nil?
+          #      STDERR.puts "Required path not found: #{r}"
+          #    else
+          #      @gem_paths[spec.name] = spec.full_gem_path
+          #    end
+          #  end
+          #end
+        end
+      end
+    end
+
     def find_yardoc path
       result = nil
       spec = Gem::Specification.find_by_path(path)
@@ -441,11 +474,18 @@ module Solargraph
 
     # @param obj [YARD::CodeObjects::Base]
     def object_location obj
-      # @todo Locations from YardMaps are temporarily disabled pending a
-      # method for resolving the source file's absolute path.
-      return nil
       return nil if obj.file.nil? or obj.line.nil?
-      "#{obj.file}:#{obj.line - 1}:0"
+      @gem_paths.values.each do |path|
+        file = File.join(path, obj.file)
+        if File.exist?(file)
+          return "#{file}:#{obj.line - 1}:0"
+        end
+      end
+      nil
+    end
+
+    def has_bundle?
+      !workspace.nil? and File.exist?(File.join workspace, 'Gemfile')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser