solargraph 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187c43588289d2ce91d4aad67e933847460d5294
-  data.tar.gz: fab4412e895fdd597a0cde34d6ac451526d65754
+  metadata.gz: 8b663346a935bf7a364c828edc3eddfcdeab1702
+  data.tar.gz: 28e58c55f6d542b5a3b4bff0da3f7ce619d8df0c
 SHA512:
-  metadata.gz: 773a77bbc2e6aa114db6c79b55d80a99d392cd7194d1a95dc0651e2657be3086f7a2830bb69a9d44ef5a9f73c8bf80330d4089d6000fbe31f31cf152e6fba580
-  data.tar.gz: 550244a1ea6dc472eaf91cd69c46a19fdbf42e1093eb099100dbdb9579ce7eef82bae7e887381b1af994497c7acffd8cfe70de86bfb544293ce827531560ddc1
+  metadata.gz: 441b66f057a2ec97b41bc7a76b71c1869a483e61c2494cc2a93e4f9faac4d0e350b4b78096242a2f87ef001454c397447d422c0fba2fd5bbe2caa1ecb3cd2aba
+  data.tar.gz: 2d44127c944bd074ec315dd5e1043eebe5b9b706ef950468318228922655569a42fc2e641771f8e4b497209cff0b9a8852ce7ac49091be424ec9dfd476936846

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 = [
@@ -99,7 +99,7 @@ module Solargraph
 
     def self.get_keywords
       result = []
-      keywords = KEYWORDS
+      keywords = KEYWORDS + MAPPABLE_METHODS
       keywords.each { |k|
         result.push Suggestion.new(k, kind: Suggestion::KEYWORD, detail: 'Keyword')
       }

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,20 +22,37 @@ 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] + '#'
+          if tmp[spot] == '@' or tmp[spot] == ':'
+            # Stub unfinished instance variables and symbols
+            spot -= 1
+          elsif tmp[spot - 1] == '.'
+            # Stub unfinished method calls
+            spot -= 2
+          else
+            # Stub the whole line
+            spot = beginning_of_line_from(spot)
+          end
+          if spot == 0
+            tmp = '#' + tmp[1..-1]
           else
             tmp = tmp[0..spot] + '#' + tmp[spot+2..-1].to_s
           end
@@ -413,5 +432,11 @@ module Solargraph
       nil
     end
 
+    def beginning_of_line_from i
+      while i > 0 and @code[i] != "\n"
+        i -= 1
+      end
+      i
+    end
   end
 end

data/lib/solargraph/version.rb

@@ -1,3 +1,3 @@
 module Solargraph
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

metadata

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