Rename to prism

Author: kddnewton

Gemfile

@@ -3,3 +3,7 @@
 source "https://rubygems.org"
 
 gemspec
+
+if File.directory?("../../ruby/prism")
+  gem "prism", path: "../../ruby/prism"
+end

Gemfile.lock

@@ -1,21 +1,26 @@
+PATH
+  remote: ../../ruby/prism
+  specs:
+    prism (0.12.0)
+
 PATH
   remote: .
   specs:
-    syntax_tree-yarp (0.1.0)
+    syntax_tree-prism (0.1.0)
       prettier_print (>= 1.2.0)
-      yarp (>= 0.12.0)
+      prism (>= 0.12.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     prettier_print (1.2.1)
-    yarp (0.12.0)
 
 PLATFORMS
   arm64-darwin-22
 
 DEPENDENCIES
-  syntax_tree-yarp!
+  prism!
+  syntax_tree-prism!
 
 BUNDLED WITH
    2.4.13

bin/format

@@ -3,13 +3,13 @@
 require "bundler/setup"
 
 $:.unshift(File.expand_path("../lib", __dir__))
-require "syntax_tree/yarp"
+require "syntax_tree/prism"
 
 result =
   if ARGV[0] == "-e"
-    YARP.parse(ARGV[1])
+    Prism.parse(ARGV[1])
   else
-    YARP.parse_file(ARGV[0])
+    Prism.parse_file(ARGV[0])
   end
 
 puts result.format

bin/test

@@ -4,7 +4,7 @@
 require "bundler/setup"
 
 $:.unshift(File.expand_path("../lib", __dir__))
-require "syntax_tree/yarp"
+require "syntax_tree/prism"
 
 END {
   failures = DATA.readlines(chomp: true)
@@ -18,7 +18,7 @@ END {
         source, formatted = source.tap(&:shift).join.split("-\n")
         formatted ||= source
 
-        actual = YARP.parse(source).format
+        actual = Prism.parse(source).format
         name = "#{File.basename(filepath)}:#{index}"
 
         if actual != formatted
@@ -33,10 +33,10 @@ END {
 
   puts failures
 
-  YARP::TESTS.each do |clazz, cases|
+  Prism::TESTS.each do |clazz, cases|
     cases.each do |(output, input, block)|
       output = output.gsub("{{long}}", "a" * 80)
-      result = YARP.parse(input.gsub("{{long}}", "a" * 80))
+      result = Prism.parse(input.gsub("{{long}}", "a" * 80))
 
       node = result.value.statements.body.last
       node = block.call(node) if block

lib/syntax_tree/yarp.rb renamed to lib/syntax_tree/prism.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require "prettier_print"
-require "yarp"
+require "prism"
 
-module YARP
+module Prism
   class ParseResult
     # Format the syntax tree using the default options.
     def format
@@ -25,5 +25,5 @@ def self.test(output, input = output, &block)
   end
 end
 
-require "syntax_tree/yarp/formatter"
-require "syntax_tree/yarp/nodes"
+require "syntax_tree/prism/formatter"
+require "syntax_tree/prism/nodes"

lib/syntax_tree/yarp/formatter.rb renamed to lib/syntax_tree/prism/formatter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module YARP
+module Prism
   # A slightly enhanced PrettierPrint that knows how to format recursively
   # including comments.
   class Formatter < PrettierPrint

lib/syntax_tree/yarp/nodes.rb renamed to lib/syntax_tree/prism/nodes.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module YARP
+module Prism
   class Comment
     def slice
       location.slice
@@ -508,7 +508,14 @@ class CallNode
     def format(q)
       message = self.message
       name = self.name
-      arguments = self.arguments
+
+      arguments = [*self.arguments&.arguments]
+      block = self.block
+
+      if block.is_a?(BlockArgumentNode)
+        arguments << block
+        block = nil
+      end
 
       unless safe_navigation?
         case name.to_sym
@@ -532,28 +539,28 @@ def format(q)
             return
           end
 
-          if !arguments && !block
+          if arguments.empty? && block.nil?
             q.format_prefix(message_loc, receiver)
             return
           end
         when :+@, :-@, :~
-          if !arguments && !block
+          if arguments.empty? && block.nil?
             q.format_prefix(message_loc, receiver)
             return
           end
         when :+, :-, :*, :/, :==, :>, :<, :>=, :<=, :<=>, :<<, :>>
-          if arguments&.arguments.length == 1 && !block
-            q.format_binary(receiver, message_loc, arguments)
+          if arguments.length == 1 && block.nil?
+            q.format_binary(receiver, message_loc, arguments.first)
             return
           end
         when :**
-          if arguments&.arguments.length == 1 && !block
+          if arguments.length == 1 && block.nil?
             q.group do
               q.format(receiver)
               q.text("**")
               q.indent do
                 q.breakable_empty
-                q.format(arguments)
+                q.seplist(arguments) { |argument| q.format(argument) }
               end
             end
 
@@ -564,10 +571,10 @@ def format(q)
             q.format(receiver)
             q.text("[")
 
-            if arguments
+            if arguments.any?
               q.indent do
                 q.breakable_empty
-                q.format(arguments)
+                q.seplist(arguments) { |argument| q.format(argument) }
               end
 
               q.breakable_empty
@@ -583,9 +590,9 @@ def format(q)
 
           return
         when :[]=
-          if arguments
+          if arguments.any?
             q.group do
-              *before, after = arguments.arguments
+              *before, after = arguments
 
               q.group do
                 q.format(receiver)
@@ -644,21 +651,21 @@ def format(q)
             q.text(message)
           end
 
-        if arguments && arguments.arguments.length == 1 && name.end_with?("=") && !block
+        if arguments.length == 1 && name.end_with?("=") && block.nil?
           q.text(" =")
           q.indent do
             q.breakable_space
-            q.format(arguments)
+            q.seplist(arguments) { |argument| q.format(argument) }
           end
-        elsif opening_loc && arguments && closing_loc
+        elsif opening_loc && arguments.any? && closing_loc
           q.text("(")
           q.indent do
             q.breakable_empty
-            q.format(arguments)
+            q.seplist(arguments) { |argument| q.format(argument) }
           end
           q.breakable_empty
           q.text(")")
-        elsif arguments
+        elsif arguments.any?
           q.text(" ")
           align(q, self, q.last_position(doc))
         elsif opening_loc && closing_loc

syntax_tree-yarp.gemspec renamed to syntax_tree-prism.gemspec

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
-  spec.name = "syntax_tree-yarp"
+  spec.name = "syntax_tree-prism"
   spec.version = "0.1.0"
   spec.authors = ["Kevin Newton"]
   spec.email = ["[email protected]"]
 
   spec.summary = "WIP"
-  spec.homepage = "https://github.com/ruby-syntax-tree/syntax_tree-yarp"
+  spec.homepage = "https://github.com/ruby-syntax-tree/syntax_tree-prism"
   spec.license = "MIT"
   spec.metadata = { "rubygems_mfa_required" => "true" }
 
@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "prettier_print", ">= 1.2.0"
-  spec.add_dependency "yarp", ">= 0.12.0"
+  spec.add_dependency "prism", ">= 0.12.0"
 end