Mirrors
/
atom-beautify
mirror of https://github.com/Glavin001/atom-beautify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Glavin001/atom-beautify

This commit is contained in:
Yang Zhang 2015-09-26 14:23:04 +08:00
parent 185edce22e 7b3677f0db
commit 56f3c9539f
25 changed files with 83 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -119,4 +119,4 @@ build_script:
# Show current PATH
- echo %PATH%
# Run tests on package
- apm test --one --path %LOCALAPPDATA%/atom/bin/atom.cmd
- apm test --path %LOCALAPPDATA%/atom/bin/atom.cmd

2
build-package.sh
View File

@ -39,6 +39,6 @@ if [ -f ./node_modules/.bin/coffeelint ]; then
fi
echo "Running specs..."
ATOM_PATH=./atom atom/Atom.app/Contents/Resources/app/apm/node_modules/.bin/apm test --one --path atom/Atom.app/Contents/Resources/app/atom.sh
ATOM_PATH=./atom atom/Atom.app/Contents/Resources/app/apm/node_modules/.bin/apm test --path atom/Atom.app/Contents/Resources/app/atom.sh
exit

6
examples/nested-jsbeautifyrc/less/expected/test.less
View File

@ -3,27 +3,21 @@ a {
display: block;
padding: 0 15px;
font-size: 16px;
button {
font-size: 16px;
}
&:link {
color: @white;
text-decoration: none;
}
&:visited {
color: @white;
}
&:hover {
color: @orange;
}
&.green {
color: @green;
&:hover {
color: @white;
background-color: @green;

28
examples/nested-jsbeautifyrc/less/expected/test2.less
View File

@ -1,7 +1,6 @@
// main: style.less
@import (reference)"variables.less";
@import (reference)"mixins.less";
.modal {
position: fixed;
height: 100%;
@ -10,7 +9,6 @@
z-index: 10;
opacity: 0;
display: none;
.innerModal {
margin: auto;
background-color: @white;
@ -20,25 +18,21 @@
-ms-transform: translateY(-100%);
-o-transform: translateY(-100%);
transform: translateY(-100%);
.fa {
float: right;
color: @white;
background-color: firebrick;
padding: 5px 7px;
border-radius: 20px;
&:hover {
background-color: lighten(@black, 50%);
cursor: pointer;
}
&:active {
background-color: lighten(@black, 25%);
}
}
}
&.modal-2text {
.innerModal {
width: @container-width;
@ -47,11 +41,9 @@
padding: 10px 25px;
background-color: gainsboro;
border-radius: 4px;
h2 {
margin: 0 0 7px;
}
div {
height: 70%;
overflow-y: scroll;
@ -59,21 +51,18 @@
padding: 15px;
border-radius: 4px;
}
.large-cta {
margin-top: 25px;
}
}
}
}
#modal-video {
.innerModal {
left: 10%;
margin-top: 30px;
width: 1000px;
background-color: lighten(@black, 25%);
iframe {
width: 600px;
height: 340px;
@ -83,86 +72,69 @@
//container
> div {
text-align: center;
a {
.styleLinks(@white, darken(@white, 10%));
padding: 5px;
text-transform: uppercase;
&:hover {
background-color: fade(@white, 15%);
}
&:active {
background-color: fade(@white, 30%);
}
}
h3 {
color: @white;
font-size: 3em;
margin: 20px auto;
}
button {
margin-bottom: 50px;
}
}
}
}
.slideIn {
.animation(SlideIn, 0.5s);
}
@-webkit-keyframes SlideIn {
0% {
.transform(translateY(-100%));
}
100% {
.transform(translateY(0px));
}
}
.fadeIn {
display: block;
.animation(FadeIn, 0.5s);
}
@-webkit-keyframes FadeIn {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}
.slideOut {
.animation(SlideOut, 0.5s);
}
@-webkit-keyframes SlideOut {
0% {
.transform(translateY(0%));
}
100% {
.transform(translateY(-100%));
}
}
.fadeOut {
.animation(FadeOut, 0.5s);
}
@-webkit-keyframes FadeOut {
0% {
opacity: 1;
}
100% {
opacity: 0;
display: none;

3
examples/nested-jsbeautifyrc/less/expected/test4.less
View File

@ -2,16 +2,13 @@ section#photo-details {
width: 1140px;
margin: 60px auto 70px;
}
div.photo-view {
text-align: center;
figure {
box-shadow: 0 0 3px 1px rgba(0,0,0,0.75);
display: inline-block;
margin: 0 0 60px;
padding: 0;
img {
display: block;
}

2
examples/nested-jsbeautifyrc/less/expected/test5.less
View File

@ -1,10 +1,8 @@
.animal {
color: red;
}
.dog {
&:extend(.animal);
&:hover {
color: green;
}

1
examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss
View File

@ -2,7 +2,6 @@
#{$parent} {
color: $color;
}
a#{$parent}:hover {
color: darken($color, 10%);
}

3
examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss
View File

@ -6,16 +6,13 @@
background-color: $gray-light;
box-shadow: none;
}
.k-slider-selection {
background-color: $brand-primary;
}
.k-button {
border: 1px solid $brand-primary;
background-color: transparent;
color: $brand-primary;
&:hover {
border-color: $brand-primary;
background-color: $brand-primary;

1
examples/nested-jsbeautifyrc/sass/expected/test.sass
View File

@ -1,6 +1,5 @@
a {
line-height: 56px;
&:hover {
color: blue;
}

1
examples/nested-jsbeautifyrc/sass/expected/test.scss
View File

@ -5,7 +5,6 @@
//whatever
}
&::before {
//whatever

28
examples/nested-jsbeautifyrc/xml/expected/test.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0"?>
<!DOCTYPE stylesheet [<!ENTITY nbsp "<xsl:text disable-output-escaping='yes'>&amp;nbsp;</xsl:text>">]>
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" encoding="utf-8" indent="yes" method="html"/>
<xsl:template match="/">
<html>
<head>
<title>Sample xml transformation</title>
</head>
<body>
<xsl:for-each select="/letter">
<div>
<div><xsl:value-of select="./title"/></div>
<div><xsl:value-of select="./salutation"/></div>
<div><xsl:value-of select="./text"/></div>
<div><xsl:value-of select="./greetings"/></div>
<div><xsl:value-of select="./signature"/></div>
<div><xsl:value-of select="./address"/></div>
</div>
</xsl:for-each>
</body>
</html>
</xsl:template>
</xsl:stylesheet>

22
examples/nested-jsbeautifyrc/xml/original/test.xml Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0"?>
<!DOCTYPE stylesheet [<!ENTITY nbsp "<xsl:text disable-output-escaping='yes'>&amp;nbsp;</xsl:text>">]>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
<xsl:output method="html" indent="yes" encoding="utf-8" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
<xsl:template match="/">
<html>
<head>
<title>Sample xml transformation</title>
</head>
<body>
<xsl:for-each select="/letter">
<div><div><xsl:value-of select="./title" /></div>
<div><xsl:value-of select="./salutation" /></div>
<div><xsl:value-of select="./text" /></div>
<div><xsl:value-of select="./greetings" /></div>
<div><xsl:value-of select="./signature" /></div>
<div><xsl:value-of select="./address" /></div></div>
</xsl:for-each>
</body>
</html>
</xsl:template>
</xsl:stylesheet>

9
examples/simple-jsbeautifyrc/jsx/expected/test.jsx
View File

@ -1,7 +1,10 @@
var Mist = React.createClass({
renderList: function() {
return this.props.items.map(function(item) {
return <ListItem item={return <tag>{item}</tag>} key={item.id}/>;
});
return this
.props
.items
.map(function(item) {
return <ListItem item={return <tag>{item}</tag>} key={item.id}/>;
});
}
});

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "atom-beautify",
"main": "./src/beautify",
"version": "0.28.12",
"version": "0.28.14",
"private": true,
"description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, and SQL in Atom",
"repository": {

2
src/beautifiers/autopep8.coffee
View File

@ -21,5 +21,5 @@ module.exports = class Autopep8 extends Beautifier
["--indent-size","#{options.indent_size}"] if options.indent_size?
["--ignore","#{options.ignore.join(',')}"] if options.ignore?
], help: {
link: "https://github.com/hhatto/autopep8"
link: "https://github.com/hhatto/autopep8"
})

2
src/beautifiers/perltidy.coffee
View File

@ -26,5 +26,5 @@ module.exports = class PerlTidy extends Beautifier
"--profile=#{options.perltidy_profile}" if options.perltidy_profile?.length
@tempFile("input", text)
], help: {
link: "http://perltidy.sourceforge.net/"
link: "http://perltidy.sourceforge.net/"
})

16
src/beautifiers/php-cs-fixer.coffee
View File

@ -39,10 +39,10 @@ module.exports = class PHPCSFixer extends Beautifier
"--fixers=#{options.fixers}" if options.fixers
tempFile = @tempFile("temp", text)
], {
ignoreReturnCode: true
help: {
link: "http://php.net/manual/en/install.php"
}
ignoreReturnCode: true
help: {
link: "http://php.net/manual/en/install.php"
}
})
.then(=>
@readFile(tempFile)
@ -66,10 +66,10 @@ module.exports = class PHPCSFixer extends Beautifier
"--fixers=#{options.fixers}" if options.fixers
tempFile = @tempFile("temp", text)
], {
ignoreReturnCode: true
help: {
link: "https://github.com/FriendsOfPHP/PHP-CS-Fixer"
}
ignoreReturnCode: true
help: {
link: "https://github.com/FriendsOfPHP/PHP-CS-Fixer"
}
})
.then(=>
@readFile(tempFile)

4
src/beautifiers/prettydiff.coffee
View File

@ -16,8 +16,8 @@ module.exports = class PrettyDiff extends Beautifier
]
cssinsertlines: "newline_between_rules"
comments: ["indent_comments", (indent_comments) ->
if (indent_comments is true) then \
"indent" else "noindent"
if (indent_comments is false) then \
"noindent" else "indent"
]
force: "force_indentation"
quoteConvert: "convert_quotes"

6
src/beautifiers/puppet-fix.coffee
View File

@ -24,9 +24,9 @@ module.exports = class PuppetFix extends Beautifier
'--fix'
tempFile = @tempFile("input", text)
], {
ignoreReturnCode: true
help: {
link: "http://puppet-lint.com/"
ignoreReturnCode: true
help: {
link: "http://puppet-lint.com/"
}
})
.then(=>

2
src/beautifiers/ruby-beautify.coffee
View File

@ -20,5 +20,5 @@ module.exports = class RubyBeautify extends Beautifier
"--indent_count", options.indent_size
@tempFile("input", text)
], help: {
link: "https://github.com/erniebrodeur/ruby-beautify"
link: "https://github.com/erniebrodeur/ruby-beautify"
})

