Merge branch 'add-config-to-xml' of https://github.com/EliJDonahue/atom-beautify into EliJDonahue-add-config-to-xml

This commit is contained in:
Glavin Wiechert 2017-05-28 02:28:35 -03:00
commit d9b97b3d88
7 changed files with 51 additions and 3 deletions

View File

@ -1,5 +1,6 @@
# Next
- Fix [#1524](https://github.com/Glavin001/atom-beautify/issues/1524). Add PHP-CS-Fixer config file setting and improve automatic detection of standard config files. See [#1661](https://github.com/Glavin001/atom-beautify/pull/1661)
- Add support for files with '.config' extension. Add extension to the XML language to support XML config files.
- ...
# v0.29.25 (2017-05-12)

View File

@ -183,7 +183,7 @@ See [all supported options in the documentation at `docs/options.md`](docs/opti
| Vala | `Vala` |`.vala`, `.vapi` | [`Uncrustify`](https://github.com/uncrustify/uncrustify) (Default) |
| Visualforce | `Visualforce` |`.page` | [`Pretty Diff`](https://github.com/prettydiff/prettydiff) (Default) |
| Vue | `Vue Component` |`.vue` | [`Vue Beautifier`](https://github.com/Glavin001/atom-beautify/blob/master/src/beautifiers/vue-beautifier.coffee) (Default) |
| XML | `SLD`, `XML`, `XHTML`, `XSD`, `XSL`, `JSP`, `GSP` |`.sld`, `.xml`, `.xhtml`, `.xsd`, `.xsl`, `.jsp`, `.gsp`, `.plist`, `.recipe` | [`JS Beautify`](https://github.com/beautify-web/js-beautify), [`Pretty Diff`](https://github.com/prettydiff/prettydiff) (Default) |
| XML | `SLD`, `XML`, `XHTML`, `XSD`, `XSL`, `JSP`, `GSP` |`.sld`, `.xml`, `.xhtml`, `.xsd`, `.xsl`, `.jsp`, `.gsp`, `.plist`, `.recipe`, `.config` | [`JS Beautify`](https://github.com/beautify-web/js-beautify), [`Pretty Diff`](https://github.com/prettydiff/prettydiff) (Default) |
| XTemplate | `XTemplate` |`.xtemplate` | [`Pretty Diff`](https://github.com/prettydiff/prettydiff) (Default) |
| YAML | `YAML` |`.yml`, `.yaml` | [`align-yaml`](https://github.com/jonschlinkert/align-yaml) (Default) |

View File

@ -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>

View File

@ -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>

View File

@ -138,6 +138,10 @@
{
"name": "James Power",
"url": "https://github.com/thejamespower"
},
{
"name": "Eli Donahue",
"url": "https://github.com/elijdonahue"
}
],
"engines": {

View File

@ -16,7 +16,7 @@ module.exports = {
Supported extensions
###
extensions: [
'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp', 'gsp', 'plist', 'recipe'
'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp', 'gsp', 'plist', 'recipe', 'config'
]
defaultBeautifier: "Pretty Diff"

View File

@ -8631,7 +8631,8 @@
"jsp",
"gsp",
"plist",
"recipe"
"recipe",
"config"
],
"properties": {
"indent_inner_html": {