improve editorconfig, jscsrc; format

haoxins · Jul 25, 2015 · f011979 · f011979
1 parent 09ce95b
commit f011979
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 74 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,5 +1,8 @@
 root = true
 
 [*.{html,js}]
-	indent_style = space
-	indent_size = 2
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
diff --git a/.jscsrc b/.jscsrc
@@ -1,68 +1,26 @@
 {
-  "requireCurlyBraces": [
-    "else",
-    "for",
-    "while",
-    "do",
-    "try",
-    "catch"
-  ],
-  "requireOperatorBeforeLineBreak": true,
-  "requireCamelCaseOrUpperCaseIdentifiers": true,
+  "preset": "google",
   "maximumLineLength": {
     "value": 240,
     "allowComments": true,
     "allowRegex": true
   },
-  "validateIndentation": 2,
-  "validateQuoteMarks": "'",
-  "disallowMultipleLineStrings": true,
-  "disallowMixedSpacesAndTabs": true,
-  "disallowTrailingWhitespace": true,
-  "disallowSpaceAfterPrefixUnaryOperators": true,
-  "disallowKeywordsOnNewLine": ["else"],
-  "requireSpaceAfterKeywords": [
-    "if",
+  "requireCurlyBraces": [
     "else",
     "for",
     "while",
     "do",
-    "switch",
-    "return",
     "try",
     "catch"
   ],
-  "requireSpaceBeforeBinaryOperators": [
-    "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=",
-    "&=", "|=", "^=", "+=",
-
-    "+", "-", "*", "/", "%", "<<", ">>", ">>>", "&",
-    "|", "^", "&&", "||", "===", "==", ">=",
-    "<=", "<", ">", "!=", "!=="
-  ],
-  "requireSpaceAfterBinaryOperators": true,
-  "requireSpacesInConditionalExpression": true,
-  "requireSpaceBeforeBlockStatements": true,
-  "requireSpacesInForStatement": true,
-  "requireLineFeedAtFileEnd": true,
-  "requireSpacesInFunctionExpression": {
-    "beforeOpeningCurlyBrace": true
-  },
-  "disallowSpacesInAnonymousFunctionExpression": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInsideObjectBrackets": "all",
-  "disallowSpacesInsideArrayBrackets": "all",
-  "disallowSpacesInsideParentheses": true,
-
-  "disallowMultipleLineBreaks": true,
-  "disallowNewlineBeforeBlockStatements": true,
   "disallowSpacesInFunction": {
     "beforeOpeningRoundBrace": true
   },
+  "disallowMultipleVarDecl": "exceptUndefined",
+  "disallowSpacesInsideObjectBrackets": null,
   "disallowMultipleSpaces": true,
   "excludeFiles": [
-    "test/fixtures/result.js",
+    "bower_components/**",
     "node_modules/**",
     "coverage/**"
   ]

diff --git a/test/edge-case.js b/test/edge-case.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var fileIncludePlugin = require('..'),
-  gutil = require('gulp-util'),
-  should = require('should'),
-  fs = require('fs');
+var fileIncludePlugin = require('..');
+var gutil = require('gulp-util');
+var should = require('should');
+var fs = require('fs');
 
 describe('## gulp-file-include', function() {
   describe('# edge cases', function() {

diff --git a/test/filters.js b/test/filters.js
@@ -1,10 +1,10 @@
 'use strict';
 
-var fileIncludePlugin = require('..'),
-  markdown = require('markdown'),
-  gutil = require('gulp-util'),
-  should = require('should'),
-  fs = require('fs');
+var fileIncludePlugin = require('..');
+var markdown = require('markdown');
+var gutil = require('gulp-util');
+var should = require('should');
+var fs = require('fs');
 
 describe('## gulp-file-include', function() {
   var result = fs.readFileSync('test/fixtures/result.html', 'utf8');

diff --git a/test/flatten.js b/test/flatten.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var fileIncludePlugin = require('..'),
-  gutil = require('gulp-util'),
-  should = require('should'),
-  fs = require('fs');
+var fileIncludePlugin = require('..');
+var gutil = require('gulp-util');
+var should = require('should');
+var fs = require('fs');
 
 describe('## gulp-file-include', function() {
   var result = fs.readFileSync('test/fixtures-flatten/result.html', 'utf8');

diff --git a/test/index.js b/test/index.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var fileIncludePlugin = require('..'),
-  gutil = require('gulp-util'),
-  should = require('should'),
-  fs = require('fs');
+var fileIncludePlugin = require('..');
+var gutil = require('gulp-util');
+var should = require('should');
+var fs = require('fs');
 
 describe('## gulp-file-include', function() {
   var result = fs.readFileSync('test/fixtures/result.html', 'utf8');

diff --git a/test/operator.js b/test/operator.js
@@ -14,14 +14,14 @@ describe('## operator', function() {
       prefix: '@@',
       suffix: '',
       name: 'if',
-      handler: function (inst) {
+      handler: function(inst) {
         // jshint ignore: start
         var condition = new Function('var context = this; with (context) { return ' + inst.args + '; }').call({
           content: index,
           name: 'c'
         });
         // jshint ignore: end
-        
+
         return condition ? inst.body : '';
       }
     }).should.equal(result);
@@ -37,14 +37,14 @@ describe('## operator', function() {
       name: 'if',
       prefix: '@@',
       suffix: '##',
-      handler: function (inst) {
+      handler: function(inst) {
         // jshint ignore: start
         var condition = new Function('var context = this; with (context) { return ' + inst.args + '; }').call({
           content: index,
           name: 'c'
         });
         // jshint ignore: end
-        
+
         return condition ? inst.body : '';
       }
     }).should.equal(result);

diff --git a/test/recursion.js b/test/recursion.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var fileIncludePlugin = require('..'),
-  gutil = require('gulp-util'),
-  should = require('should'),
-  fs = require('fs');
+var fileIncludePlugin = require('..');
+var gutil = require('gulp-util');
+var should = require('should');
+var fs = require('fs');
 
 describe('## recursion include', function() {
   var result = fs.readFileSync('test/fixtures-recursion/result.txt', 'utf8');