solargraph 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d9772edc47881d8e944c68b737e4b065fb2fb30
-  data.tar.gz: 1f2dbd2d6ec31e1d94c485a87e8a247b4ed49fe0
+  metadata.gz: bc699f1c3abc5198bf2fde325bb4dfde8c6cb384
+  data.tar.gz: 6f676543082c9943d647772d3c4c7f04ab4caefe
 SHA512:
-  metadata.gz: b4d94536db05855102ea393348a8a6d589ad76f119d2205aecbb0f4f666e654fc748c1c6890037b44edf028050c6a46faac90c2dcbe6187702498dcb9d34f16e
-  data.tar.gz: 57223756d8581d876d77026e14397e50ab3d08913a2b15515081d05b2ec1ecf092741bd933078e22a106b4067c0745da14227f9b0ce0bed0e7bf4d1e8ecf61db
+  metadata.gz: d519c282a68e56c063068d03a1d7067e98d544714e5b234b5f5da08c6b2e354fcc0067240bf6630eeeeb94b02cf57c1461715054b241febfe73217b53e6e3129
+  data.tar.gz: 57e7b7388f4aca96e654a1997cd8d236227f9ebb76f7b4d118ca2fe5e3e015955c583889693e683e81f37e978b5d8c5781d218b2e18af17e6d88262f7bde5f12

data/lib/solargraph/api_map.rb

@@ -10,7 +10,7 @@ module Solargraph
       'begin', 'break', 'case', 'class', 'def', 'defined?', 'do', 'else',
       'elsif', 'end', 'ensure', 'false', 'for', 'if', 'in', 'module', 'next',
       'nil', 'not', 'or', 'redo', 'rescue', 'retry', 'return', 'self', 'super',
