solargraph 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c54193138513541a17e784338430260259b223
-  data.tar.gz: f464a3a964e88b6f82d250e065d92e0062c3a135
+  metadata.gz: de6f8c27644254cbf44fabf999b5e7d9c54361d5
+  data.tar.gz: e823050e40e151659b89be427a8039165c5a315c
 SHA512:
-  metadata.gz: b548477ca4dc01db1785654d68d779a1ae3e29fb29c7702efc006ce2abfd8101df8735395328bb11db9a19abfc568d93896fadc392c8eb9af4126450fb7df162
-  data.tar.gz: dd27df9547f7dddfff89b98af23cf61d9dfaeb5937f790885c30607b7ccc7f3d5151132fb1affa8183b4f766d257731129b504a1dbcc43c1791deec07f719a7c
+  metadata.gz: 1312f30cabb2d18635ea4e48900226318476ac7d53022b46b72afcc2696451154e9fc9718b1f74026ceb2cae6c4afc04b2904f28d3b9c02d555ef410904c53d2
+  data.tar.gz: 2c05df4a956bdb87868e6d624c72fc232a35599d0abd8763286b0db389f559e4b160747f6c6a3c43b1a2c2d7d8659b840ddd00465a69e57f327e2b0858dd4663

data/lib/solargraph/api_map.rb

@@ -5,6 +5,8 @@ require 'yaml'
 
 module Solargraph
   class ApiMap
