syntax_tree-haml 4.0.1 → 4.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/main.yml +3 -2
  3. data/CHANGELOG.md +9 -1
  4. data/Gemfile.lock +3 -3
  5. data/lib/syntax_tree/haml/format.rb +10 -0
  6. data/lib/syntax_tree/haml/version.rb +1 -1
  7. data/syntax_tree-haml.gemspec +1 -1
  8. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '081e23c9f9f103fd51db64973ec590cb21e1f4e34b31dc6769e70d2e7ec83db8'
4
- data.tar.gz: 900420a1918e007b906c3bf94d9d8639bc379acd82f29b1cdd307c2ca21688a7
3
+ metadata.gz: b926fc681f1792de33a0ab58885860f06337de292164185fd9d0cf86ff80da90
4
+ data.tar.gz: a09512989ef9b799975ec639ddbaa5fc65bddd76b0cdc9719b309372a5a4cb71
5
5
  SHA512:
6
- metadata.gz: 991fb1d1aedd65e2bcea53b89cc710dd3734109770bf03dc79070437129397cfbaa4b7a400c4584881e41a52db46bf0254cd84d3499ff1b4a3b3763ef29cb32e
7
- data.tar.gz: b48967b39546927871d86c485210ba6ccf007ae608bd3cdbacc8962658c1648d56e3ac76074e73042962142b799f0785b4719f8b680abbc972088e2eea622327
6
+ metadata.gz: a07aea76babd7c8a4c765749b3107c0dd3a904ced2550ddb15ea85cfaa6d3df12f6d20767c855eede216d54fdf844e41b00efcf186b9b44409510236823d58ae
7
+ data.tar.gz: 108994617aba53d1eb5758d563c3a5b96f65551ec7a0af9e66862f9c8e26c77232f4eb3bc727d9711f7da78f32d91d91adff3a0152ea6b35d7098a5c14d4fabd
data/.github/workflows/main.yml CHANGED
@@ -1,9 +1,11 @@
1
1
  name: Main
2
+
2
3
  on:
3
4
  push:
4
5
  branches:
5
6
  - main
6
7
  pull_request: {}
8
+
7
9
  jobs:
8
10
  ci:
9
11
  strategy:
@@ -14,10 +16,9 @@ jobs:
14
16
  - '2.7.5'
15
17
  - '3.0'
16
18
  - '3.1'
19
+ - '3.2'
17
20
  name: CI
18
21
  runs-on: ubuntu-latest
19
- env:
20
- CI: true
21
22
  steps:
22
23
  - uses: actions/checkout@v3
23
24
  - uses: ruby/setup-ruby@v1
data/CHANGELOG.md CHANGED
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
6
6
 
7
7
  ## [Unreleased]
8
8
 
9
+ ## [4.0.2] - 2023-03-09
10
+
11
+ ### Changed
12
+
13
+ - Require `prettier_print` `1.2.1` or higher to fix the infinite loop bug.
14
+ - Maintain blank lines in nested nodes.
15
+
9
16
  ## [4.0.1] - 2023-03-07
10
17
 
11
18
  ### Changed
@@ -93,7 +100,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
93
100
 
94
101
  - 🎉 Initial release! 🎉
95
102
 
96
- [unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.1...HEAD
103
+ [unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.2...HEAD
104
+ [4.0.2]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.1...v4.0.2
97
105
  [4.0.1]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v4.0.0...v4.0.1
98
106
  [4.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v3.0.0...v4.0.0
99
107
  [3.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-haml/compare/v2.0.0...v3.0.0
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- syntax_tree-haml (4.0.1)
4
+ syntax_tree-haml (4.0.2)
5
5
  haml (>= 5.2)
6
- prettier_print (>= 1.0.0)
6
+ prettier_print (>= 1.2.1)
7
7
  syntax_tree (>= 6.0.0)
8
8
 
9
9
  GEM
@@ -15,7 +15,7 @@ GEM
15
15
  thor
16
16
  tilt
17
17
  minitest (5.18.0)
18
- prettier_print (1.2.0)
18
+ prettier_print (1.2.1)
19
19
  rake (13.0.6)
20
20
  simplecov (0.22.0)
21
21
  docile (~> 1.1)
data/lib/syntax_tree/haml/format.rb CHANGED
@@ -504,8 +504,18 @@ module SyntaxTree
504
504
  q.group do
505
505
  q.group { yield }
506
506
  q.indent do
507
+ previous_line = nil
508
+
507
509
  node.children.each do |child|
508
510
  q.breakable_force
511
+
512
+ if previous_line && (child.line - previous_line) > 1
513
+ q.breakable_force
514
+ end
515
+
516
+ previous_line =
517
+ child.children.any? ? child.children.last.line : child.line
518
+
509
519
  visit(child)
510
520
  end
511
521
  end
data/lib/syntax_tree/haml/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module SyntaxTree
4
4
  module Haml
5
- VERSION = "4.0.1"
5
+ VERSION = "4.0.2"
6
6
  end
7
7
  end
data/syntax_tree-haml.gemspec CHANGED
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.require_paths = %w[lib]
26
26
 
27
27
  spec.add_dependency "haml", ">= 5.2"
28
- spec.add_dependency "prettier_print", ">= 1.0.0"
28
+ spec.add_dependency "prettier_print", ">= 1.2.1"
29
29
  spec.add_dependency "syntax_tree", ">= 6.0.0"
30
30
 
31
31
  spec.add_development_dependency "bundler"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: syntax_tree-haml
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.1
4
+ version: 4.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kevin Newton
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-03-07 00:00:00.000000000 Z
11
+ date: 2023-03-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: haml
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 1.0.0
33
+ version: 1.2.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: 1.0.0
40
+ version: 1.2.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: syntax_tree
43
43
  requirement: !ruby/object:Gem::Requirement