From f992a65acff6d1fa1abef22b3c9ff240472928ed Mon Sep 17 00:00:00 2001 From: zepumph Date: Thu, 17 Dec 2020 17:26:24 -0900 Subject: [PATCH] if statements should be on new lines, two spaces max, https://github.com/phetsims/phet-info/issues/150 --- js/grunt/format.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/grunt/format.js b/js/grunt/format.js index 60e04c785..6a0cc0586 100644 --- a/js/grunt/format.js +++ b/js/grunt/format.js @@ -40,7 +40,7 @@ const OPTIONS = { }, 'js': { 'allowed_file_extensions': [ 'js', 'json', 'jshintrc', 'jsbeautifyrc', 'sublime-settings' ], - 'brace_style': 'collapse-presever-inline', + 'brace_style': 'end-expand', 'break_chained_methods': false, 'e4x': false, 'end_with_newline': true, @@ -48,10 +48,10 @@ const OPTIONS = { 'indent_level': 0, 'indent_size': 2, 'indent_with_tabs': false, - 'jslint_happy': false, + 'jslint_happy': true, 'keep_array_indentation': false, 'keep_function_indentation': false, - 'max_preserve_newlines': 0, + 'max_preserve_newlines': 2, 'preserve_newlines': true, 'space_after_anon_function': false, 'space_before_conditional': true,