-
-
Notifications
You must be signed in to change notification settings - Fork 93
Add ability to choose a different formatter #646
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
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
efc0153
- Add ability to choose a different formatter (internal, none, shfmt)
DannyBen c870e6c
fix specs
DannyBen cefdc59
fix shfmt formatter and add support for custom command
DannyBen 149ce5f
fix settings schema
DannyBen 914e7b6
add formatter specs
DannyBen d2119ec
install shfmt for ci tests
DannyBen 6c0bd9a
rubocop
DannyBen 6d86fff
Merge branch 'master' into add/lint-customization
DannyBen 986c803
change formatter values from symbols to strings
DannyBen c7d699e
Merge branch 'master' into add/lint-customization
DannyBen a7b655c
Update spec/bashly/script/formatter_spec.rb
DannyBen 1eeb78b
fix settings formatter schema definition
DannyBen 96ed811
Merge branch 'master' into add/lint-customization
DannyBen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
require 'open3' | ||
|
||
module Bashly | ||
module Script | ||
class Formatter | ||
MODES = %i[internal none shfmt] | ||
|
||
attr_reader :script, :mode | ||
|
||
def initialize(script, mode: nil) | ||
@script = script | ||
@mode = MODES.include?(mode&.to_sym) ? mode.to_sym : MODES.first | ||
end | ||
|
||
def formatted_script | ||
case mode | ||
when :internal then script.gsub(/\s+\n/m, "\n\n") | ||
when :shfmt then shfmt_result | ||
else script | ||
end | ||
end | ||
|
||
private | ||
|
||
def shfmt_result | ||
unless system 'command -v shfmt > /dev/null 2>&1' | ||
raise DependencyError, | ||
'Cannot find g`shfmt`.\nEither install it or change to the g`internal` formatter.' | ||
end | ||
|
||
output, error, status = | ||
Open3.capture3 %w[shfmt --case-indent --indent 2], stdin_data: script | ||
|
||
raise DependencyError, "Failed running g`shfmt`:\n\n#{error}" unless status.success? | ||
|
||
output | ||
end | ||
end | ||
end | ||
end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,4 +44,4 @@ ISSUE TRACKER | |
AUTHORS | ||
Lana Lang. | ||
|
||
Version 0.1.0 July 2025 download(1) | ||
Version 0.1.0 August 2025 download(1) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.