allow one-line array/object literals in indentation rule

ovr · Aug 16, 2013 · fcc9c86 · fcc9c86
1 parent 5cd203a
commit fcc9c86
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 20 deletions.
diff --git a/bin/tslint-cli.js b/bin/tslint-cli.js
@@ -27132,15 +27132,27 @@ var Lint;
             };
 
             IndentWalker.prototype.visitObjectLiteralExpression = function (node) {
-                this.visitToken(node.openBraceToken);
-                this.checkAndVisitSeparatedList(node.propertyAssignments);
-                this.visitToken(node.closeBraceToken);
+                var startPosition = this.position() + node.leadingTriviaWidth();
+
+                if (!this.arePositionsOnSameLine(startPosition, startPosition + node.width())) {
+                    this.visitToken(node.openBraceToken);
+                    this.checkAndVisitSeparatedList(node.propertyAssignments);
+                    this.visitToken(node.closeBraceToken);
+                } else {
+                    _super.prototype.visitObjectLiteralExpression.call(this, node);
+                }
             };
 
             IndentWalker.prototype.visitArrayLiteralExpression = function (node) {
-                this.visitToken(node.openBracketToken);
-                this.checkAndVisitSeparatedList(node.expressions);
-                this.visitToken(node.closeBracketToken);
+                var startPosition = this.position() + node.leadingTriviaWidth();
+
+                if (!this.arePositionsOnSameLine(startPosition, startPosition + node.width())) {
+                    this.visitToken(node.openBracketToken);
+                    this.checkAndVisitSeparatedList(node.expressions);
+                    this.visitToken(node.closeBracketToken);
+                } else {
+                    _super.prototype.visitArrayLiteralExpression.call(this, node);
+                }
             };
 
             IndentWalker.prototype.visitModuleDeclaration = function (node) {
@@ -27183,6 +27195,14 @@ var Lint;
                 this.checkAndVisitList(node.statements);
             };
 