+    autoload :Config, 'solargraph/api_map/config'
+
     KEYWORDS = [
       '__ENCODING__', '__LINE__', '__FILE__', 'BEGIN', 'END', 'alias', 'and',
       'begin', 'break', 'case', 'class', 'def', 'defined?', 'do', 'else',
@@ -26,20 +28,11 @@ module Solargraph
       @workspace = workspace.gsub(/\\/, '/') unless workspace.nil?
       clear
       unless @workspace.nil?
-        extra = File.join(@workspace, '.solargraph')
-        if File.exist?(extra)
-          append_file(extra)
-        end
-        files = []
-        opts = yard_options
-        (opts[:include] - opts[:exclude]).each { |glob|
-          files += Dir[File.join @workspace, glob]
-        }
-        opts[:exclude].each { |glob|
-          files -= Dir[File.join @workspace, glob]
-        }
-        files.uniq.each { |f|
-          append_file f if File.file?(f)
+        config = ApiMap::Config.new(@workspace)
+        config.included.each { |f|
+          unless config.excluded.include?(f)
+            append_file f
+          end
         }
       end
     end
@@ -62,8 +55,13 @@ module Solargraph
     end
 
     def append_source text, filename = nil
-      node, comments = Parser::CurrentRuby.parse_with_comments(text)
-      append_node(node, comments, filename)
+      begin
+        node, comments = Parser::CurrentRuby.parse_with_comments(text)
+        append_node(node, comments, filename)
+      rescue Parser::SyntaxError => e
+        STDERR.puts "Error parsing '#{filename}': #{e.message}"
+        nil
+      end
     end
 
     def append_node node, comments, filename = nil
@@ -82,11 +80,23 @@ module Solargraph
       yard_hash = {}
       comment_hash.each_pair { |k, v|
         ctxt = ''
+        num = nil
+        started = false
         v.each { |l|
-          ctxt += l.text.gsub(/^# /, '') + "\n"
+          # Trim the comment and minimum leading whitespace
+          p = l.text.gsub(/^#/, '')
+          if num.nil? and !p.strip.empty?
+            num = p.index(/[^ ]/)
+            started = true
+          elsif started and !p.strip.empty?
+            cur = p.index(/[^ ]/)
+            num = cur if cur < num
+          end
+          if started
+            ctxt += "#{p[num..-1]}\n"
+          end
         }
-        parser = YARD::DocstringParser.new
-        yard_hash[k] = parser.parse(ctxt).to_docstring
+        yard_hash[k] = YARD::Docstring.parser.parse(ctxt).to_docstring
       }
       yard_hash
     end
@@ -405,7 +415,6 @@ module Solargraph
       }
       return args if list.nil?
       list.children.each { |c|
-        STDERR.puts "Args child is #{c.type}"
         if c.type == :arg
           args.push c.children[0]
         elsif c.type == :optarg
@@ -480,7 +489,7 @@ module Solargraph
       if workspace.nil?
         STDERR.puts "No workspace specified for yardoc update."
       else
-        Thread.new {
+        Thread.new do
           Dir.chdir(workspace) do
             STDERR.puts "Updating the yardoc for #{workspace}..."
             cmd = "yardoc -e #{Solargraph::YARD_EXTENSION_FILE}"
@@ -490,7 +499,7 @@ module Solargraph
               STDERR.puts "There was an error processing the workspace yardoc."
             end
           end
-        }
+        end
       end
     end
 
@@ -563,6 +572,9 @@ module Solargraph
               # TODO: Determine the current scope so we can decide whether to
               # exclude protected or private methods. Right now we're just
               # assuming public only
+              elsif c.kind_of?(AST::Node) and c.type == :send and c.children[1] == :include
+                fqmod = find_fully_qualified_namespace(const_from(c.children[2]), root)
+                meths += get_instance_methods(fqmod) unless fqmod.nil? or skip.include?(fqmod)
               elsif current_scope == :public
                 if c.kind_of?(AST::Node) and c.type == :def
                   cmnt = get_comment_for(c)

data/lib/solargraph/api_map/config.rb

@@ -0,0 +1,37 @@
+module Solargraph
+  class ApiMap
+    class Config
+      attr_reader :workspace
+      attr_reader :included
+      attr_reader :excluded
+
+      def initialize workspace = nil
+        @workspace = workspace
+        @included = []
+        @excluded = []
+        include_globs = ['**/*.rb']
+        exclude_globs = ['spec/**/*']
+        unless @workspace.nil?
+          sfile = File.join(@workspace, '.solargraph.yml')
+          if File.file?(sfile)
+            conf = YAML.load(File.read(sfile))
+            include_globs = conf['include'] || include_globs
+            exclude_globs = conf['exclude'] || []
+          end
+        end
+        include_globs.each { |g| @included.concat process_glob(g) }
+        exclude_globs.each { |g| @excluded.concat process_glob(g) }
+      end
+
+      private
+
+      def process_glob glob
+        result = []
+        Dir[glob].each do |f|
+          result.push File.realdirpath(f)
+        end
+        result
+      end
+    end
+  end
+end

data/lib/solargraph/server.rb

@@ -11,6 +11,10 @@ module Solargraph
     @@api_hash = {}
     @@semaphore = Mutex.new
 
+    after do
+      GC.start
+    end
+
     post '/prepare' do
       STDERR.puts "Preparing #{params['workspace']}"
       Server.prepare_workspace params['workspace']

data/lib/solargraph/shell.rb

@@ -79,5 +79,16 @@ module Solargraph
         STDOUT.puts result
       end
     end
+
+    desc 'config [DIRECTORY]', 'Create or overwrite a default configuration file'
+    def config(directory = '.')
+      File.open(File.join(directory, '.solargraph'), 'w') do |file|
+        file.puts "include:",
+          "  - ./**/*.rb",
+          "exclude:",
+          "  - spec/**/*"
+      end
+      STDOUT.puts "Configuration file initialized."
+    end
   end
 end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.8.6'
+  VERSION = '0.9.0'
 end

data/lib/solargraph/yard_map.rb

@@ -37,10 +37,16 @@ module Solargraph
     end
 
     def load_yardoc y
-      if y.kind_of?(Array)
-        YARD::Registry.load y, true
-      else
-        YARD::Registry.load! y
+      begin
+        if y.kind_of?(Array)
+          YARD::Registry.load y, true
+        else
+          YARD::Registry.load! y
+        end
+      rescue Exception => e
+        STDERR.puts "Error loading yardoc '#{y}' #{e.class} #{e.message}"
+        yardocs.delete y
+        nil
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -136,6 +136,7 @@ files:
 - bin/solargraph
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
+- lib/solargraph/api_map/config.rb
 - lib/solargraph/code_map.rb
 - lib/solargraph/mapper.rb
 - lib/solargraph/node_methods.rb