syntax_tree-haml 1.3.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bddc6888f36d28a1f0829960a0be5a71edb719342895c68a1635f474fe977634
-  data.tar.gz: b56774e91f16a8521ca888824f84a4d9dbd3242837d74107add7255f3bc571d7
+  metadata.gz: 93531550f281631f3aa86988c3309f3a48250bd6e218c3712013bbcc1a590480
+  data.tar.gz: f8cf31bae239650f86a13dd8d0bdda41c5eab011bbd1ae829656df387b22b1bf
 SHA512:
-  metadata.gz: e9b36d29e67e7ea5424825a8344580c3560e7a49672fceb121eec6959a4e0becbb0a8481e935450c3566e6c5647062f90ad6b9411d2d8ce202d2c98b4695eece
-  data.tar.gz: 35dcaa252fdfe1b53bf8904feb2d312cd7c6f353bc48343f0944a030c315a9289bce62a6578f5c6d5813d992c35681cb9770abd66e2cc5ea53fab3389b8b4f7f
+  metadata.gz: caac6d625f266b6ac4d5808065573f2ae70de84ad3670cbed2c1cea8089e75e1f8986e5391f0349975ff0d1cb32a65aa114e3d3578207be46b8637358162f06a
+  data.tar.gz: fc8b9c900b04d1a6536ac7d7299d66be150111d11989f855e5bfd17820939fefca789f09fd8c830e761721a3ffc396c2a54865792e9c242e66de498efe5aef8d

data/.github/workflows/auto-merge.yml

@@ -0,0 +1,22 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.3
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

data/.github/workflows/main.yml

@@ -1,14 +1,17 @@
 name: Main
 on:
-- push
-- pull_request_target
+  push:
+    branches:
+      - main
+  pull_request: {}
 jobs:
   ci:
     strategy:
       fail-fast: false
       matrix:
         ruby:
-        - '2.7'
+        - '2.7.0'
+        - '2.7.5'
         - '3.0'
         - '3.1'
     name: CI
@@ -16,7 +19,7 @@ jobs:
     env:
       CI: true
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
@@ -25,17 +28,3 @@ jobs:
       run: |
         bundle exec rake test
         bundle exec rake stree:check
-  automerge:
-    name: AutoMerge
-    needs: ci
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-    steps:
-    - uses: actions/github-script@v3
-      with:
-        script: |
-          github.pulls.merge({
-            owner: context.payload.repository.owner.login,
-            repo: context.payload.repository.name,
-            pull_number: context.payload.pull_request.number
-          })

data/CHANGELOG.md

@@ -6,6 +6,25 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [3.0.0] - 2022-12-23
+
+### Changed
+
+- Required syntax_tree version 5.0.1 or higher.
+- Drop internal pattern matching in order to support Ruby implementations that don't support it.
+
+## [2.0.0] - 2022-10-18
+
+### Added
+
+- Support for Ruby 2.7.0, not just 2.7.3
+- Require syntax_tree 4.0.1 or higher.
+- Require prettier_print 1.0.0 or higher.
+
+### Changed
+
+- Nodes must now be formatted with a `SyntaxTree::Haml::Formatter`.
+
 ## [1.3.2] - 2022-09-19
 
 ### Added
