solargraph 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d08698f9e91d4e08d2826494bb69eeb81fd8675
-  data.tar.gz: 4fb6952fdc4c54106ffdefa2d596ad764cc6d0c9
+  metadata.gz: fc2beed7eafc3145abaeabd5c12b1e21faa1a511
+  data.tar.gz: 9d7f689adda7c1b6b47cbae5fc73e21c47b494ff
 SHA512:
-  metadata.gz: 336d028676662a1315d4c9686c8c09a052618cf2ac0156a9fcf89e376ffcbec53b32c819ac5c9c77291c20eb88c63ed0fa3f1e19e185e5a1924e34e68651d045
-  data.tar.gz: 73d41b0eee445ad355d675ab4cff779330053130dd6fe1e85f5da21a1cd4a8373d707e60401675c8855002809bad34b1bfb8b04ff134717296120cfe9a166934
+  metadata.gz: f108af9d8b4deb6e61700cb4d239aefafd2d596efd914632d71f270f2ff2e1b08cc6ea5e661a9571517a69dfb627a7cd898b489dd4a9977dba9349df701f050b
+  data.tar.gz: 2a35d50d979bb0b24221d7f4d8983c7b14f620003b5b3167631990404458446c25277fc441491579c6ab6ecdebe536935934cca5be3b40c9d34da53c9c307e64

data/lib/solargraph/api_map.rb

@@ -32,7 +32,7 @@ module Solargraph
           append_file(extra)
         end
         files = []
-        opts = options
+        opts = yard_options
         (opts[:include] - opts[:exclude]).each { |glob|
           files += Dir[File.join @workspace, glob]
         }
@@ -54,27 +54,6 @@ module Solargraph
       @required = []
     end
 
-    def options
-      o = {
-        include: [],
-        exclude: []
-      }
-      unless workspace.nil?
-        yardopts_file = File.join(workspace, '.yardopts')
-        if File.exist?(yardopts_file)
-          yardopts = File.read(yardopts_file)
-          yardopts.lines.each { |line|
-            arg = line.strip
-            if !arg.start_with?('-')
-              o[:include].push arg
-            end
-          }
-        end
-      end
-      o[:include].concat ['app/**/*.rb', 'lib/**/*.rb'] if o[:include].empty?
-      o
-    end
-
     def yard_map
       @yard_map ||= YardMap.new(required: required, workspace: workspace)
     end
@@ -167,7 +146,7 @@ module Solargraph
       unless fqns.nil? or skip.include?(fqns)
         skip.push fqns
         nodes = get_namespace_nodes(fqns)
-        #nodes.delete_if { |n| yardoc_has_file?(get_filename_for(n))}
+        nodes.delete_if { |n| yardoc_has_file?(get_filename_for(n))}
         unless nodes.empty?
           cursor = @namespace_tree
           parts = fqns.split('::')
@@ -268,6 +247,17 @@ module Solargraph
       root.nil? ? nil : root.children[0]
     end
 
+    def yardoc_has_file?(file)
+      return false if workspace.nil?
+      if @yardoc_files.nil?
+        @yardoc_files = []
+        yard_options[:include].each { |glob|
+          @yardoc_files.concat Dir[File.join workspace, glob]
+        }
+      end
+      @yardoc_files.include?(file)
+    end
+
     def inner_get_instance_variables(node, scope)
       arr = []
       if node.kind_of?(AST::Node)
@@ -487,7 +477,7 @@ module Solargraph
       return meths if fqns.nil?
       nodes = get_namespace_nodes(fqns)
       nodes.each { |n|
-        #unless yardoc_has_file?(get_filename_for(n))
+        unless yardoc_has_file?(get_filename_for(n))
           if n.kind_of?(AST::Node)
             if n.type == :class and !n.children[1].nil?
               s = unpack_name(n.children[1])
@@ -495,7 +485,7 @@ module Solargraph
             end
             meths += inner_get_methods_from_node(n, root, skip)
           end
-        #end
+        end
       }
       meths.uniq
     end
@@ -533,7 +523,7 @@ module Solargraph
       skip.push fqns
       nodes = get_namespace_nodes(fqns)
       nodes.each { |n|
-        #unless yardoc_has_file?(get_filename_for(n))
+        unless yardoc_has_file?(get_filename_for(n))
           if n.kind_of?(AST::Node)
             if n.type == :class and !n.children[1].nil?
               s = unpack_name(n.children[1])
@@ -569,7 +559,7 @@ module Solargraph
               end
             }
           end
-        #end
+        end
         # This is necessary to get included modules from workspace definitions
         get_include_strings_from(n).each { |i|
           meths += inner_get_instance_methods(i, fqns, skip)

data/lib/solargraph/code_map.rb

@@ -197,7 +197,7 @@ module Solargraph
         result += @api_map.get_instance_methods('Kernel')
       end
       result = reduce_starting_with(result, word_at(index)) if filtered
-      result
+      result.uniq{|s| s.path}
     end
 
     # Find the signature at the specified index and get suggestions based

data/lib/solargraph/node_methods.rb

@@ -62,5 +62,28 @@ module Solargraph
       end
       parts
     end
+
+    def yard_options
+      if @yard_options.nil?
+        @yard_options = {
+          include: [],
+          exclude: []
+        }
+        unless workspace.nil?
+          yardopts_file = File.join(workspace, '.yardopts')
+          if File.exist?(yardopts_file)
+            yardopts = File.read(yardopts_file)
+            yardopts.lines.each { |line|
+              arg = line.strip
+              if !arg.start_with?('-')
+                @yard_options[:include].push arg
+              end
+            }
+          end
+        end
+        @yard_options[:include].concat ['app/**/*.rb', 'lib/**/*.rb'] if @yard_options[:include].empty?
+      end
+      @yard_options
+    end
   end
 end

data/lib/solargraph/server.rb

@@ -11,7 +11,8 @@ module Solargraph
     @@semaphore = Mutex.new
 
     post '/prepare' do
-      prepare_workspace params['directory']
+      STDERR.puts "Preparing #{params['workspace']}"
+      Server.prepare_workspace params['workspace']
     end
 
     post '/suggest' do
@@ -65,7 +66,7 @@ module Solargraph
 
     class << self
       def run!
-        constant_updates
+        #constant_updates
         super
       end
 

data/lib/solargraph/suggestion.rb

@@ -22,6 +22,10 @@ module Solargraph
       @location = location
     end
     
+    def path
+      code_object.nil? ? label : code_object.path
+    end
+
     def to_s
       label
     end
@@ -32,6 +36,7 @@ module Solargraph
         kind: @kind,
         insert: @insert,
         detail: @detail,
+        path: path,
         location: (@location.nil? ? nil : @location.to_s)
       }
       if @code_object.nil?

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/solargraph/yard_map.rb

@@ -6,10 +6,10 @@ module Solargraph
 
   class YardMap
     def initialize required: [], workspace: nil
-      #unless workspace.nil?
-      #  wsy = File.join(workspace, '.yardoc')
-      #  yardocs.push wsy if File.exist?(wsy)
-      #end
+      unless workspace.nil?
+        wsy = File.join(workspace, '.yardoc')
+        yardocs.push wsy if File.exist?(wsy)
+      end
       used = []
       required.each { |r|
         if workspace.nil? or !File.exist?(File.join workspace, 'lib', "#{r}.rb")

metadata

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