diff --git a/docs/option-template.md b/docs/option-template.md index d91800d..7352416 100644 --- a/docs/option-template.md +++ b/docs/option-template.md @@ -24,7 +24,7 @@ **Description**: -{{description}} +{{{description}}} {{#if beautifiers}} **Example `.jsbeautifyrc` Configuration** diff --git a/docs/options.md b/docs/options.md index c71ca1d..4f6b169 100644 --- a/docs/options.md +++ b/docs/options.md @@ -92,7 +92,7 @@ When beautifying on save, use the entire file, even if there is selected text in **Description**: -Do not show "Unsupported Language" errors when they occur +Do not show "Unsupported Language" errors when they occur **How to Configure** @@ -559,7 +559,7 @@ Indentation character (Supported by Gherkin formatter) **Description**: -Path to the `emacs` executable (Supported by Fortran Beautifier) +Path to the `emacs` executable (Supported by Fortran Beautifier) **Example `.jsbeautifyrc` Configuration** @@ -607,7 +607,7 @@ Path to the emacs script (Supported by Fortran Beautifier) **Description**: -Indent <head> and <body> sections. (Supported by JS Beautify) +Indent and sections. (Supported by JS Beautify) **Example `.jsbeautifyrc` Configuration** @@ -1028,7 +1028,7 @@ Initial indentation level (Supported by JS Beautify) **Description**: -Indentation uses tabs, overrides `Indent Size` and `Indent Char` (Supported by JS Beautify) +Indentation uses tabs, overrides `Indent Size` and `Indent Char` (Supported by JS Beautify) **Example `.jsbeautifyrc` Configuration** @@ -1152,7 +1152,7 @@ Enable jslint-stricter mode (Supported by JS Beautify) **Description**: -Add a space before an anonymous function's parens, ie. function () (Supported by JS Beautify, Pretty Diff) +Add a space before an anonymous function's parens, ie. function () (Supported by JS Beautify, Pretty Diff) **Example `.jsbeautifyrc` Configuration** @@ -1470,7 +1470,7 @@ Specify a configuration file which will override the default name of .perltidyrc **Description**: -Path to the `php-cs-fixer` CLI executable (Supported by PHP-CS-Fixer) +Path to the `php-cs-fixer` CLI executable (Supported by PHP-CS-Fixer) **Example `.jsbeautifyrc` Configuration** @@ -4547,7 +4547,7 @@ Maximum amount of characters per line (0 = disable) (Supported by JS Beautify, P **Description**: -Indent <head> and <body> sections. (Supported by JS Beautify) +Indent and sections. (Supported by JS Beautify) **Example `.jsbeautifyrc` Configuration** @@ -4944,7 +4944,7 @@ Initial indentation level (Supported by JS Beautify) **Description**: -Indentation uses tabs, overrides `Indent Size` and `Indent Char` (Supported by JS Beautify) +Indentation uses tabs, overrides `Indent Size` and `Indent Char` (Supported by JS Beautify) **Example `.jsbeautifyrc` Configuration** @@ -5068,7 +5068,7 @@ Enable jslint-stricter mode (Supported by JS Beautify) **Description**: -Add a space before an anonymous function's parens, ie. function () (Supported by JS Beautify, Pretty Diff) +Add a space before an anonymous function's parens, ie. function () (Supported by JS Beautify, Pretty Diff) **Example `.jsbeautifyrc` Configuration** @@ -5725,7 +5725,7 @@ Preserve line-breaks (Supported by JS Beautify, Pretty Diff) **Description**: -Add a space before an anonymous function's parens, ie. function () (Supported by JS Beautify, Pretty Diff) +Add a space before an anonymous function's parens, ie. function () (Supported by JS Beautify, Pretty Diff) **Example `.jsbeautifyrc` Configuration** @@ -5831,7 +5831,7 @@ Indentation character (Supported by Gherkin formatter) **Description**: -Path to the `emacs` executable (Supported by Fortran Beautifier) +Path to the `emacs` executable (Supported by Fortran Beautifier) **Example `.jsbeautifyrc` Configuration** @@ -5909,7 +5909,7 @@ Specify a configuration file which will override the default name of .perltidyrc **Description**: -Path to the `php-cs-fixer` CLI executable (Supported by PHP-CS-Fixer) +Path to the `php-cs-fixer` CLI executable (Supported by PHP-CS-Fixer) **Example `.jsbeautifyrc` Configuration** diff --git a/examples/nested-jsbeautifyrc/less/expected/test.less b/examples/nested-jsbeautifyrc/less/expected/test.less index 95e0aca..e951265 100644 --- a/examples/nested-jsbeautifyrc/less/expected/test.less +++ b/examples/nested-jsbeautifyrc/less/expected/test.less @@ -3,19 +3,24 @@ 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; diff --git a/examples/nested-jsbeautifyrc/less/expected/test4.less b/examples/nested-jsbeautifyrc/less/expected/test4.less index db9b2c2..d9083c5 100644 --- a/examples/nested-jsbeautifyrc/less/expected/test4.less +++ b/examples/nested-jsbeautifyrc/less/expected/test4.less @@ -5,11 +5,13 @@ section#photo-details { 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; } diff --git a/examples/nested-jsbeautifyrc/less/expected/test5.less b/examples/nested-jsbeautifyrc/less/expected/test5.less index 14bbf87..a556e49 100644 --- a/examples/nested-jsbeautifyrc/less/expected/test5.less +++ b/examples/nested-jsbeautifyrc/less/expected/test5.less @@ -1,8 +1,10 @@ .animal { color: red; } + .dog { &:extend(.animal); + &:hover { color: green; } diff --git a/examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss b/examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss index bd5209d..17c1ea2 100644 --- a/examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss +++ b/examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss @@ -2,6 +2,7 @@ #{$parent} { color: $color; } + a#{$parent}:hover { color: darken($color, 10%); } diff --git a/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss b/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss index 8ce6390..3860ed2 100644 --- a/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss +++ b/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss @@ -6,13 +6,16 @@ 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; diff --git a/examples/nested-jsbeautifyrc/sass/expected/test.sass b/examples/nested-jsbeautifyrc/sass/expected/test.sass index 2e46de6..62d2baf 100644 --- a/examples/nested-jsbeautifyrc/sass/expected/test.sass +++ b/examples/nested-jsbeautifyrc/sass/expected/test.sass @@ -1,5 +1,6 @@ a { line-height: 56px; + &:hover { color: blue; } diff --git a/examples/nested-jsbeautifyrc/sass/expected/test.scss b/examples/nested-jsbeautifyrc/sass/expected/test.scss index 8435874..4502c56 100644 --- a/examples/nested-jsbeautifyrc/sass/expected/test.scss +++ b/examples/nested-jsbeautifyrc/sass/expected/test.scss @@ -5,6 +5,7 @@ //whatever } + &::before { //whatever diff --git a/package.json b/package.json index 177433b..7d14981 100644 --- a/package.json +++ b/package.json @@ -63,19 +63,19 @@ "bluebird": "^2.9.30", "coffee-fmt": "0.11.0", "coffee-formatter": "^0.1.2", - "cross-spawn": "^0.4.1", + "cross-spawn": "^2.0.0", "csscomb": "^3.1.7", - "diff": "^1.4.0", + "diff": "^2.1.0", "editorconfig": "^0.12.2", "emissary": "^1.3.3", "event-kit": "^1.2.0", "expand-home-dir": "0.0.2", - "extend": "^2.0.1", + "extend": "^3.0.0", "gherkin": "2.12.2", - "handlebars": "^3.0.3", + "handlebars": "^4.0.2", "js-beautify": "^1.5.7", - "jscs": "^1.13.1", - "lodash": "3.9.3", + "jscs": "^2.1.1", + "lodash": "3.10.1", "loophole": "^1.0.0", "node-dir": "^0.1.8", "node-uuid": "^1.4.3", @@ -153,7 +153,7 @@ "devDependencies": { "coffee-script": "^1.9.3", "coffeelint": "^1.10.1", - "handlebars": "^3.0.3" + "handlebars": "^4.0.2" }, "scripts": { "prepublish": "npm run docs",