1 files changed, 12 insertions, 11 deletions
diff --git a/lib/syntax_suggest/api.rb b/lib/syntax_suggest/api.rb
index 5b725e13d7..5054efa888 100644
--- a/lib/syntax_suggest/api.rb
+++ b/lib/syntax_suggest/api.rb
@@ -5,9 +5,11 @@ require_relative "version"
 require "tmpdir"
 require "stringio"
 require "pathname"
-require "ripper"
 require "timeout"
 
+# Prism is the new parser, replacing Ripper
+require "prism"
+
 module SyntaxSuggest
   # Used to indicate a default value that cannot
   # be confused with another input.
@@ -78,7 +80,7 @@ module SyntaxSuggest
       code_lines: search.code_lines
     ).call
   rescue Timeout::Error => e
-    io.puts "Search timed out SYNTAX_SUGGEST_TIMEOUT=#{timeout}, run with DEBUG=1 for more info"
+    io.puts "Search timed out SYNTAX_SUGGEST_TIMEOUT=#{timeout}, run with SYNTAX_SUGGEST_DEBUG=1 for more info"
     io.puts e.backtrace.first(3).join($/)
   end
 
@@ -91,7 +93,9 @@ module SyntaxSuggest
     dir = Pathname(dir)
     dir.join(time).tap { |path|
       path.mkpath
-      FileUtils.ln_sf(time, dir.join("last"))
+      alias_dir = dir.join("last")
+      FileUtils.rm_rf(alias_dir) if alias_dir.exist?
+      FileUtils.ln_sf(time, alias_dir)
     }
   end
 
@@ -117,11 +121,7 @@ module SyntaxSuggest
   def self.valid_without?(without_lines:, code_lines:)
     lines = code_lines - Array(without_lines).flatten
 
-    if lines.empty?
-      true
-    else
-      valid?(lines)
-    end
+    lines.empty? || valid?(lines)
   end
 
   # SyntaxSuggest.invalid? [Private]
@@ -131,7 +131,7 @@ module SyntaxSuggest
     source = source.join if source.is_a?(Array)
     source = source.to_s
 
-    Ripper.new(source).tap(&:parse).error?
+    Prism.parse(source).failure?
   end
 
   # SyntaxSuggest.valid? [Private]
@@ -185,11 +185,10 @@ require_relative "explain_syntax"
 require_relative "clean_document"
 
 # Helpers
-require_relative "lex_all"
 require_relative "code_line"
 require_relative "code_block"
 require_relative "block_expand"
-require_relative "ripper_errors"
+require_relative "mini_stringio"
 require_relative "priority_queue"
 require_relative "unvisited_lines"
 require_relative "around_block_scan"
@@ -197,3 +196,5 @@ require_relative "priority_engulf_queue"
 require_relative "pathname_from_message"
 require_relative "display_invalid_blocks"
 require_relative "parse_blocks_from_indent_line"
+require_relative "visitor"
+require_relative "token"