6
src/beautifiers/rustfmt.coffee
View File

@ -18,9 +18,9 @@ module.exports = class Rustfmt extends Beautifier
@run(program, [
tmpFile = @tempFile("tmp", text)
], help: {
link: "https://github.com/nrc/rustfmt"
program: "rustfmt"
pathOption: "Rust - Rustfmt Path"
link: "https://github.com/nrc/rustfmt"
program: "rustfmt"
pathOption: "Rust - Rustfmt Path"
})
.then(=>
@readFile(tmpFile)

2
src/beautifiers/sqlformat.coffee
View File

@ -20,5 +20,5 @@ module.exports = class Sqlformat extends Beautifier
"--keywords=#{options.keywords}" if options.keywords?
"--identifiers=#{options.identifiers}" if options.identifiers?
], help: {
link: "https://github.com/andialbrecht/sqlparse"
link: "https://github.com/andialbrecht/sqlparse"
})

4
src/beautifiers/uncrustify/cfg.coffee
View File

@ -21,9 +21,7 @@ module.exports = (options, cb) ->
# jshint ignore: start
ic = options.indent_char
if options.indent_with_tabs is 0 or options.indent_with_tabs is 1 or options.indent_with_tabs is 2
# Ignore indent_char option
null # Ignore indent_char option
else if ic is " "
options.indent_with_tabs = 0 # Spaces only
else if ic is "\t"

2
src/beautifiers/uncrustify/index.coffee
View File

@ -79,7 +79,7 @@ module.exports = class Uncrustify extends Beautifier
"-l"
lang
], help: {
link: "http://sourceforge.net/projects/uncrustify/"
link: "http://sourceforge.net/projects/uncrustify/"
})
.then(=>
@readFile(outputFile)

4
src/languages/xml.coffee
View File

@ -9,14 +9,14 @@ module.exports = {
Supported Grammars
###
grammars: [
"XML"
"XML", "XSD", "XSL"
]
###
Supported extensions
###
extensions: [
'xml'
'xml', 'xsd', 'xsl'
]
defaultBeautifier: "Pretty Diff"