syntax_tree 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd7e771d65269c131d28cd381186bb1e437e677d823f1219bc99a04d96d318c9
-  data.tar.gz: 9be18db6c8108ce433ec1acc07d4bc5d47969cc8aeca04786b92911c6e9e11c8
+  metadata.gz: 2feb5b8df043a9d8c8a75e6cf16f42ef1b4f84877d64ad7fe91725e4f1c4f013
+  data.tar.gz: e1eca9750c08fca80ada1bc3d7831a996dc01fd9f8651cd4f1d6b8c9decff0ea
 SHA512:
-  metadata.gz: f195700c3fbb9cd65ddf5a041e1fff5454aa4dc589b712d74205c126dd807b21e108e4c3d072a5af222f0cb22d1f9f45cf0cb70189498e86fbe6c80013f25622
-  data.tar.gz: c85dcdff58830ec44d96cf66f7814df8549646c7e0d3a9ebcf2dee364f45e7a0a3c3b46198fb6f0791eed2fc87f0d0be973dcd4008d60ba17e2a50c6026d5de1
+  metadata.gz: d3e061694d3ae39053ee7b6a9ff41e1230cf714e23d037da307c720fccebd2f674505c15f74eb515e4b6b45050e665792039b8f897f8594ac7fbadc0142e4d6e
+  data.tar.gz: c81f87007866892f47afaa41cfe053c9af44126641fad5605e5130356791ee76fcf9bbc95082cb63bc64e4daf90051de3faeb40ec5a672d1717a7858bd830165