-      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield'
+      'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield',
     ]
 
     MAPPABLE_METHODS = [
@@ -97,10 +97,9 @@ module Solargraph
       @file_comments[filename][node.loc]
     end
 
-    def self.get_keywords without_snippets: false
+    def self.get_keywords
       result = []
-      keywords = KEYWORDS
-      keywords -= Snippets.keywords if without_snippets
+      keywords = KEYWORDS + MAPPABLE_METHODS
       keywords.each { |k|
         result.push Suggestion.new(k, kind: Suggestion::KEYWORD, detail: 'Keyword')
       }
@@ -347,7 +346,7 @@ module Solargraph
         unless p == 'new' and scope != :instance
           if scope == :instance
             meths = get_instance_methods(type)
-            meths += get_methods('') if top
+            meths += get_methods('') if top or type.to_s == ''
           else
             meths = get_methods(type)
             #meths += get_methods('') if top
@@ -469,10 +468,17 @@ module Solargraph
         Dir.chdir(workspace) do
           #YARD::Registry.load(yard_options[:include] - yard_options[:exclude], true)
           #YARD::Registry.save
-          `yardoc -e #{Solargraph::YARD_EXTENSION_FILE} #{yard_options[:all]}`
-          unless $?.success?
-            STDERR.puts "There was an error processing the workspace yardoc."
-          end
+          Thread.new {
+            STDERR.puts "Updating the yardoc..."
+            globs = yard_options[:include] - yard_options[:exclude]
+            #cmd = "yardoc #{globs.join(' ')} -e #{Solargraph::YARD_EXTENSION_FILE} #{yard_options[:flags].join(' ')}"
+            cmd = "yardoc -e #{Solargraph::YARD_EXTENSION_FILE}"
+            STDERR.puts "Update yardoc with #{cmd}"
+            STDERR.puts `#{cmd}`
+            unless $?.success?
+              STDERR.puts "There was an error processing the workspace yardoc."
+            end
+          }
         end
       end
     end
@@ -538,7 +544,9 @@ module Solargraph
           if n.kind_of?(AST::Node)
             if n.type == :class and !n.children[1].nil?
               s = unpack_name(n.children[1])
-              meths += inner_get_instance_methods(s, namespace, skip)
+              # @todo This skip might not work properly. We might need to get a
+              #   fully qualified namespace from it first
+              meths += get_instance_methods(s, namespace) unless skip.include?(s)
             end
             current_scope = :public
             n.children.each { |c|

data/lib/solargraph/code_map.rb

@@ -4,6 +4,8 @@ module Solargraph
   class CodeMap
     attr_accessor :node
     attr_accessor :api_map
+    attr_reader :code
+    attr_reader :parsed
 
     include NodeMethods
 
@@ -20,23 +22,53 @@ module Solargraph
       if @api_map.nil?
         @api_map = ApiMap.new(workspace)
       end
-
       @code = code.gsub(/\r/, '')
       tries = 0
       # Hide incomplete code to avoid syntax errors
-      tmp = "#{@code}\nX".gsub(/[\.@]([\s])/, '#\1').gsub(/([\A\s]?)def([\s]*?[\n\Z])/, '\1#ef\2')
+      # @todo This might not be necessary given the corrected character
+      #   replacement in retries.
+      #tmp = "#{@code}\nX".gsub(/[\.@]([\s])/, '#\1').gsub(/([\A\s]?)def([\s]*?[\n\Z])/, '\1#ef\2')
+      tmp = @code
       begin
         node, comments = Parser::CurrentRuby.parse_with_comments(tmp)
         @node = @api_map.append_node(node, comments, filename)
+        @parsed = tmp
+        @code.freeze
+        @parsed.freeze
       rescue Parser::SyntaxError => e
         if tries < 10
+          STDERR.puts "Error parsing #{filename}: #{e.message}"
+          STDERR.puts "Retrying..."
           tries += 1
           spot = e.diagnostic.location.begin_pos
-          if spot == tmp.length
-            tmp = tmp[0..-2] + '#'
+          #STDERR.puts "CODE>>>>"
+          #STDERR.puts tmp
+          #STDERR.puts "<<<<CODE"
+          #STDERR.puts "Spot #{spot}: #{tmp[spot]}"
+          repl = '_'
+          if tmp[spot] == '@' or tmp[spot] == ':'
+            # Stub unfinished instance variables and symbols
+            spot -= 1
+          elsif tmp[spot - 1] == '.'
+            # Stub unfinished method calls
+            repl = '#' if spot == tmp.length or tmp[spot] == '\n'
+            spot -= 2
           else
-            tmp = tmp[0..spot] + '#' + tmp[spot+2..-1].to_s
+            # Stub the whole line
+            spot = beginning_of_line_from(tmp, spot)
+            repl = '#'
+            if tmp[spot+1..-1].rstrip == 'end'
+              repl= 'end;end'
+            end
           end
+          #if spot == 0
+          #  tmp = '#' + tmp[1..-1]
+          #else
+            tmp = tmp[0..spot] + repl + tmp[spot+repl.length+1..-1].to_s
+          #end
+          #STDERR.puts "CHNG>>>>"
+          #STDERR.puts tmp
+          #STDERR.puts "<<<<CHNG"
           retry
         end
         raise e
@@ -193,7 +225,7 @@ module Solargraph
         parts = current_namespace.to_s.split('::')
         result += get_snippets_at(index) if with_snippets
         result += get_local_variables_and_methods_at(index)
-        result += ApiMap.get_keywords(without_snippets: with_snippets)
+        result += ApiMap.get_keywords
         while parts.length > 0
           ns = parts.join('::')
           result += @api_map.namespaces_in(ns)
@@ -208,7 +240,7 @@ module Solargraph
           end
         end
       end
-      result = reduce_starting_with(result, word_at(index)) if filtered
+      #result = reduce_starting_with(result, word_at(index)) if filtered
       result.uniq{|s| s.path}
     end
 
@@ -335,7 +367,7 @@ module Solargraph
           prefix = prefix[0..-2]
         end
         if matched
-          result.push Suggestion.new(detail['prefix'], kind: Suggestion::KEYWORD, detail: name, insert: detail['body'].join("\r\n"))
+          result.push Suggestion.new(detail['prefix'], kind: Suggestion::SNIPPET, detail: name, insert: detail['body'].join("\r\n"))
         end
       }
       result
@@ -413,5 +445,14 @@ module Solargraph
       nil
     end
 
+    def beginning_of_line_from str, i
+      while i > 0 and str[i] != "\n"
+        i -= 1
+      end
+      if i > 0 and str[i..-1].strip == ''
+        i = beginning_of_line_from str, i -1
+      end
+      i
+    end
   end
 end

data/lib/solargraph/node_methods.rb

@@ -68,8 +68,7 @@ module Solargraph
         @yard_options = {
           include: [],
           exclude: [],
-          flags: [],
-          all: []
+          flags: []
         }
         unless workspace.nil?
           yardopts_file = File.join(workspace, '.yardopts')
@@ -77,7 +76,6 @@ module Solargraph
             yardopts = File.read(yardopts_file)
             yardopts.lines.each { |line|
               arg = line.strip
-              @yard_options[:all].push arg
               if arg.start_with?('-')
                 @yard_options[:flags].push arg
               else

data/lib/solargraph/server.rb

@@ -24,7 +24,7 @@ module Solargraph
         @@semaphore.synchronize {
           code_map = CodeMap.new(code: params['text'], filename: params['filename'], api_map: @@api_hash[workspace])
           offset = code_map.get_offset(params['line'].to_i, params['column'].to_i)
-          sugg = code_map.suggest_at(offset, with_snippets: true, filtered: true)
+          sugg = code_map.suggest_at(offset, with_snippets: params['with_snippets'] == '1' ? true : false, filtered: true)
         }
         { "status" => "ok", "suggestions" => sugg }.to_json
       rescue Exception => e

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.7.0'
+  VERSION = '0.7.5'
 end

data/lib/solargraph/yard_map.rb

@@ -21,7 +21,11 @@ module Solargraph
           unless used.include?(g)
             used.push g
             gy = YARD::Registry.yardoc_file_for_gem(g)
-            yardocs.push gy unless gy.nil?
+            if gy.nil?
+              STDERR.puts "Required path not found: #{r}"
+            else
+              yardocs.push gy
+            end
           end
         end
       }
@@ -85,17 +89,6 @@ module Solargraph
       yardocs.each { |y|
         yard = load_yardoc(y)
         unless yard.nil?
-          if namespace == '' and scope == ''
-            # Check for a bind tag in the yardoc root. If it exists, treat
-            # workspace code as a DSL that uses public instance methods in the
-            # specified namespaces.
-            b = yard.root.tag(:bind)
-            unless b.nil?
-              b.types.each { |t|
-                consts += get_instance_methods(t, '', visibility: :public)
-              }
-            end
-          end
           ns = nil
           if scope == ''
             ns = yard.at(namespace)
@@ -148,11 +141,19 @@ module Solargraph
       cached = cache.get_methods(namespace, scope, visibility)
       return cached unless cached.nil?
       meths = []
+      binds = []
       yardocs.each { |y|
         yard = load_yardoc(y)
         unless yard.nil?
           ns = nil
           ns = find_first_resolved_namespace(yard, namespace, scope)
+          if namespace == '' and scope == ''
+            # Check for a bind tag in the yardoc root. If it exists, treat
+            # workspace code as a DSL that uses public instance methods in the
+            # specified namespaces.
+            b = yard.root.tag(:bind)
+            binds.concat b.types unless b.nil?
+          end
           unless ns.nil?
             ns.meths(scope: :class, visibility: visibility).each { |m|
               n = m.to_s.split(/[\.#]/).last.gsub(/=/, ' = ')
@@ -171,6 +172,9 @@ module Solargraph
           end
         end
       }
+      binds.each { |b|
+        meths += get_instance_methods(b, scope, visibility: [:public])
+      }
       cache.set_methods(namespace, scope, visibility, meths)
       meths
     end
@@ -196,7 +200,9 @@ module Solargraph
               end
             }
             if ns.kind_of?(YARD::CodeObjects::ClassObject) and namespace != 'Object'
-              meths += get_instance_methods('Object')
+              if ns.superclass.kind_of?(YARD::CodeObjects::Proxy)
+                meths += get_instance_methods(ns.superclass.to_s)
+              end
             end
           end
         end
@@ -252,8 +258,8 @@ module Solargraph
     def cache_core
       c = get_constants '', ''
       c.each { |n|
-        get_methods 'n', visibility: :public
-        get_instance_methods 'n', visibility: :public
+        #get_methods n.label, visibility: :public
+        #get_instance_methods n.label, visibility: :public
       }
     end
   end

metadata

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