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

Add config to xml #1285

Merged
merged 6 commits into from
May 28, 2017
Merged

Add config to xml #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
794ecde
Add '.config' extension to XML language
EliJDonahue Oct 19, 2016
862ec20
Update changelog and contributors
EliJDonahue Oct 19, 2016
b99f249
Added test case for XML file with .config extension
EliJDonahue Oct 19, 2016
e7c76a3
Updated example files
EliJDonahue Oct 19, 2016
4043731
Updated example files
EliJDonahue Oct 19, 2016
ec78815
Fixed tab v. space formatting error
EliJDonahue Oct 19, 2016
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions examples/nested-jsbeautifyrc/xml-config/expected/test.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<handlers accessPolicy="Read, Script"/>
<directoryBrowse enabled="false"/>
<defaultDocument>
<files>
<clear/>
<add value="Default.aspx"/>
<add value="default.asp"/>
<add value="index.html"/>
<add value="index.htm"/>
<add value="default.html"/>
<add value="default.htm"/>
</files>
</defaultDocument>
<httpErrors>
<clear/>
</httpErrors>
</system.webServer>
</configuration>
21 changes: 21 additions & 0 deletions examples/nested-jsbeautifyrc/xml-config/original/test.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<handlers accessPolicy="Read, Script" />
<directoryBrowse enabled="false" />
<defaultDocument>
<files>
<clear />
<add value="Default.aspx" />
<add value="default.asp" />
<add value="index.html" />
<add value="index.htm" />
<add value="default.html" />
<add value="default.htm" />
</files>
</defaultDocument>
<httpErrors>
<clear />
</httpErrors>
</system.webServer>
</configuration>
6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@
{
"name": "Victor Uriarte",
"url": "https://github.com/vmuriart"
},
{
"name": "Eli Donahue",
"url": "https://github.com/elijdonahue"
}
],
"engines": {
Expand Down Expand Up @@ -301,4 +305,4 @@
"lint": "coffeelint src/ spec/",
"code-docs": "codo && open docs/code/index.html"
}
}
}
2 changes: 1 addition & 1 deletion src/languages/xml.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down