solargraph 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e75af30aa57a99e118082d7c337d889f7aa6151
-  data.tar.gz: 2937ed78501b758858b304127987eb822540163f
+  metadata.gz: 70caa0a1b8b30a5d8c276ef9ec3dd54e36df6786
+  data.tar.gz: 346775f0ce4f6b0dd62f2240ab0ad523c845075a
 SHA512:
-  metadata.gz: 110b41dcd353afc575f30a096e9e83d311ff8d664e37847097d4618ab8bfe76f7d4825ff730838f971ba3af503015cde7b156e7a1d8afef504dfa3b1515dc13e
-  data.tar.gz: 5e0bc35e2d8c06a73e452451ddb3167f06f00fc8e52add97f9ea4152387e14ea366d4e2b715491697f65194d601feb0d04d23c2b09d5bef31ec5136d29dc3b50
+  metadata.gz: 415327acf2fc2f9779aa53a01a0a5bd4dd9e14f39cdc879f4ce51fdd9533eb3786a4c129fc0e365e080ddf8f4a2e5de0cb8464c7443ca2cbc1bb4d8a0fb4a6cf
+  data.tar.gz: 77954b8598a0b098d50b4080169f952dbdb008381c7471bebcd97fe6ebd4a737d23a768e5f5cb6bda05689dd6e3a6543cf62146590c01c53431151d62b68b324

data/lib/solargraph/api_map.rb

@@ -216,8 +216,8 @@ module Solargraph
         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
+            visi = [:public]
+            visi.push :private if namespace == '' and root != '' and pin.path == fqns
             result.concat inner_get_constants(pin.path, skip, true, visi)
           end
           parts.pop
@@ -967,24 +967,24 @@ module Solargraph
       cp = @const_pins[here]
       unless cp.nil?
         cp.each do |pin|
-          result.push pin_to_suggestion(pin) if pin.visibility == :public or visibility == :private
+          result.push pin_to_suggestion(pin) if pin.visibility == :public or visibility.include?(:private)
         end
       end
       np = @namespace_pins[here]
       unless np.nil?
         np.each do |pin|
-          if pin.visibility == :public || visibility == :private
+          if pin.visibility == :public || visibility.include?(:private)
             result.push pin_to_suggestion(pin)
             if deep
               get_include_strings_from(pin.node).each do |i|
-                result.concat inner_get_constants(i, skip, false, :public)
+                result.concat inner_get_constants(i, skip, false, [:public])
               end
             end
           end
         end
       end
       get_include_strings_from(*get_namespace_nodes(here)).each do |i|
-        result.concat inner_get_constants(i, skip, false, :public)
+        result.concat inner_get_constants(i, skip, false, [:public])
       end
       result
     end

data/lib/solargraph/code_map.rb

@@ -102,11 +102,17 @@ module Solargraph
     #
     # @return [Boolean]
     def comment_at?(index)
+      return false if string_at?(index)
       line, col = Solargraph::ApiMap::Source.get_position_at(source.code, index)
       return false if source.stubbed_lines.include?(line)
       @comments.each do |c|
         return true if index > c.location.expression.begin_pos and index <= c.location.expression.end_pos
       end
+      # Extra test due to some comments not getting tracked
+      while (index > 0 and @code[index] != "\n")
+        return true if @code[index] == '#'
+        index -= 1
+      end
       false
     end
 
@@ -540,6 +546,7 @@ module Solargraph
       index -=1
       in_whitespace = false
       while index >= 0
+        break if index > 0 and comment_at?(index - 1)
         unless !in_whitespace and string_at?(index)
           break if brackets > 0 or parens > 0 or squares > 0
           char = @code[index, 1]

data/lib/solargraph/core_fills.rb

@@ -19,5 +19,9 @@ module Solargraph
     METHODS_WITH_YIELDPARAM_SUBTYPES = %w{
       Array#each Hash#each_pair Array#map
     }.freeze
+
+    CUSTOM_RETURN_TYPES = {
+      'String#split' => 'Array<String>'
+    }.freeze
   end
 end

