From 1fc3dbb99a7ece47e95c7bdaed1d954063cba2e7 Mon Sep 17 00:00:00 2001 From: Glavin Wiechert Date: Mon, 2 Jan 2017 02:46:52 -0400 Subject: [PATCH] See #1327. Add JavaScript to Vue language fallback options --- docs/options.md | 854 +++++++++++++++--- examples/nested-jsbeautifyrc/.jsbeautifyrc | 4 + .../expected/space_after_anon_function.js | 5 + .../original/_space_after_anon_function.js | 7 + .../expected/space_after_anon_function.vue | 9 + .../original/space_after_anon_function.vue | 9 + package.json | 2 +- script/build-options.js | 7 +- src/languages/vue.coffee | 2 +- 9 files changed, 764 insertions(+), 135 deletions(-) create mode 100644 examples/nested-jsbeautifyrc/javascript/expected/space_after_anon_function.js create mode 100644 examples/nested-jsbeautifyrc/javascript/original/_space_after_anon_function.js create mode 100644 examples/nested-jsbeautifyrc/vue/expected/space_after_anon_function.vue create mode 100644 examples/nested-jsbeautifyrc/vue/original/space_after_anon_function.vue diff --git a/docs/options.md b/docs/options.md index 561ec45..6bb63b3 100644 --- a/docs/options.md +++ b/docs/options.md @@ -2272,7 +2272,7 @@ Automatically beautify EJS files on save **Type**: `string` -**Enum**: `collapse` `expand` `end-expand` `none` `none` +**Enum**: `collapse` `collapse-preserve-inline` `expand` `end-expand` `none` **Supported Beautifiers**: [`JS Beautify`](#js-beautify) @@ -8344,7 +8344,7 @@ Preserve line-breaks (Supported by JS Beautify) **Key**: `unformatted` -**Default**: `a,abbr,area,audio,b,bdi,bdo,br,button,canvas,cite,code,data,datalist,del,dfn,em,embed,i,iframe,img,input,ins,kbd,keygen,label,map,mark,math,meter,noscript,object,output,progress,q,ruby,s,samp,select,small,span,strong,sub,sup,svg,template,textarea,time,u,var,video,wbr,text,acronym,address,big,dt,ins,small,strike,tt,pre,h1,h2,h3,h4,h5,h6` +**Default**: `a,abbr,area,audio,b,bdi,bdo,br,button,canvas,cite,code,data,datalist,del,dfn,em,embed,i,iframe,img,input,ins,kbd,keygen,label,map,mark,math,meter,noscript,object,output,progress,q,ruby,s,samp,select,small,span,strong,sub,sup,svg,template,textarea,time,u,var,video,wbr,text,acronym,address,big,dt,strike,tt,pre,h1,h2,h3,h4,h5,h6` **Type**: `array` @@ -8417,8 +8417,6 @@ List of tags (defaults to inline) that should not be reformatted (Supported by J "address", "big", "dt", - "ins", - "small", "strike", "tt", "pre", @@ -12786,14 +12784,26 @@ Maximum characters per line (0 disables) (Supported by Pretty Diff) | `default_beautifier` | :white_check_mark: | | `beautify_on_save` | :white_check_mark: | | `brace_style` | :white_check_mark: | +| `break_chained_methods` | :white_check_mark: | +| `end_with_comma` | :white_check_mark: | | `end_with_newline` | :white_check_mark: | +| `eval_code` | :white_check_mark: | | `extra_liners` | :white_check_mark: | | `indent_char` | :white_check_mark: | | `indent_inner_html` | :white_check_mark: | +| `indent_level` | :white_check_mark: | | `indent_scripts` | :white_check_mark: | | `indent_size` | :white_check_mark: | +| `indent_with_tabs` | :white_check_mark: | +| `jslint_happy` | :white_check_mark: | +| `keep_array_indentation` | :white_check_mark: | +| `keep_function_indentation` | :white_check_mark: | | `max_preserve_newlines` | :white_check_mark: | | `preserve_newlines` | :white_check_mark: | +| `space_after_anon_function` | :white_check_mark: | +| `space_before_conditional` | :white_check_mark: | +| `space_in_paren` | :white_check_mark: | +| `unescape_strings` | :white_check_mark: | | `unformatted` | :white_check_mark: | | `wrap_attributes` | :white_check_mark: | | `wrap_attributes_indent_size` | :white_check_mark: | @@ -12868,7 +12878,7 @@ Automatically beautify Vue files on save **Type**: `string` -**Enum**: `collapse` `expand` `end-expand` `none` +**Enum**: `collapse` `collapse-preserve-inline` `expand` `end-expand` `none` **Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) @@ -12886,6 +12896,54 @@ Automatically beautify Vue files on save } ``` +##### [Break chained methods](#break-chained-methods) + +**Namespace**: `js` + +**Key**: `break_chained_methods` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Break chained method calls across subsequent lines (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "break_chained_methods": false + } +} +``` + +##### [End with comma](#end-with-comma) + +**Namespace**: `js` + +**Key**: `end_with_comma` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +If a terminating comma should be inserted into arrays, object literals, and destructured objects. (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "end_with_comma": false + } +} +``` + ##### [End with newline](#end-with-newline) **Namespace**: `html` @@ -12910,6 +12968,30 @@ End output with newline (Supported by Vue Beautifier) } ``` +##### [Eval code](#eval-code) + +**Namespace**: `js` + +**Key**: `eval_code` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + + (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "eval_code": false + } +} +``` + ##### [Extra liners](#extra-liners) **Namespace**: `html` @@ -12990,6 +13072,30 @@ Indent and sections. (Supported by Vue Beautifier) } ``` +##### [Indent level](#indent-level) + +**Namespace**: `js` + +**Key**: `indent_level` + +**Type**: `integer` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Initial indentation level (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "indent_level": 0 + } +} +``` + ##### [Indent scripts](#indent-scripts) **Namespace**: `html` @@ -13044,6 +13150,102 @@ Indentation size/length (Supported by Vue Beautifier) } ``` +##### [Indent with tabs](#indent-with-tabs) + +**Namespace**: `js` + +**Key**: `indent_with_tabs` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Indentation uses tabs, overrides `Indent Size` and `Indent Char` (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "indent_with_tabs": false + } +} +``` + +##### [Jslint happy](#jslint-happy) + +**Namespace**: `js` + +**Key**: `jslint_happy` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Enable jslint-stricter mode (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "jslint_happy": false + } +} +``` + +##### [Keep array indentation](#keep-array-indentation) + +**Namespace**: `js` + +**Key**: `keep_array_indentation` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Preserve array indentation (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "keep_array_indentation": false + } +} +``` + +##### [Keep function indentation](#keep-function-indentation) + +**Namespace**: `js` + +**Key**: `keep_function_indentation` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + + (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "keep_function_indentation": false + } +} +``` + ##### [Max preserve newlines](#max-preserve-newlines) **Namespace**: `html` @@ -13096,6 +13298,104 @@ Preserve line-breaks (Supported by Vue Beautifier) } ``` +##### [Space after anon function](#space-after-anon-function) + +**Namespace**: `js` + +**Key**: `space_after_anon_function` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Add a space before an anonymous function's parens, ie. function () (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "space_after_anon_function": false + } +} +``` + +##### [Space before conditional](#space-before-conditional) + +**Namespace**: `js` + +**Key**: `space_before_conditional` + +**Default**: `true` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + + (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "space_before_conditional": true + } +} +``` + +##### [Space in paren](#space-in-paren) + +**Namespace**: `js` + +**Key**: `space_in_paren` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Add padding spaces within paren, ie. f( a, b ) (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "space_in_paren": false + } +} +``` + +##### [Unescape strings](#unescape-strings) + +**Namespace**: `js` + +**Key**: `unescape_strings` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Decode printable characters encoded in xNN notation (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "unescape_strings": false + } +} +``` + ##### [Unformatted](#unformatted) **Namespace**: `html` @@ -17299,30 +17599,6 @@ Path to uncrustify config file. i.e. uncrustify.cfg (Supported by Uncrustify) ### Vue Beautifier -##### [Indent inner html](#indent-inner-html) - -**Namespace**: `html` - -**Key**: `indent_inner_html` - -**Type**: `boolean` - -**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) - -**Description**: - -Indent and sections. (Supported by Vue Beautifier) - -**Example `.jsbeautifyrc` Configuration** - -```json -{ - "html": { - "indent_inner_html": false - } -} -``` - ##### [Indent size](#indent-size) **Namespace**: `html` @@ -17375,6 +17651,178 @@ Indentation character (Supported by Vue Beautifier) } ``` +##### [Indent level](#indent-level) + +**Namespace**: `js` + +**Key**: `indent_level` + +**Type**: `integer` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Initial indentation level (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "indent_level": 0 + } +} +``` + +##### [Indent with tabs](#indent-with-tabs) + +**Namespace**: `js` + +**Key**: `indent_with_tabs` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Indentation uses tabs, overrides `Indent Size` and `Indent Char` (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "indent_with_tabs": false + } +} +``` + +##### [Preserve newlines](#preserve-newlines) + +**Namespace**: `html` + +**Key**: `preserve_newlines` + +**Default**: `true` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Preserve line-breaks (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "html": { + "preserve_newlines": true + } +} +``` + +##### [Max preserve newlines](#max-preserve-newlines) + +**Namespace**: `html` + +**Key**: `max_preserve_newlines` + +**Default**: `10` + +**Type**: `integer` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Number of line-breaks to be preserved in one chunk (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "html": { + "max_preserve_newlines": 10 + } +} +``` + +##### [Space in paren](#space-in-paren) + +**Namespace**: `js` + +**Key**: `space_in_paren` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Add padding spaces within paren, ie. f( a, b ) (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "space_in_paren": false + } +} +``` + +##### [Jslint happy](#jslint-happy) + +**Namespace**: `js` + +**Key**: `jslint_happy` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Enable jslint-stricter mode (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "jslint_happy": false + } +} +``` + +##### [Space after anon function](#space-after-anon-function) + +**Namespace**: `js` + +**Key**: `space_after_anon_function` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Add a space before an anonymous function's parens, ie. function () (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "space_after_anon_function": false + } +} +``` + ##### [Brace style](#brace-style) **Namespace**: `html` @@ -17385,7 +17833,7 @@ Indentation character (Supported by Vue Beautifier) **Type**: `string` -**Enum**: `collapse` `expand` `end-expand` `none` +**Enum**: `collapse` `collapse-preserve-inline` `expand` `end-expand` `none` **Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) @@ -17403,6 +17851,250 @@ Indentation character (Supported by Vue Beautifier) } ``` +##### [Break chained methods](#break-chained-methods) + +**Namespace**: `js` + +**Key**: `break_chained_methods` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Break chained method calls across subsequent lines (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "break_chained_methods": false + } +} +``` + +##### [Keep array indentation](#keep-array-indentation) + +**Namespace**: `js` + +**Key**: `keep_array_indentation` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Preserve array indentation (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "keep_array_indentation": false + } +} +``` + +##### [Keep function indentation](#keep-function-indentation) + +**Namespace**: `js` + +**Key**: `keep_function_indentation` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + + (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "keep_function_indentation": false + } +} +``` + +##### [Space before conditional](#space-before-conditional) + +**Namespace**: `js` + +**Key**: `space_before_conditional` + +**Default**: `true` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + + (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "space_before_conditional": true + } +} +``` + +##### [Eval code](#eval-code) + +**Namespace**: `js` + +**Key**: `eval_code` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + + (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "eval_code": false + } +} +``` + +##### [Unescape strings](#unescape-strings) + +**Namespace**: `js` + +**Key**: `unescape_strings` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Decode printable characters encoded in xNN notation (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "unescape_strings": false + } +} +``` + +##### [Wrap line length](#wrap-line-length) + +**Namespace**: `html` + +**Key**: `wrap_line_length` + +**Default**: `250` + +**Type**: `integer` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Maximum characters per line (0 disables) (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "html": { + "wrap_line_length": 250 + } +} +``` + +##### [End with newline](#end-with-newline) + +**Namespace**: `html` + +**Key**: `end_with_newline` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +End output with newline (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "html": { + "end_with_newline": false + } +} +``` + +##### [End with comma](#end-with-comma) + +**Namespace**: `js` + +**Key**: `end_with_comma` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +If a terminating comma should be inserted into arrays, object literals, and destructured objects. (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "js": { + "end_with_comma": false + } +} +``` + +##### [Indent inner html](#indent-inner-html) + +**Namespace**: `html` + +**Key**: `indent_inner_html` + +**Type**: `boolean` + +**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) + +**Description**: + +Indent and sections. (Supported by Vue Beautifier) + +**Example `.jsbeautifyrc` Configuration** + +```json +{ + "html": { + "indent_inner_html": false + } +} +``` + ##### [Indent scripts](#indent-scripts) **Namespace**: `html` @@ -17431,32 +18123,6 @@ Indentation character (Supported by Vue Beautifier) } ``` -##### [Wrap line length](#wrap-line-length) - -**Namespace**: `html` - -**Key**: `wrap_line_length` - -**Default**: `250` - -**Type**: `integer` - -**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) - -**Description**: - -Maximum characters per line (0 disables) (Supported by Vue Beautifier) - -**Example `.jsbeautifyrc` Configuration** - -```json -{ - "html": { - "wrap_line_length": 250 - } -} -``` - ##### [Wrap attributes](#wrap-attributes) **Namespace**: `html` @@ -17511,58 +18177,6 @@ Indent wrapped attributes to after N characters (Supported by Vue Beautifier) } ``` -##### [Preserve newlines](#preserve-newlines) - -**Namespace**: `html` - -**Key**: `preserve_newlines` - -**Default**: `true` - -**Type**: `boolean` - -**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) - -**Description**: - -Preserve line-breaks (Supported by Vue Beautifier) - -**Example `.jsbeautifyrc` Configuration** - -```json -{ - "html": { - "preserve_newlines": true - } -} -``` - -##### [Max preserve newlines](#max-preserve-newlines) - -**Namespace**: `html` - -**Key**: `max_preserve_newlines` - -**Default**: `10` - -**Type**: `integer` - -**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) - -**Description**: - -Number of line-breaks to be preserved in one chunk (Supported by Vue Beautifier) - -**Example `.jsbeautifyrc` Configuration** - -```json -{ - "html": { - "max_preserve_newlines": 10 - } -} -``` - ##### [Unformatted](#unformatted) **Namespace**: `html` @@ -17658,30 +18272,6 @@ List of tags (defaults to inline) that should not be reformatted (Supported by V } ``` -##### [End with newline](#end-with-newline) - -**Namespace**: `html` - -**Key**: `end_with_newline` - -**Type**: `boolean` - -**Supported Beautifiers**: [`Vue Beautifier`](#vue-beautifier) - -**Description**: - -End output with newline (Supported by Vue Beautifier) - -**Example `.jsbeautifyrc` Configuration** - -```json -{ - "html": { - "end_with_newline": false - } -} -``` - ##### [Extra liners](#extra-liners) **Namespace**: `html` diff --git a/examples/nested-jsbeautifyrc/.jsbeautifyrc b/examples/nested-jsbeautifyrc/.jsbeautifyrc index 487d3f3..229895f 100644 --- a/examples/nested-jsbeautifyrc/.jsbeautifyrc +++ b/examples/nested-jsbeautifyrc/.jsbeautifyrc @@ -60,3 +60,7 @@ indent_size: 4 indent_char: " " omit_div: true + vue: + space_before_conditional: false + space_after_anon_function: false + jslint_happy: false diff --git a/examples/nested-jsbeautifyrc/javascript/expected/space_after_anon_function.js b/examples/nested-jsbeautifyrc/javascript/expected/space_after_anon_function.js new file mode 100644 index 0000000..6ec419e --- /dev/null +++ b/examples/nested-jsbeautifyrc/javascript/expected/space_after_anon_function.js @@ -0,0 +1,5 @@ +export default { + data : function() { + return {text: 'Hello, world!'} + } +} diff --git a/examples/nested-jsbeautifyrc/javascript/original/_space_after_anon_function.js b/examples/nested-jsbeautifyrc/javascript/original/_space_after_anon_function.js new file mode 100644 index 0000000..a79b219 --- /dev/null +++ b/examples/nested-jsbeautifyrc/javascript/original/_space_after_anon_function.js @@ -0,0 +1,7 @@ +export default { + data: function () { + return { + text: 'Hello, world!' + } + } +} diff --git a/examples/nested-jsbeautifyrc/vue/expected/space_after_anon_function.vue b/examples/nested-jsbeautifyrc/vue/expected/space_after_anon_function.vue new file mode 100644 index 0000000..91df1d4 --- /dev/null +++ b/examples/nested-jsbeautifyrc/vue/expected/space_after_anon_function.vue @@ -0,0 +1,9 @@ + diff --git a/examples/nested-jsbeautifyrc/vue/original/space_after_anon_function.vue b/examples/nested-jsbeautifyrc/vue/original/space_after_anon_function.vue new file mode 100644 index 0000000..88c9e6a --- /dev/null +++ b/examples/nested-jsbeautifyrc/vue/original/space_after_anon_function.vue @@ -0,0 +1,9 @@ + diff --git a/package.json b/package.json index 3c11ce0..a9f5bad 100644 --- a/package.json +++ b/package.json @@ -305,4 +305,4 @@ "lint": "coffeelint src/ spec/", "code-docs": "codo && open docs/code/index.html" } -} +} \ No newline at end of file diff --git a/script/build-options.js b/script/build-options.js index e836f51..a0d3d6c 100644 --- a/script/build-options.js +++ b/script/build-options.js @@ -211,6 +211,11 @@ buildOptionsForBeautifiers = function(beautifiers, allLanguages) { options[field] = op; } } + function mergeCustomizer(objValue, srcValue) { + if (_.isArray(objValue)) { + return _.uniq(objValue.concat(srcValue)); + } + } for (j = 0, len1 = allLanguages.length; j < len1; j++) { lang = allLanguages[j]; namespaceDest = lang.namespace; @@ -219,7 +224,7 @@ buildOptionsForBeautifiers = function(beautifiers, allLanguages) { for (k = 0, len2 = fallback.length; k < len2; k++) { namespaceSrc = fallback[k]; optionsSrc = _.get(langOptions, namespaceSrc + ".properties"); - _.merge(optionsDest, optionsSrc); + _.mergeWith(optionsDest, optionsSrc, mergeCustomizer); } } for (l = 0, len3 = beautifiers.length; l < len3; l++) { diff --git a/src/languages/vue.coffee b/src/languages/vue.coffee index bc1137e..352e274 100644 --- a/src/languages/vue.coffee +++ b/src/languages/vue.coffee @@ -2,7 +2,7 @@ module.exports = { name: "Vue" namespace: "vue" - fallback: ['html'] + fallback: ['html', 'js'] ### Supported Grammars