@@ -60,7 +79,9 @@ 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-haml/compare/v1.3.2...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v3.0.0...HEAD
+[3.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v2.0.0...v3.0.0
+[2.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.3.2...v2.0.0
 [1.3.2]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.3.1...v1.3.2
 [1.3.1]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v1.2.1...v1.3.0

data/Gemfile.lock

@@ -1,20 +1,21 @@
 PATH
   remote: .
   specs:
-    syntax_tree-haml (1.3.2)
-      haml (>= 5.2)
-      prettier_print
-      syntax_tree (>= 2.0.1)
+    syntax_tree-haml (3.0.0)
+      haml (>= 5.2, != 6.0.0)
+      prettier_print (>= 1.0.0)
+      syntax_tree (>= 5.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     docile (1.4.0)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.1.1)
+      temple (>= 0.8.2)
+      thor
       tilt
     minitest (5.16.3)
-    prettier_print (0.1.0)
+    prettier_print (1.1.0)
     rake (13.0.6)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -22,9 +23,10 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    syntax_tree (3.6.0)
-      prettier_print
-    temple (0.8.2)
+    syntax_tree (5.0.1)
+      prettier_print (>= 1.1.0)
+    temple (0.9.1)
+    thor (1.2.1)
     tilt (2.0.11)
 
 PLATFORMS

data/lib/syntax_tree/haml/format.rb

@@ -4,9 +4,13 @@ module SyntaxTree
   module Haml
     class Format < Visitor
       class Formatter < ::SyntaxTree::Formatter
-        attr_reader :literal_lines, :quote
+        attr_reader :literal_lines
 
-        def initialize(source, ...)
+        def initialize(
+          source,
+          *rest,
+          options: ::SyntaxTree::Formatter::Options.new
+        )
           @literal_lines = {}
           source
             .lines
@@ -15,7 +19,7 @@ module SyntaxTree
               @literal_lines[index] = line.rstrip if line.start_with?("!")
             end
 
-          super(source, ...)
+          super(source, *rest, options: options)
         end
       end
 
@@ -62,11 +66,17 @@ module SyntaxTree
           q.text(node.value[:name])
 
           q.indent do
-            q.breakable(force: true)
+            q.breakable_force
+            first = true
 
-            segments = node.value[:text].strip.split("\n")
-            q.seplist(segments, -> { q.breakable(force: true) }) do |segment|
-              q.text(segment)
+            node.value[:text].each_line(chomp: true) do |line|
+              if first
+                first = false
+              else
+                q.breakable_force
+              end
+
+              q.text(line)
             end
           end
         end
@@ -78,11 +88,19 @@ module SyntaxTree
         text = node.value[:text].strip
 
         if text.include?("\n")
-          separator = -> { q.breakable(force: true) }
-
           q.indent do
-            separator.call
-            q.seplist(text.split("\n"), separator) { |segment| q.text(segment) }
+            q.breakable_force
+            first = true
+
+            text.each_line(chomp: true) do |line|
+              if first
+                first = false
+              else
+                q.breakable_force
+              end
+
+              q.text(line)
+            end
           end
         else
           q.text(" #{text}")
@@ -104,7 +122,7 @@ module SyntaxTree
       def visit_root(node)
         node.children.each do |child|
           visit(child)
-          q.breakable(force: true)
+          q.breakable_force
         end
       end
 
@@ -130,11 +148,11 @@ module SyntaxTree
 
           node.children.each do |child|
             if continuation?(node, child)
-              q.breakable(force: true)
+              q.breakable_force
               visit(child)
             else
               q.indent do
-                q.breakable(force: true)
+                q.breakable_force
                 visit(child)
               end
             end
@@ -143,7 +161,6 @@ module SyntaxTree
       end
 
       LiteralHashValue = Struct.new(:value)
-
       StringHashValue = Struct.new(:value, :quote)
 
       # When formatting a tag, there are a lot of different kinds of things that
@@ -201,6 +218,14 @@ module SyntaxTree
       end
 
       class HTMLAttributesPart
+        class Separator
+          def call(q)
+            q.fill_breakable
+          end
+        end
+
+        SEPARATOR = Separator.new
+
         attr_reader :values
 
         def initialize(raw)
@@ -214,11 +239,9 @@ module SyntaxTree
           q.group do
             q.text("(")
             q.nest(align) do
-              q.seplist(
-                values,
-                -> { q.fill_breakable },
-                :each_pair
-              ) { |key, value| q.text("#{key}=#{value}") }
+              q.seplist(values, SEPARATOR, :each_pair) do |key, value|
+                q.text("#{key}=#{value}")
+              end
             end
             q.text(")")
           end
@@ -249,7 +272,7 @@ module SyntaxTree
             q.text("{")
             q.indent do
               q.group do
-                q.breakable(level == 0 ? "" : " ")
+                level == 0 ? q.breakable_empty : q.breakable_space
                 q.seplist(hash, nil, :each_pair) do |key, value|
                   if key.match?(/^@|[-:]/)
                     q.text("#{quote}#{Quotes.normalize(key, quote)}#{quote}:")
@@ -275,7 +298,7 @@ module SyntaxTree
               end
             end
 
-            q.breakable(level == 0 ? "" : " ")
+            level == 0 ? q.breakable_empty : q.breakable_space
             q.text("}")
           end
         end
@@ -363,7 +386,7 @@ module SyntaxTree
             q.indent do
               # Split between the declaration of the tag and the contents of the
               # tag.
-              q.breakable("")
+              q.breakable_empty
 
               if node.value[:parse] && value.match?(/#[{$@]/)
                 # There's a weird case here where if the value includes
@@ -373,8 +396,7 @@ module SyntaxTree
                 q.if_break { q.text("") }.if_flat { q.text(" ") }
                 q.text(value[1...-1].gsub(/\\"/, "\""))
               elsif node.value[:parse]
-                q.text("= ")
-                q.text(value)
+                q.text("= #{value}")
               else
                 q.if_break { q.text("") }.if_flat { q.text(" ") }
                 q.text(value)
@@ -394,11 +416,11 @@ module SyntaxTree
       def continuation?(node, child)
         return false if child.type != :silent_script
 
-        case [node.value[:keyword], child.value[:keyword]]
-        in ["case", "in" | "when" | "else"]
-          true
-        in ["if" | "unless", "elsif" | "else"]
-          true
+        case node.value[:keyword]
+        when "case"
+          %w[in when else].include?(child.value[:keyword])
+        when "if", "unless"
+          %w[elsif else].include?(child.value[:keyword])
         else
           false
         end
@@ -413,14 +435,15 @@ module SyntaxTree
         end
       end
 
-      # Take a source string and attempt to parse it into a set of attributes that
-      # can be used to format the source.
+      # Take a source string and attempt to parse it into a set of attributes
+      # that can be used to format the source.
       def parse_attributes(source)
-        case Ripper.sexp(source)
-        in [:program, [[:hash, *], *]] if parsed =
-             ::Haml::AttributeParser.parse(source)
+        program = Ripper.sexp(source)
+        type = program && program[1][0][0]
+
+        if type == :hash && (parsed = ::Haml::AttributeParser.parse(source))
           parsed.to_h { |key, value| [key, parse_attributes(value)] }
-        in [:program, [[:string_literal, *], *]]
+        elsif type == :string_literal
           SyntaxTree.parse(source).statements.body[0]
         else
           LiteralHashValue.new(source)
@@ -435,7 +458,7 @@ module SyntaxTree
             q.group { yield }
             q.indent do
               node.children.each do |child|
-                q.breakable(force: true)
+                q.breakable_force
                 visit(child)
               end
             end

data/lib/syntax_tree/haml/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module Haml
-    VERSION = "1.3.2"
+    VERSION = "3.0.0"
   end
 end

data/lib/syntax_tree/haml.rb

@@ -33,8 +33,8 @@ module SyntaxTree
 
     # This is the main entrypoint for the formatter. It parses the source,
     # builds a formatter, then pretty prints the result.
-    def self.format(source, maxwidth = 80)
-      formatter = Format::Formatter.new(source, +"", maxwidth)
+    def self.format(source, maxwidth = 80, options: Formatter::Options.new)
+      formatter = Format::Formatter.new(source, +"", maxwidth, options: options)
       parse(source).format(formatter)
 
       formatter.flush
@@ -59,24 +59,26 @@ class Haml::Parser::ParseNode
   # accept a visitor in order to walk through the tree.
   def accept(visitor)
     case type
-    in :comment
+    when :comment
       visitor.visit_comment(self)
-    in :doctype
+    when :doctype
       visitor.visit_doctype(self)
-    in :filter
+    when :filter
       visitor.visit_filter(self)
-    in :haml_comment
+    when :haml_comment
       visitor.visit_haml_comment(self)
-    in :plain
+    when :plain
       visitor.visit_plain(self)
-    in :root
+    when :root
       visitor.visit_root(self)
-    in :script
+    when :script
       visitor.visit_script(self)
-    in :silent_script
+    when :silent_script
       visitor.visit_silent_script(self)
-    in :tag
+    when :tag
       visitor.visit_tag(self)
+    else
+      raise "Unknown node type: #{type}"
     end
   end
 

data/syntax_tree-haml.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_dependency "haml", ">= 5.2"
-  spec.add_dependency "prettier_print"
-  spec.add_dependency "syntax_tree", ">= 2.0.1"
+  # Can't use 6.0.0 due to https://github.com/haml/haml/issues/1085
+  spec.add_dependency "haml", ">= 5.2", "!= 6.0.0"
+  spec.add_dependency "prettier_print", ">= 1.0.0"
+  spec.add_dependency "syntax_tree", ">= 5.0.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree-haml
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,34 +27,37 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: prettier_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: syntax_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +122,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/auto-merge.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - CHANGELOG.md