remove typescript as a submodule and embed it directly

- needed for integration with travis
temporaryAny · Sep 23, 2013 · 46f974b · 46f974b
1 parent 5610d97
commit 46f974b
Show file tree

Hide file tree

Showing 197 changed files with 95,796 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/bin/tslint-cli.js b/bin/tslint-cli.js
@@ -27081,6 +27081,7 @@ var Lint;
                             if (blockStatements.childCount() === 1) {
                                 return;
                             }
+
                             var ifStatement = (firstBlockStatement).statement;
                             if (this.nodeIsContinue(ifStatement)) {
                                 return;
@@ -27096,15 +27097,18 @@ var Lint;
 
             ForInWalker.prototype.nodeIsContinue = function (node) {
                 var kind = node.kind();
+
                 if (kind === TypeScript.SyntaxKind.ContinueStatement) {
                     return true;
                 }
+
                 if (kind === TypeScript.SyntaxKind.Block) {
                     var blockStatements = (node).statements;
                     if (blockStatements.childCount() === 1 && blockStatements.childAt(0).kind() === TypeScript.SyntaxKind.ContinueStatement) {
                         return true;
                     }
                 }
+
                 return false;
             };
             return ForInWalker;

diff --git a/lib/tslint.js b/lib/tslint.js
@@ -27075,15 +27075,42 @@ var Lint;
                 if (statementKind === TypeScript.SyntaxKind.Block) {
                     var blockNode = statement;
                     var blockStatements = blockNode.statements;
-                    if (blockStatements.childCount() === 1 && blockStatements.childAt(0).kind() === TypeScript.SyntaxKind.IfStatement) {
-                        return;
+                    if (blockStatements.childCount() >= 1) {
+                        var firstBlockStatement = blockStatements.childAt(0);
+                        if (firstBlockStatement.kind() === TypeScript.SyntaxKind.IfStatement) {
+                            if (blockStatements.childCount() === 1) {
+                                return;
+                            }
+
+                            var ifStatement = (firstBlockStatement).statement;
+                            if (this.nodeIsContinue(ifStatement)) {
+                                return;
+                            }
+                        }
                     }
                 }
 
                 var position = this.position() + node.leadingTriviaWidth();
                 var failure = this.createFailure(position, node.width(), ForInRule.FAILURE_STRING);
                 this.addFailure(failure);
             };
+
+            ForInWalker.prototype.nodeIsContinue = function (node) {
+                var kind = node.kind();
+
+                if (kind === TypeScript.SyntaxKind.ContinueStatement) {
+                    return true;
+                }
+
+                if (kind === TypeScript.SyntaxKind.Block) {
+                    var blockStatements = (node).statements;
+                    if (blockStatements.childCount() === 1 && blockStatements.childAt(0).kind() === TypeScript.SyntaxKind.ContinueStatement) {
+                        return true;
+                    }
+                }
+
+                return false;
+            };
             return ForInWalker;
         })(Lint.RuleWalker);
     })(Lint.Rules || (Lint.Rules = {}));

diff --git a/src/typescript b/src/typescript