Skip to content

Add support for Ruby 2.7.0 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ jobs:
fail-fast: false
matrix:
ruby:
- '2.7'
- '2.7.0'
- '2.7.5'
- '3.0'
- '3.1'
name: CI
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a

## [Unreleased]

### Added

- Support for Ruby 2.7.0, not just 2.7.3

## [1.3.2] - 2022-09-19

### Added
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH
remote: .
specs:
syntax_tree-haml (1.3.2)
haml (>= 5.2)
syntax_tree-haml (1.3.3)
haml (>= 5.2, != 6.0.0)
prettier_print
syntax_tree (>= 2.0.1)

Expand Down
4 changes: 2 additions & 2 deletions lib/syntax_tree/haml/format.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Format < Visitor
class Formatter < ::SyntaxTree::Formatter
attr_reader :literal_lines, :quote

def initialize(source, ...)
def initialize(source, *rest)
@literal_lines = {}
source
.lines
Expand All @@ -15,7 +15,7 @@ def initialize(source, ...)
@literal_lines[index] = line.rstrip if line.start_with?("!")
end

super(source, ...)
super(source, *rest)
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/syntax_tree/haml/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module SyntaxTree
module Haml
VERSION = "1.3.2"
VERSION = "1.3.3"
end
end
3 changes: 2 additions & 1 deletion syntax_tree-haml.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ 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"
# 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"
spec.add_dependency "syntax_tree", ">= 2.0.1"

Expand Down