From 794ecdeb09a394ef2006e362f9fb2d13373baddb Mon Sep 17 00:00:00 2001 From: Eli Donahue Date: Wed, 19 Oct 2016 09:58:28 -0400 Subject: [PATCH 1/6] Add '.config' extension to XML language --- src/languages/xml.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/xml.coffee b/src/languages/xml.coffee index f90f5fa..34c694a 100644 --- a/src/languages/xml.coffee +++ b/src/languages/xml.coffee @@ -16,7 +16,7 @@ module.exports = { Supported extensions ### extensions: [ - 'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp', 'gsp' + 'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp', 'gsp', 'config' ] defaultBeautifier: "Pretty Diff" From 862ec200fc8a2788ccfff67ef88209a6ae2be364 Mon Sep 17 00:00:00 2001 From: Eli Donahue Date: Wed, 19 Oct 2016 11:00:47 -0400 Subject: [PATCH 2/6] Update changelog and contributors Updating before pull request, per contribution recommentation in project readme. --- CHANGELOG.md | 1 + package.json | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32ecf1d..6cad55a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fix phpcbf hanging issue by closing stdin. See [#893](https://github.com/Glavin001/atom-beautify/issues/893) - Add warning notification when parsing `.jsbeautifyrc` as JSON or YAML fails. See [#1106](https://github.com/Glavin001/atom-beautify/issues/1106) - Add support for PrettyDiff's *bracepadding* option in JavaScript. See [#1157](https://github.com/Glavin001/atom-beautify/issues/1157) +- Add support for files with '.config' extension. Add extension to the XML language to support XML config files. # v0.29.0 - Closes [#447](https://github.com/Glavin001/atom-beautify/issues/447). Improved Handlebars language support diff --git a/package.json b/package.json index 497e15c..71ff0c1 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,10 @@ { "name": "Victor Uriarte", "url": "https://github.com/vmuriart" + }, + { + "name": "Eli Donahue", + "url": "https://github.com/elijdonahue" } ], "engines": { @@ -301,4 +305,4 @@ "lint": "coffeelint src/ spec/", "code-docs": "codo && open docs/code/index.html" } -} \ No newline at end of file +} From b99f249140f58e41ab9a5de78326fc0e26013a49 Mon Sep 17 00:00:00 2001 From: Eli Donahue Date: Wed, 19 Oct 2016 11:17:03 -0400 Subject: [PATCH 3/6] Added test case for XML file with .config extension --- .../xml-config/expected/web.config | 21 +++++++++++++++++++ .../xml-config/original/test.config | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 examples/nested-jsbeautifyrc/xml-config/expected/web.config create mode 100644 examples/nested-jsbeautifyrc/xml-config/original/test.config diff --git a/examples/nested-jsbeautifyrc/xml-config/expected/web.config b/examples/nested-jsbeautifyrc/xml-config/expected/web.config new file mode 100644 index 0000000..2148e26 --- /dev/null +++ b/examples/nested-jsbeautifyrc/xml-config/expected/web.config @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/nested-jsbeautifyrc/xml-config/original/test.config b/examples/nested-jsbeautifyrc/xml-config/original/test.config new file mode 100644 index 0000000..d3f43f0 --- /dev/null +++ b/examples/nested-jsbeautifyrc/xml-config/original/test.config @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + From e7c76a3ef40e90d9ea796621516424c50ca6666b Mon Sep 17 00:00:00 2001 From: Eli Donahue Date: Wed, 19 Oct 2016 13:24:31 -0400 Subject: [PATCH 4/6] Updated example files Fixed the "expected" file name and made the original test file more interesting. --- .../xml-config/expected/test.config | 21 +++++++++++++++++++ .../xml-config/expected/web.config | 21 ------------------- .../xml-config/original/test.config | 14 ++++--------- 3 files changed, 25 insertions(+), 31 deletions(-) create mode 100644 examples/nested-jsbeautifyrc/xml-config/expected/test.config delete mode 100644 examples/nested-jsbeautifyrc/xml-config/expected/web.config diff --git a/examples/nested-jsbeautifyrc/xml-config/expected/test.config b/examples/nested-jsbeautifyrc/xml-config/expected/test.config new file mode 100644 index 0000000..e0f25ec --- /dev/null +++ b/examples/nested-jsbeautifyrc/xml-config/expected/test.config @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/nested-jsbeautifyrc/xml-config/expected/web.config b/examples/nested-jsbeautifyrc/xml-config/expected/web.config deleted file mode 100644 index 2148e26..0000000 --- a/examples/nested-jsbeautifyrc/xml-config/expected/web.config +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/nested-jsbeautifyrc/xml-config/original/test.config b/examples/nested-jsbeautifyrc/xml-config/original/test.config index d3f43f0..cbbc62b 100644 --- a/examples/nested-jsbeautifyrc/xml-config/original/test.config +++ b/examples/nested-jsbeautifyrc/xml-config/original/test.config @@ -4,18 +4,12 @@ - - - - - - - - - + + + - + From 404373182c7e4c5f7f3cc7fba17e2d3430acc8bf Mon Sep 17 00:00:00 2001 From: Eli Donahue Date: Wed, 19 Oct 2016 13:47:43 -0400 Subject: [PATCH 5/6] Updated example files Updated example files Fixed the "expected" file name and made the original test file more interesting. --- .../xml-config/original/test.config | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/examples/nested-jsbeautifyrc/xml-config/original/test.config b/examples/nested-jsbeautifyrc/xml-config/original/test.config index cbbc62b..edd6ef6 100644 --- a/examples/nested-jsbeautifyrc/xml-config/original/test.config +++ b/examples/nested-jsbeautifyrc/xml-config/original/test.config @@ -4,9 +4,15 @@ - - - + + + + + + + + + From ec788158873a86bf1319bebc9c2be31013602c9c Mon Sep 17 00:00:00 2001 From: Eli Donahue Date: Wed, 19 Oct 2016 14:04:36 -0400 Subject: [PATCH 6/6] Fixed tab v. space formatting error --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71ff0c1..72a7ba1 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "name": "Victor Uriarte", "url": "https://github.com/vmuriart" }, - { + { "name": "Eli Donahue", "url": "https://github.com/elijdonahue" }