data/lib/solargraph/server.rb

@@ -22,7 +22,6 @@ module Solargraph
 
     post '/prepare' do
       content_type :json
-      STDERR.puts "Preparing #{params['workspace']}"
       begin
         Server.prepare_workspace params['workspace']
         { "status" => "ok"}.to_json
@@ -99,7 +98,7 @@ module Solargraph
         sugg = []
         workspace = find_local_workspace(params['filename'], params['workspace'])
         api_map = get_api_map(workspace)
-        code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace], cursor: [params['line'].to_i, params['column'].to_i])
+        code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: api_map, cursor: [params['line'].to_i, params['column'].to_i])
         offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
         sugg = code_map.define_symbol_at(offset)
         { "status" => "ok", "suggestions" => sugg }.to_json
@@ -174,6 +173,7 @@ module Solargraph
     end
 
     def find_local_workspace file, workspace
+      return nil if workspace.nil? or workspace.empty?
       workspace.gsub!(/\\/, '/') unless workspace.nil?
       unless file.nil? or workspace.nil?
         file.gsub!(/\\/, '/') unless file.nil?
@@ -190,8 +190,9 @@ module Solargraph
     class << self
       def prepare_workspace directory
         return if directory.nil?
-        Thread.new do
-          directory.gsub!(/\\/, '/') unless directory.nil?
+        #Thread.new do
+          directory.gsub!(/\\/, '/')
+          STDERR.puts "Preparing #{directory}"
           configs = Dir[File.join(directory, '**', '.solargraph.yml')]
           resolved = []
           configs.each do |cf|
@@ -200,12 +201,11 @@ module Solargraph
             resolved.push dir
           end
           generate_api_map directory unless resolved.include?(directory)
-        end
+        #end
       end
 
       def generate_api_map(directory)
         api_map = Solargraph::ApiMap.new(directory)
-        api_map.yard_map
         @@semaphore.synchronize do
           @@api_hash[directory] = api_map
         end

data/lib/solargraph/version.rb

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

data/lib/solargraph/yard_map.rb

@@ -24,15 +24,6 @@ module Solargraph
       @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
-            process_requires
-          end
-        end
-      else
-        process_requires
-      end
       yardocs.push CoreDocs.yardoc_file
       yardocs.uniq!
       yardocs.each do |y|
@@ -45,11 +36,6 @@ module Solargraph
       cache_core
     end
 
-    # @return [Solargraph::LiveMap]
-    def live_map
-      @live_map ||= Solargraph::LiveMap.new
-    end
-
     # @return [Array<String>]
     def yardocs
       @yardocs ||= []
@@ -131,7 +117,7 @@ module Solargraph
         else
           next
         end
-        result.push Suggestion.new(c.to_s.split('::').last, detail: c.to_s, kind: kind, docstring: c.docstring, return_type: return_type)
+        result.push Suggestion.new(c.to_s.split('::').last, detail: c.to_s, kind: kind, docstring: c.docstring, return_type: return_type, location: object_location(c))
       }
       cache.set_constants(namespace, scope, result)
       result
@@ -199,7 +185,11 @@ module Solargraph
                   label = "#{n}"
                   args = get_method_args(m)
                   kind = (m.is_attribute? ? Suggestion::FIELD : Suggestion::METHOD)
-                  meths.push Suggestion.new(label, insert: "#{n.gsub(/=$/, ' = ')}", kind: kind, docstring: m.docstring, code_object: m, detail: m.namespace, location: object_location(m), arguments: args)
+                  rt = nil
+                  if Solargraph::CoreFills::CUSTOM_RETURN_TYPES.has_key?(m.path)
+                    rt = Solargraph::CoreFills::CUSTOM_RETURN_TYPES[m.path]
+                  end
+                  meths.push Suggestion.new(label, insert: "#{n.gsub(/=$/, ' = ')}", kind: kind, docstring: m.docstring, code_object: m, detail: m.namespace, location: object_location(m), arguments: args, return_type: rt)
                 end
               }
               if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Object'
