syntax_tree 2.4.0 → 2.6.0

data/lib/syntax_tree/visitor/field_visitor.rb

@@ -586,6 +586,14 @@ module SyntaxTree
         end
       end
 
+      def visit_lambda_var(node)
+        node(node, "lambda_var") do
+          field("params", node.params)
+          list("locals", node.locals) if node.locals.any?
+          comments(node)
+        end
+      end
+
       def visit_lbrace(node)
         visit_token(node, "lbrace")
       end

data/lib/syntax_tree/visitor/match_visitor.rb

@@ -22,7 +22,7 @@ module SyntaxTree
           # entire value into the output buffer.
           q.text(node.inspect)
         else
-          q.pp(node)
+          node.pretty_print(q)
         end
       end
 
@@ -114,7 +114,7 @@ module SyntaxTree
         q.nest(0) do
           q.text(name)
           q.text(": ")
-          q.pp(value)
+          value.pretty_print(q)
         end
       end
     end

data/lib/syntax_tree/visitor.rb

@@ -301,6 +301,9 @@ module SyntaxTree
     # Visit a Lambda node.
     alias visit_lambda visit_child_nodes
 
+    # Visit a LambdaVar node.
+    alias visit_lambda_var visit_child_nodes
+
     # Visit a LBrace node.
     alias visit_lbrace visit_child_nodes
 

data/lib/syntax_tree.rb

@@ -2,7 +2,7 @@
 
 require "json"
 require "pp"
-require "prettyprint"
+require "prettier_print"
 require "ripper"
 require "stringio"
 
@@ -16,30 +16,6 @@ require_relative "syntax_tree/visitor/json_visitor"
 require_relative "syntax_tree/visitor/match_visitor"
 require_relative "syntax_tree/visitor/pretty_print_visitor"
 
-# If PrettyPrint::Align isn't defined, then we haven't gotten the updated
-# version of prettyprint. In that case we'll define our own. This is going to
-# overwrite a bunch of methods, so silencing them as well.
-unless PrettyPrint.const_defined?(:Align)
-  verbose = $VERBOSE
-  $VERBOSE = nil
-
-  begin
-    require_relative "syntax_tree/prettyprint"
-  ensure
-    $VERBOSE = verbose
-  end
-end
-
-# When PP is running, it expects that everything that interacts with it is going
-# to flow through PP.pp, since that's the main entry into the module from the
-# perspective of its uses in core Ruby. In doing so, it calls guard_inspect_key
-# at the top of the PP.pp method, which establishes some thread-local hashes to
-# check for cycles in the pretty printed tree. This means that if you want to
-# manually call pp on some object _before_ you have established these hashes,
-# you're going to break everything. So this call ensures that those hashes have
-# been set up before anything uses pp manually.
-PP.new(+"", 0).guard_inspect_key {}
-
 # Syntax Tree is a suite of tools built on top of the internal CRuby parser. It
 # provides the ability to generate a syntax tree from source, as well as the
 # tools necessary to inspect and manipulate that syntax tree. It can be used to
@@ -64,8 +40,8 @@ module SyntaxTree
   end
 
   # Parses the given source and returns the formatted source.
-  def self.format(source)
-    formatter = Formatter.new(source, [])
+  def self.format(source, maxwidth = 80)
+    formatter = Formatter.new(source, [], maxwidth)
     parse(source).format(formatter)
 
     formatter.flush

data/syntax_tree.gemspec

@@ -25,8 +25,11 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
+  spec.add_dependency "prettier_print"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: prettier_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -95,11 +123,17 @@ files:
 - lib/syntax_tree.rb
 - lib/syntax_tree/cli.rb
 - lib/syntax_tree/formatter.rb
+- lib/syntax_tree/formatter/single_quotes.rb
+- lib/syntax_tree/formatter/trailing_comma.rb
 - lib/syntax_tree/language_server.rb
 - lib/syntax_tree/language_server/inlay_hints.rb
 - lib/syntax_tree/node.rb
 - lib/syntax_tree/parser.rb
-- lib/syntax_tree/prettyprint.rb
+- lib/syntax_tree/plugin/single_quotes.rb
+- lib/syntax_tree/plugin/trailing_comma.rb
+- lib/syntax_tree/rake/check_task.rb
+- lib/syntax_tree/rake/write_task.rb
+- lib/syntax_tree/rake_tasks.rb
 - lib/syntax_tree/version.rb
 - lib/syntax_tree/visitor.rb
 - lib/syntax_tree/visitor/field_visitor.rb