Skip to content
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.

Sign up for GitHub

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

Fix "Reindent" option for sqlformat. #2064

Merged
merged 3 commits into from
Mar 9, 2018
Merged

Fix "Reindent" option for sqlformat. #2064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f37cb40
Fix "Reindent" option for sqlformat.
pengjunjie1207 Mar 3, 2018
0360f81
Merge branch 'master' into master
pengjunjie1207 Mar 5, 2018
e9f6207
Update sqlformat.coffee
pengjunjie1207 Mar 5, 2018
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Next
- ...
- Fix "Reindent" option for sqlformat.

# v0.32.0 (2018-03-02)
- See [#2026](https://github.com/Glavin001/atom-beautify/issues/2026) Add Vue support to ESLint Fixer beautifier. Should be used with [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue).
Expand Down
2 changes: 1 addition & 1 deletion src/beautifiers/sqlformat.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = class Sqlformat extends Beautifier
beautify: (text, language, options) ->
@run("sqlformat", [
@tempFile("input", text)
"--reindent=#{options.reindent}" if options.reindent?
"--reindent" if (options.reindent? && options.reindent == true)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be:

"--reindent" if options.reindent is true

Which is the following in JavaScript:

if (options.reindent === true) {
  "--reindent";
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the situation that options.reindent is null or undefined? Or it is impossible to meet that situation.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could happen and then it would not add --reindent option at all. Is this the desired behaviour?

"--indent_width=#{options.indent_size}" if options.indent_size?
"--keywords=#{options.keywords}" if (options.keywords? && options.keywords != 'unchanged')
"--identifiers=#{options.identifiers}" if (options.identifiers? && options.identifiers != 'unchanged')
Expand Down