[change] clarified rules for styles

merkle-open · Jul 13, 2016 · 5c7c29d · 5c7c29d
1 parent d7cbc34
commit 5c7c29d
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 15 deletions.
diff --git a/configurations/es6.js b/configurations/es6.js
@@ -24,12 +24,6 @@ module.exports = {
 		'../rules/es6'
 	].map(require.resolve),
 
-	// overwrite es5 rules here
-	rules: {
-		// allow multiple var statement per function
-		'one-var': 0
-	},
-
 	parserOptions: {
 		ecmaVersion: 6,
 		sourceType: 'module',

diff --git a/documentation/style.md b/documentation/style.md
@@ -592,6 +592,23 @@ function _test(productData) {}
 
 &#10003; Enabled (error)
 
+```javascript
+
+// Bad
+/*
+function bad() {
+	const d = 1, e = 2;
+}
+*/
+
+// Good
+function good() {
+	let a, b, c;
+	const d = 1;
+	const e = 2;
+}
+
+```
 <br />
 
 
@@ -603,6 +620,26 @@ function _test(productData) {}
 
 &#10003; Enabled (error)
 
+```javascript
+
+// Bad
+/*
+function bad() {
+	const a = 1,
+		b = 2,
+		c = 3;
+}
+*/
+
+// Good
+function good() {
+	const d = 4;
+	const e = 5;
+	const f = 6;
+}
+
+
+```
 <br />
 
 

diff --git a/rules/style.js b/rules/style.js
@@ -88,7 +88,7 @@ module.exports = {
 			ignoreUrls: true,
 			ignoreComments: false
 		}],
-		// TODO clarify ignoreComments:true
+		// [08.07.2016] enabled
 
 		// specify the maximum depth callbacks can be nested
 		'max-nested-callbacks': [2, 5],
@@ -140,7 +140,7 @@ module.exports = {
 
 		// disallow if as the only statement in an else block
 		'no-lonely-if': 2,
-		// [08.07.2016] enabled TODO clearify
+		// [08.07.2016] enabled
 
 		// disallow mixed spaces and tabs for indentation
 		'no-mixed-spaces-and-tabs': 2,
@@ -210,8 +210,8 @@ module.exports = {
 
 		// require a newline around variable declaration
 		// http://eslint.org/docs/rules/one-var-declaration-per-line
-		'one-var-declaration-per-line': [2, 'always'],
-		// [08.07.2016] enabled always
+		'one-var-declaration-per-line': [2, 'initializations'],
+		// [13.07.2016] enabled initializations
 
 		// require assignment operator shorthand where possible or prohibit it entirely
 		'operator-assignment': 0,
@@ -229,7 +229,6 @@ module.exports = {
 
 		// specify whether double or single quotes should be used
 		'quotes': [2, 'single', { avoidEscape: true }],
-		// TODO tbd
 
 		// do not require jsdoc
 		// http://eslint.org/docs/rules/require-jsdoc
@@ -240,7 +239,7 @@ module.exports = {
 				ClassDeclaration: true
 			}
 		}],
-		// TODO tbd
+		// [08.07.2016] enabled
 
 		// require or disallow use of semicolons instead of ASI
 		'semi': [2, 'always'],

diff --git a/test/es5/rules/style/one-var-declaration-per-line.js b/test/es5/rules/style/one-var-declaration-per-line.js
@@ -1,8 +1,21 @@
-
 // DESCRIPTION = require a newline around variable declaration
 // STATUS = 2
 
+/* eslint no-unused-vars: 0*/
+/* eslint require-jsdoc: 0*/
+/* eslint one-var: 0*/
 // <!START
+// Bad
+/*
+function bad() {
+	const d = 1, e = 2;
+}
+*/
 
+// Good
+function good() {
+	let a, b, c;
+	const d = 1;
+	const e = 2;
+}
 // END!>
-document.window.append('', null);
diff --git a/test/es5/rules/style/one-var.js b/test/es5/rules/style/one-var.js
@@ -2,7 +2,23 @@
 // DESCRIPTION = allow just one var statement per function
 // STATUS = 2
 
+/* eslint no-unused-vars: 0*/
+/* eslint require-jsdoc: 0*/
 // <!START
+// Bad
+/*
+function bad() {
+	const a = 1,
+		b = 2,
+		c = 3;
+}
+*/
+
+// Good
+function good() {
+	const d = 4;
+	const e = 5;
+	const f = 6;
+}
 
 // END!>
-document.window.append('', null);