Merge pull request #2291 from andrehjr/fix-highlight-calling-clear-me…

…thod Fix 'calling clear method' when defined in pry context.
pry · Oct 28, 2023 · d5a1f1c · d5a1f1c
2 parents aa6282f + 5a4aa4e
commit d5a1f1c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/lib/pry/indent.rb b/lib/pry/indent.rb
@@ -281,9 +281,7 @@ def in_string?
     # @param [String] string The Ruby to lex
     # @return [Array] An Array of pairs of [token_value, token_type]
     def tokenize(string)
-      tokens = SyntaxHighlighter.tokenize(string)
-      tokens = tokens.tokens.each_slice(2) if tokens.respond_to?(:tokens) # Coderay 1.0.0
-      tokens.to_a
+      SyntaxHighlighter.tokenize(string).each_slice(2).to_a
     end
 
     # Update the internal state about what kind of strings are open.

diff --git a/lib/pry/method.rb b/lib/pry/method.rb
@@ -564,8 +564,7 @@ def super_using_ancestors(ancestors, times = 1)
     def method_name_from_first_line(first_ln)
       return nil if first_ln.strip !~ /^def /
 
-      tokens = SyntaxHighlighter.tokenize(first_ln)
-      tokens = tokens.tokens.each_slice(2) if tokens.respond_to?(:tokens)
+      tokens = SyntaxHighlighter.tokenize(first_ln).each_slice(2)
       tokens.each_cons(2) do |t1, t2|
         if t2.last == :method || t2.last == :ident && t1 == [".", :operator]
           return t2.first

diff --git a/lib/pry/syntax_highlighter.rb b/lib/pry/syntax_highlighter.rb
@@ -11,7 +11,7 @@ def self.highlight(code, language = :ruby)
     end
 
     def self.tokenize(code, language = :ruby)
-      CodeRay.scan(code, language)
+      CodeRay::Scanners[language].new(code).tokens
     end
 
     def self.keyword_token_color