+            IndentWalker.prototype.arePositionsOnSameLine = function (pos1, pos2) {
+                var lineMap = this.getSyntaxTree().lineMap();
+                var line1 = lineMap.getLineAndCharacterFromPosition(pos1).line();
+                var line2 = lineMap.getLineAndCharacterFromPosition(pos2).line();
+
+                return (line1 === line2);
+            };
+
             IndentWalker.prototype.checkAndVisitList = function (list) {
                 this.currentLevel += 1;
                 for (var i = 0; i < list.childCount(); i++) {

diff --git a/lib/tslint.js b/lib/tslint.js
@@ -27132,15 +27132,27 @@ var Lint;
             };
 
             IndentWalker.prototype.visitObjectLiteralExpression = function (node) {
-                this.visitToken(node.openBraceToken);
-                this.checkAndVisitSeparatedList(node.propertyAssignments);
-                this.visitToken(node.closeBraceToken);
+                var startPosition = this.position() + node.leadingTriviaWidth();
+
+                if (!this.arePositionsOnSameLine(startPosition, startPosition + node.width())) {
+                    this.visitToken(node.openBraceToken);
+                    this.checkAndVisitSeparatedList(node.propertyAssignments);
+                    this.visitToken(node.closeBraceToken);
+                } else {
+                    _super.prototype.visitObjectLiteralExpression.call(this, node);
+                }
             };
 
             IndentWalker.prototype.visitArrayLiteralExpression = function (node) {
-                this.visitToken(node.openBracketToken);
-                this.checkAndVisitSeparatedList(node.expressions);
-                this.visitToken(node.closeBracketToken);
+                var startPosition = this.position() + node.leadingTriviaWidth();
+
+                if (!this.arePositionsOnSameLine(startPosition, startPosition + node.width())) {
+                    this.visitToken(node.openBracketToken);
+                    this.checkAndVisitSeparatedList(node.expressions);
+                    this.visitToken(node.closeBracketToken);
+                } else {
+                    _super.prototype.visitArrayLiteralExpression.call(this, node);
+                }
             };
 
             IndentWalker.prototype.visitModuleDeclaration = function (node) {
@@ -27183,6 +27195,14 @@ var Lint;
                 this.checkAndVisitList(node.statements);
             };
 
+            IndentWalker.prototype.arePositionsOnSameLine = function (pos1, pos2) {
+                var lineMap = this.getSyntaxTree().lineMap();
+                var line1 = lineMap.getLineAndCharacterFromPosition(pos1).line();
+                var line2 = lineMap.getLineAndCharacterFromPosition(pos2).line();
+
+                return (line1 === line2);
+            };
+
             IndentWalker.prototype.checkAndVisitList = function (list) {
                 this.currentLevel += 1;
                 for (var i = 0; i < list.childCount(); i++) {

diff --git a/src/rules/indentRule.ts b/src/rules/indentRule.ts
@@ -86,18 +86,30 @@ module Lint.Rules {
             super.visitMemberFunctionDeclaration(node);
         }
 
-        // object literal indentation
+        // object literal indentation, ignoring one-line literals
         public visitObjectLiteralExpression(node: TypeScript.ObjectLiteralExpressionSyntax): void {
-            this.visitToken(node.openBraceToken);
-            this.checkAndVisitSeparatedList(node.propertyAssignments);
-            this.visitToken(node.closeBraceToken);
+            var startPosition = this.position() + node.leadingTriviaWidth();
+
+            if (!this.arePositionsOnSameLine(startPosition, startPosition + node.width())) {
+                this.visitToken(node.openBraceToken);
+                this.checkAndVisitSeparatedList(node.propertyAssignments);
+                this.visitToken(node.closeBraceToken);
+            } else {
+                super.visitObjectLiteralExpression(node);
+            }
         }
 
-        // array literal indentation
+        // array literal indentation, ignoring one-line literals
         public visitArrayLiteralExpression(node: TypeScript.ArrayLiteralExpressionSyntax): void {
-            this.visitToken(node.openBracketToken);
-            this.checkAndVisitSeparatedList(node.expressions);
-            this.visitToken(node.closeBracketToken);
+            var startPosition = this.position() + node.leadingTriviaWidth();
+
+            if (!this.arePositionsOnSameLine(startPosition, startPosition + node.width())) {
+                this.visitToken(node.openBracketToken);
+                this.checkAndVisitSeparatedList(node.expressions);
+                this.visitToken(node.closeBracketToken);
+            } else {
+                super.visitArrayLiteralExpression(node);
+            }
         }
 
         // module indentation
@@ -143,6 +155,14 @@ module Lint.Rules {
             this.checkAndVisitList(node.statements);
         }
 
+        private arePositionsOnSameLine(pos1: number, pos2: number): boolean {
+            var lineMap = this.getSyntaxTree().lineMap();
+            var line1 = lineMap.getLineAndCharacterFromPosition(pos1).line();
+            var line2 = lineMap.getLineAndCharacterFromPosition(pos2).line();
+
+            return (line1 === line2);
+        }
+
         private checkAndVisitList(list: TypeScript.ISyntaxList): void {
             this.currentLevel += 1;
             for (var i = 0 ; i < list.childCount(); i++) {

diff --git a/test/files/rules/indent_spaces.test.ts b/test/files/rules/indent_spaces.test.ts
@@ -124,3 +124,7 @@ var arr = [
         b: 4
     }
 ];
+
+var arr2 = [1, 2, 3];
+var obj = {a: 1, b: 2, c: 3};
+var both = {a: [1, 2, 3], b: [4, 5, 6]};
diff --git a/test/files/rules/indent_tabs.test.ts b/test/files/rules/indent_tabs.test.ts
@@ -124,3 +124,7 @@ var arr = [
 		b: 4
 	}
 ];
+
+var arr2 = [1, 2, 3];
+var obj = {a: 1, b: 2, c: 3};
+var both = {a: [1, 2, 3], b: [4, 5, 6]};