@@ -218,10 +208,6 @@ module Solargraph
       meths
     end
 
-    def gem_names
-      Gem::Specification.map{ |s| s.name }.uniq
-    end
-
     def find_fully_qualified_namespace namespace, scope
       unless scope.nil? or scope.empty?
         parts = scope.split('::')
@@ -280,38 +266,6 @@ module Solargraph
       nil
     end
 
-    def bundled_gem_yardocs
-      result = []
-      unless workspace.nil?
-        Bundler.with_clean_env do
-          Bundler.environment.chdir(workspace) do
-            glfn = File.join(workspace, 'Gemfile.lock')
-            spec_versions = {}
-            if File.file?(glfn)
-              lockfile = Bundler::LockfileParser.new(Bundler.read_file(glfn))
-              lockfile.specs.each do |s|
-                spec_versions[s.name] = s.version.to_s
-              end
-            end
-            Bundler.environment.dependencies.each do |s|
-              if s.type == :runtime
-                ver = spec_versions[s.name]
-                y = YARD::Registry.yardoc_file_for_gem(s.name, ver)
-                if y.nil?
-                  STDERR.puts "Bundled gem not found: #{s.name}, #{ver}"
-                else
-                  #STDERR.puts "Adding #{y}"
-                  result.push y
-                  add_gem_dependencies(s.name)
-                end
-              end
-            end
-          end
-        end
-      end
-      result.uniq
-    end
-
     private
 
     def cache
@@ -359,86 +313,41 @@ module Solargraph
       end
     end
 
-    def process_requires
-      used = []
-      @required.each do |r|
-        if workspace.nil? or !File.exist?(File.join workspace, 'lib', "#{r}.rb")
-          unless used.include?(r)
-            used.push r
-            result = find_yardoc(r)
-            if result.nil?
-              STDERR.puts "Required path not found: #{r}"
-            else
-              yardocs.unshift result unless yardocs.include?(result)
-            end
-          end
-        end
-      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
+        process_requires
       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
+            #Bundler.environment.gems.to_a.each do |g|
+            #  @gem_paths[g.name] = g.full_gem_path
+            #end
+            process_requires
           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)
-      result = YARD::Registry.yardoc_file_for_gem(spec.name) unless spec.nil?
-      if result.nil?
-        $LOAD_PATH.each do |base|
-          source_file = File.join(base, "#{path}.rb")
-          if File.exist?(source_file)
-            if base.start_with?(Bundler.bundle_path.to_s)
-              match = File.dirname(base).split('/').last.match(/^([a-z0-9\-_]*?)-([0-9]+\.[0-9]+\.[0-9]+)/i)
-              unless match.nil? or match[1].nil?
-                result = YARD::Registry.yardoc_file_for_gem(match[1])
-                add_gem_dependencies match[1]
-                break
-              end
-            end
-            yp = File.join(File.dirname(base), '.yardoc')
-            if File.exist?(yp)
-              result = yp
-              break
-            else
-              # @todo Keep trying?
-            end
-            break
-          end
+    def process_requires
+      required.each do |r|
+        spec = Gem::Specification.find_by_path(r)
+        begin
+          spec = Gem::Specification.find_by_name(r) if spec.nil?
+        rescue Gem::MissingSpecError => e
+          # @todo How to handle this?
+        end
+        if spec.nil?
+          STDERR.puts "Required path not found (pgp): #{r}"
+        else
+          @gem_paths[spec.name] = spec.full_gem_path
+          add_gem_dependencies spec
+          result = YARD::Registry.yardoc_file_for_gem(spec.name)
+          yardocs.unshift result unless result.nil? or yardocs.include?(result)
         end
       end
-      result
     end
 
-    def add_gem_dependencies gem_name
-      spec = Gem::Specification.find_by_name(gem_name)
+    def add_gem_dependencies spec
       (spec.dependencies - spec.development_dependencies).each do |dep|
         gy = YARD::Registry.yardoc_file_for_gem(dep.name)
         if gy.nil?

metadata

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