1.1.2

Author: [Interfaced] Кирилл Дронкин

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## 1.1.2 (release date: 2.08.2018)
+
+* `lines-around-class`: handle nested classes
+
 ## 1.1.1 (release date: 30.07.2018)
 
 * Use public fork of Doctrine instead of local one

lib/rules/lines-around-class.js

@@ -35,11 +35,28 @@ module.exports = {
 		const sourceCode = context.getSourceCode();
 
 		/**
+		 * @param {Scope} scope
+		 * @return {Array<ASTNode>}
+		 */
+		function getScopeBody(scope) {
+			return scope.type === 'function' ? scope.block.body.body : scope.block.body;
+		}
+
+		/**
+		 * @param {Scope} scope
+		 * @return {number}
+		 */
+		function getScopeStart(scope) {
+			return scope.type === 'function' ? scope.block.body.start : scope.block.start;
+		}
+
+		/**
+		 * @param {Scope} upperScope
 		 * @param {ASTNode} classNode
 		 * @return {boolean}
 		 */
-		function isCollisionWithAnotherClassBefore(classNode) {
-			const upperScopeBody = context.getScope().upper.block.body;
+		function isCollisionBefore(upperScope, classNode) {
+			const upperScopeBody = getScopeBody(upperScope);
 			const classIndexInScope = upperScopeBody.indexOf(classNode);
 			const classJSDocComment = getJSDocComment(classNode, sourceCode);
 
@@ -56,11 +73,12 @@ module.exports = {
 		}
 
 		/**
+		 * @param {Scope} upperScope
 		 * @param {ASTNode} classNode
 		 * @return {boolean}
 		 */
-		function isCollisionWithAnotherClassAfter(classNode) {
-			const upperScopeBody = context.getScope().upper.block.body;
+		function isCollisionAfter(upperScope, classNode) {
+			const upperScopeBody = getScopeBody(upperScope);
 			const classIndexInScope = upperScopeBody.indexOf(classNode);
 
 			const nodeAfterClass = upperScopeBody[classIndexInScope + 1] || null;
@@ -81,24 +99,31 @@ module.exports = {
 		 * @param {ASTNode} classNode
 		 */
 		function check(classNode) {
+			const upperScope = context.getScope().upper;
+			const upperScopeStart = getScopeStart(upperScope);
 			const classJSDocComment = getJSDocComment(classNode, sourceCode);
 
 			const tokenBeforeClass = sourceCode.getTokenBefore((classJSDocComment || classNode), {
-				includeComments: true
+				includeComments: true,
+				filter(token) {
+					return token.start > upperScopeStart;
+				}
 			});
 
 			const tokenAfterClass = sourceCode.getTokenAfter((classNode), {
-				includeComments: true
+				includeComments: true,
+				filter(token) {
+					return token.start > upperScopeStart;
+				}
 			});
 
 			if (tokenBeforeClass) {
-				if (isCollisionWithAnotherClassBefore(classNode) && options.collisionPriority !== 'before') {
+				if (isCollisionBefore(upperScope, classNode) && options.collisionPriority !== 'before') {
 					return;
 				}
 
 				const classStartLine = (classJSDocComment || classNode).loc.start.line;
 				const tokenBeforeClassEndLine = tokenBeforeClass.loc.end.line;
-
 				const newlinesAmountBeforeClass = Math.max(classStartLine - tokenBeforeClassEndLine - 1, 0);
 
 				if (newlinesAmountBeforeClass !== options.before) {
@@ -122,13 +147,12 @@ module.exports = {
 			}
 
 			if (tokenAfterClass) {
-				if (isCollisionWithAnotherClassAfter(classNode) && options.collisionPriority !== 'after') {
+				if (isCollisionAfter(upperScope, classNode) && options.collisionPriority !== 'after') {
 					return;
 				}
 
 				const classEndLine = classNode.loc.end.line;
 				const tokenAfterClassStartLine = tokenAfterClass.loc.start.line;
-
 				const newlinesAmountAfterClass = Math.max(tokenAfterClassStartLine - classEndLine - 1, 0);
 
 				if (newlinesAmountAfterClass !== options.after) {

lib/types.js

@@ -8,6 +8,11 @@ let ASTNode;
  */
 let ASTComment;
 
+/**
+ * @typedef {Object}
+ */
+let Scope;
+
 /**
  * @typedef {Object}
  */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-interfaced",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "ESLint plugin with rules for the approaches adopted by Interfaced company",
   "license": "MIT",
   "author": "Interfaced (http://interfaced.tv)",

test/eslint/rules/lines-around-class.js

@@ -35,6 +35,38 @@ module.exports = extendToClassExpression({
 			` */`,
 			`Klass.CONST = 1;`
 		)
+	}, {
+		options: [{
+			before: 2,
+			after: 2
+		}],
+		code: concat(
+			`goog.provide('Klass');`,
+			``,
+			``,
+			`function func() {`,
+			`    class Klass {}`,
+			``,
+			``,
+			`    Klass.CONST = 1;`,
+			`}`
+		)
+	}, {
+		options: [{
+			before: 2,
+			after: 2
+		}],
+		code: concat(
+			`goog.provide('Klass');`,
+			``,
+			``,
+			`block: {`,
+			`    class Klass {}`,
+			``,
+			``,
+			`    Klass.CONST = 1;`,
+			`}`
+		)
 	}, {
 		options: [{
 			before: 2,
@@ -221,5 +253,38 @@ module.exports = extendToClassExpression({
 			`Amount of newlines before class should be 2, but 1 given.`,
 			`Amount of newlines after class should be 2, but 1 given.`
 		)
+	}, {
+		options: [{
+			before: 2,
+			after: 2
+		}],
+		code: concat(
+			`goog.provide('Klass');`,
+			``,
+			`function func() {`,
+			`    // Comment`,
+			``,
+			`    class Klass {}`,
+			``,
+			`    Klass.CONST = 1;`,
+			`}`
+		),
+		output: concat(
+			`goog.provide('Klass');`,
+			``,
+			`function func() {`,
+			`    // Comment`,
+			``,
+			``,
+			`    class Klass {}`,
+			``,
+			``,
+			`    Klass.CONST = 1;`,
+			`}`
+		),
+		errors: errors(
+			`Amount of newlines before class should be 2, but 1 given.`,
+			`Amount of newlines after class should be 2, but 1 given.`
+		)
 	}]
 });