data/CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [3.6.2] - 2022-10-04
+
+### Changed
+
+- [#165](https://github.com/ruby-syntax-tree/syntax_tree/pull/165) - Conditionals (`if`/`unless`), loops (`for`/`while`/`until`) and lambdas all had issues when comments immediately succeeded the declaration of the node where the comment could potentially be dropped. That has now been fixed.
+- [#166](https://github.com/ruby-syntax-tree/syntax_tree/pull/166) - Blocks can now be formatted even if they are the top node of the tree. Previously they were looking to their parent for some additional metadata, so we now handle the case where the parent is nil.
+
 ## [3.6.1] - 2022-09-28
 
 ### Changed
@@ -357,7 +364,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.6.1...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.6.2...HEAD
+[3.6.2]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.6.1...v3.6.2
 [3.6.1]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.6.0...v3.6.1
 [3.6.0]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.5.0...v3.6.0
 [3.5.0]: https://github.com/ruby-syntax-tree/syntax_tree/compare/v3.4.0...v3.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    syntax_tree (3.6.1)
+    syntax_tree (3.6.2)
       prettier_print
 
 GEM

data/lib/syntax_tree/node.rb

@@ -1955,11 +1955,12 @@ module SyntaxTree
       # If the receiver of this block a Command or CommandCall node, then there
       # are no parentheses around the arguments to that command, so we need to
       # break the block.
-      receiver = q.parent.call
-      if receiver.is_a?(Command) || receiver.is_a?(CommandCall)
+      case q.parent
+      in { call: Command | CommandCall }
         q.break_parent
         format_break(q, break_opening, break_closing)
         return
+      else
       end
 
       q.group do
@@ -1978,16 +1979,26 @@ module SyntaxTree
         # If we hit a statements, then we're safe to use whatever since we
         # know for certain we're going to get split over multiple lines
         # anyway.
-        break false if parent.is_a?(Statements) || parent.is_a?(ArgParen)
-
-        [Command, CommandCall].include?(parent.class)
+        case parent
+        in Statements | ArgParen
+          break false
+        in Command | CommandCall
+          true
+        else
+          false
+        end
       end
     end
 
     # If we're a sibling of a control-flow keyword, then we're going to have to
     # use the do..end bounds.
     def forced_do_end_bounds?(q)
-      [Break, Next, Return, Super].include?(q.parent.call.class)
+      case q.parent
+      in { call: Break | Next | Return | Super }
+        true
+      else
+        false
+      end
     end
 
     # If we're the predicate of a loop or conditional, then we're going to have
@@ -2314,7 +2325,8 @@ module SyntaxTree
     end
 
     def format(q)
-      if operator == :"::" || (operator.is_a?(Op) && operator.value == "::")
+      case operator
+      in :"::" | Op[value: "::"]
         q.text(".")
       else
         operator.format(q)
@@ -6004,6 +6016,8 @@ module SyntaxTree
       q.group(0, "->") do
         if params.is_a?(Paren)
           q.format(params) unless params.contents.empty?
+        elsif params.empty? && params.comments.any?
+          q.format(params)
         elsif !params.empty?
           q.group do
             q.text("(")

data/lib/syntax_tree/parser.rb

@@ -302,8 +302,8 @@ module SyntaxTree
     def on_BEGIN(statements)
       lbrace = find_token(LBrace)
       rbrace = find_token(RBrace)
-      start_char = find_next_statement_start(lbrace.location.end_char)
 
+      start_char = find_next_statement_start(lbrace.location.end_char)
       statements.bind(
         start_char,
         start_char - line_counts[lbrace.location.start_line - 1].start,
@@ -340,8 +340,8 @@ module SyntaxTree
     def on_END(statements)
       lbrace = find_token(LBrace)
       rbrace = find_token(RBrace)
-      start_char = find_next_statement_start(lbrace.location.end_char)
 
+      start_char = find_next_statement_start(lbrace.location.end_char)
       statements.bind(
         start_char,
         start_char - line_counts[lbrace.location.start_line - 1].start,
@@ -831,8 +831,8 @@ module SyntaxTree
       lbrace = find_token(LBrace)
       rbrace = find_token(RBrace)
       location = (block_var || lbrace).location
-      start_char = find_next_statement_start(location.end_char)
 
+      start_char = find_next_statement_start(location.end_char)
       statements.bind(
         start_char,
         start_char - line_counts[location.start_line - 1].start,
@@ -1329,8 +1329,8 @@ module SyntaxTree
 
       node = tokens[index]
       ending = node.value == "end" ? tokens.delete_at(index) : node
-      start_char = find_next_statement_start(keyword.location.end_char)
 
+      start_char = find_next_statement_start(keyword.location.end_char)
       statements.bind(
         start_char,
         start_char - line_counts[keyword.location.start_line - 1].start,
@@ -1355,9 +1355,10 @@ module SyntaxTree
       beginning = find_token(Kw, "elsif")
       ending = consequent || find_token(Kw, "end")
 
+      start_char = find_next_statement_start(predicate.location.end_char)
       statements.bind(
-        predicate.location.end_char,
-        predicate.location.end_column,
+        start_char,
+        start_char - line_counts[predicate.location.start_line - 1].start,
         ending.location.start_char,
         ending.location.start_column
       )
@@ -1598,9 +1599,12 @@ module SyntaxTree
         tokens.delete(keyword)
       end
 
+      start_char =
+        find_next_statement_start((keyword || collection).location.end_char)
       statements.bind(
-        (keyword || collection).location.end_char,
-        (keyword || collection).location.end_column,
+        start_char,
+        start_char -
+          line_counts[(keyword || collection).location.end_line - 1].start,
         ending.location.start_char,
         ending.location.start_column
       )
@@ -1778,9 +1782,10 @@ module SyntaxTree
       beginning = find_token(Kw, "if")
       ending = consequent || find_token(Kw, "end")
 
+      start_char = find_next_statement_start(predicate.location.end_char)
       statements.bind(
-        predicate.location.end_char,
-        predicate.location.end_column,
+        start_char,
+        start_char - line_counts[predicate.location.end_line - 1].start,
         ending.location.start_char,
         ending.location.start_column
       )
@@ -2024,9 +2029,10 @@ module SyntaxTree
         closing = find_token(Kw, "end")
       end
 
+      start_char = find_next_statement_start(opening.location.end_char)
       statements.bind(
-        opening.location.end_char,
-        opening.location.end_column,
+        start_char,
+        start_char - line_counts[opening.location.end_line - 1].start,
         closing.location.start_char,
         closing.location.start_column
       )
@@ -3456,9 +3462,10 @@ module SyntaxTree
       beginning = find_token(Kw, "unless")
       ending = consequent || find_token(Kw, "end")
 
+      start_char = find_next_statement_start(predicate.location.end_char)
       statements.bind(
-        predicate.location.end_char,
-        predicate.location.end_column,
+        start_char,
+        start_char - line_counts[predicate.location.end_line - 1].start,
         ending.location.start_char,
         ending.location.start_column
       )
@@ -3498,9 +3505,10 @@ module SyntaxTree
       end
 
       # Update the Statements location information
+      start_char = find_next_statement_start(predicate.location.end_char)
       statements.bind(
-        predicate.location.end_char,
-        predicate.location.end_column,
+        start_char,
+        start_char - line_counts[predicate.location.end_line - 1].start,
         ending.location.start_char,
         ending.location.start_column
       )
@@ -3633,9 +3641,10 @@ module SyntaxTree
       end
 
       # Update the Statements location information
+      start_char = find_next_statement_start(predicate.location.end_char)
       statements.bind(
-        predicate.location.end_char,
-        predicate.location.end_column,
+        start_char,
+        start_char - line_counts[predicate.location.end_line - 1].start,
         ending.location.start_char,
         ending.location.start_column
       )

data/lib/syntax_tree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SyntaxTree
-  VERSION = "3.6.1"
+  VERSION = "3.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettier_print