From 223880d4a44be85c26f03d7f137c1d128b2cdb60 Mon Sep 17 00:00:00 2001 From: Lawstorant Date: Fri, 24 Nov 2017 21:25:59 +0100 Subject: [PATCH] Added the option to indent Bash scripts with tabs --- CHANGELOG.md | 2 +- src/beautifiers/beautysh.coffee | 10 ++++++++-- src/languages/bash.coffee | 4 ++++ src/options.json | 14 ++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a674ec3..f2846e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Next -- ... +- Add the option to indent Bash with tabs [#1951](https://github.com/Glavin001/atom-beautify/issues/1951) # v0.30.9 (2017-11-22) - Fix [#1949](https://github.com/Glavin001/atom-beautify/issues/1949): Fix beautify on save when text has not changed. diff --git a/src/beautifiers/beautysh.coffee b/src/beautifiers/beautysh.coffee index 74e3c11..9257d94 100644 --- a/src/beautifiers/beautysh.coffee +++ b/src/beautifiers/beautysh.coffee @@ -24,10 +24,16 @@ module.exports = class BashBeautify extends Beautifier options: { Bash: indent_size: true + use_tabs: true } beautify: (text, language, options) -> beautysh = @exe("beautysh") file = @tempFile("input", text) - beautysh.run([ '-i', options.indent_size, '-f', file ]) - .then(=> @readFile file) + tabs = options.use_tabs + if tabs is true + beautysh.run([ '-t', '-f', file ]) + .then(=> @readFile file) + else + beautysh.run([ '-i', options.indent_size, '-f', file ]) + .then(=> @readFile file) diff --git a/src/languages/bash.coffee b/src/languages/bash.coffee index 4afa499..c36e60c 100644 --- a/src/languages/bash.coffee +++ b/src/languages/bash.coffee @@ -27,5 +27,9 @@ module.exports = { default: null minimum: 0 description: "Indentation size/length" + use_tabs: + type: 'boolean' + default: null + description: "Use tabs for indentation" } diff --git a/src/options.json b/src/options.json index 0eca25e..df53413 100644 --- a/src/options.json +++ b/src/options.json @@ -145,6 +145,20 @@ "name": "Bash", "namespace": "bash" } + }, + "use_tabs": { + "type": "boolean", + "default": null, + "description": "Use tabs instead of spaces for indentation, overrides `Indent Size` (Supported by beautysh)", + "title": "Indent with tabs", + "beautifiers": [ + "beautysh" + ], + "key": "use_tabs", + "language": { + "name": "Bash", + "namespace": "bash" + } }, "disabled": { "title": "Disable Beautifying Language",