rufo 0.16.1 → 0.16.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a6b55f94b8276a2ca0dc8518aa98949e83f83a95adc25a039385cb6855bcbb1c
4
- data.tar.gz: 03b7595cccdade48c215c3609726bd8a40a5ac72c66e6f64246e842a63f7729e
3
+ metadata.gz: d9809eb345a055711f4ad309391cb96106eb90aff1cf09bcce15b537bad34e30
4
+ data.tar.gz: d77f6a70aeeb5fb6143f1dec1f29d8d645fa834f7a2fd467200c7d02b99a165b
5
5
  SHA512:
6
- metadata.gz: 6c15b016ff6914844a2da86cf3af9ae257abdd9c421dfc4186d2eea39cfba919a2ac3ec489a1f539c59abd49452a5af511e2bca538adb7c62b346859bab3912b
7
- data.tar.gz: aadada98b7acf84c40c147210655c54681d49b2d2079c76f6d44c19775676556cbf6545bc0754b4c037ba94478b31259f1236a464f60b15704f1e6ecbb98def7
6
+ metadata.gz: 5f43322e74c6cbdd90ca355caa0e4d17a9c625e4ea487a40807ecad7a75915531954ac287818c56a1e72566d1f25a6add653fe186d717406f9f3d4c11b8474bf
7
+ data.tar.gz: c9cd5e085bfe77882b5b1215e5de7d3939ba4de9bae634d750e74bac5000511fdcbc376f6f53e2cdd1ad4703dc1b6d344da96007a2147d579c52ee7113e21510
data/CHANGELOG.md CHANGED
@@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
12
12
 
13
13
  ### Added
14
14
 
15
+ ## [0.16.2] - 2023-07-29
16
+
17
+ ### Fixed
18
+ - Fix Bug: Unexpected EOF with blocks in .html.erb ([#297](https://github.com/ruby-formatter/rufo/issues/297))
19
+
20
+ ### Changed
21
+
22
+ ### Added
23
+
15
24
  ## [0.16.1] - 2023-05-04
16
25
 
17
26
  ### Fixed
@@ -125,9 +125,16 @@ class Rufo::ErbFormatter
125
125
  string
126
126
  end
127
127
 
128
+ CODE_BLOCK_KEYWORDS = %w[BEGIN END begin case class def do else elsif end ensure for if module rescue unless until while]
129
+
130
+ def code_block_token?(token)
131
+ _, kind, value = token
132
+ kind == :on_kw && CODE_BLOCK_KEYWORDS.include?(value)
133
+ end
134
+
128
135
  def determine_code_wrappers(code_str)
129
- keywords = Ripper.lex("#{code_str}").filter { |lex_token| lex_token[1] == :on_kw }
130
- lexical_tokens = keywords.filter { |lex_token| lex_token[2] != "when" }.map { |lex_token| lex_token[3].to_s }
136
+ keywords = Ripper.lex("#{code_str}").filter { |lex_token| code_block_token?(lex_token) }
137
+ lexical_tokens = keywords.map { |lex_token| lex_token[3].to_s }
131
138
  state_tally = lexical_tokens.group_by(&:itself).transform_values(&:count)
132
139
  beg_token = state_tally["BEG"] || state_tally["EXPR_BEG"] || 0
133
140
  end_token = state_tally["END"] || state_tally["EXPR_END"] || 0
data/lib/rufo/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Rufo
4
- VERSION = "0.16.1"
4
+ VERSION = "0.16.2"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rufo
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.1
4
+ version: 0.16.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ary Borenszweig
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-05-04 00:00:00.000000000 Z
11
+ date: 2023-07-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
210
210
  - !ruby/object:Gem::Version
211
211
  version: '0'
212
212
  requirements: []
213
- rubygems_version: 3.4.10
213
+ rubygems_version: 3.5.0.dev
214
214
  signing_key:
215
215
  specification_version: 4
216
216
  summary: Ruby code formatter