Always use whitequark parser

castwide · Jan 15, 2025 · 5b4e2ff · 5b4e2ff
1 parent 71b7a7d
commit 5b4e2ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/solargraph/parser.rb b/lib/solargraph/parser.rb
@@ -13,8 +13,8 @@ class SyntaxError < StandardError
     # True if the parser can use RubyVM.
     #
     def self.rubyvm?
-      !!defined?(RubyVM::AbstractSyntaxTree)
-      # false
+      # !!defined?(RubyVM::AbstractSyntaxTree)
+      false
     end
 
     selected = rubyvm? ? Rubyvm : Legacy

diff --git a/lib/solargraph/range.rb b/lib/solargraph/range.rb
@@ -65,10 +65,8 @@ def self.from_to l1, c1, l2, c2
     # @param node [RubyVM::AbstractSyntaxTree::Node, Parser::AST::Node]
     # @return [Range]
     def self.from_node node
-      if defined?(RubyVM::AbstractSyntaxTree::Node)
-        if node.is_a?(RubyVM::AbstractSyntaxTree::Node)
-          Solargraph::Range.from_to(node.first_lineno - 1, node.first_column, node.last_lineno - 1, node.last_column)
-        end
+      if Parser.rubyvm? && node.is_a?(RubyVM::AbstractSyntaxTree::Node)
+        Solargraph::Range.from_to(node.first_lineno - 1, node.first_column, node.last_lineno - 1, node.last_column)
       elsif node&.loc && node.loc.expression
         from_expr(node.loc.expression)
       end