Merge pull request microsoft#3477 from tinganho/customTypeGuardFormating

mhegazy · mhegazy · commit 2cd2a4acc6d0 · 2015-06-11T12:13:10.000-07:00
Fixes type predicate formatting
diff --git a/src/services/formatting/formattingScanner.ts b/src/services/formatting/formattingScanner.ts
@@ -224,7 +224,7 @@ module ts.formatting {
         }
 
         function isOnToken(): boolean {
-            let current = (lastTokenInfo && lastTokenInfo.token.kind) ||  scanner.getToken();
+            let current = (lastTokenInfo && lastTokenInfo.token.kind) || scanner.getToken();
             let startPos = (lastTokenInfo && lastTokenInfo.token.pos) || scanner.getStartPos();
             return startPos < endPos && current !== SyntaxKind.EndOfFileToken && !isTrivia(current);
         }
diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
@@ -193,7 +193,7 @@ module ts.formatting {
         // Insert space after function keyword for anonymous functions
         public SpaceAfterAnonymousFunctionKeyword: Rule;
         public NoSpaceAfterAnonymousFunctionKeyword: Rule;
-        
+
         // Insert space after @ in decorator
         public SpaceBeforeAt: Rule;
         public NoSpaceAfterAt: Rule;
@@ -470,8 +470,9 @@ module ts.formatting {
             switch (context.contextNode.kind) {
                 case SyntaxKind.BinaryExpression:
                 case SyntaxKind.ConditionalExpression:
+                case SyntaxKind.TypePredicate:
                     return true;
-                
+
                 // equals in binding elements: function foo([[x, y] = [1, 2]])
                 case SyntaxKind.BindingElement:
                 // equals in type X = ...
diff --git a/src/services/formatting/tokenRange.ts b/src/services/formatting/tokenRange.ts
@@ -112,7 +112,7 @@ module ts.formatting {
             static AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([SyntaxKind.MultiLineCommentTrivia]));
             static Keywords = TokenRange.FromRange(SyntaxKind.FirstKeyword, SyntaxKind.LastKeyword);
             static BinaryOperators = TokenRange.FromRange(SyntaxKind.FirstBinaryOperator, SyntaxKind.LastBinaryOperator);
-            static BinaryKeywordOperators = TokenRange.FromTokens([SyntaxKind.InKeyword, SyntaxKind.InstanceOfKeyword, SyntaxKind.OfKeyword]);
+            static BinaryKeywordOperators = TokenRange.FromTokens([SyntaxKind.InKeyword, SyntaxKind.InstanceOfKeyword, SyntaxKind.OfKeyword, SyntaxKind.IsKeyword]);
             static UnaryPrefixOperators = TokenRange.FromTokens([SyntaxKind.PlusPlusToken, SyntaxKind.MinusMinusToken, SyntaxKind.TildeToken, SyntaxKind.ExclamationToken]);
             static UnaryPrefixExpressions = TokenRange.FromTokens([SyntaxKind.NumericLiteral, SyntaxKind.Identifier, SyntaxKind.OpenParenToken, SyntaxKind.OpenBracketToken, SyntaxKind.OpenBraceToken, SyntaxKind.ThisKeyword, SyntaxKind.NewKeyword]);
             static UnaryPreincrementExpressions = TokenRange.FromTokens([SyntaxKind.Identifier, SyntaxKind.OpenParenToken, SyntaxKind.ThisKeyword, SyntaxKind.NewKeyword]);
diff --git a/tests/cases/fourslash/functionTypePredicateFormatting.ts b/tests/cases/fourslash/functionTypePredicateFormatting.ts
@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts' />
+
+//// /**/function bar(a: A):     a        is       B    {}
+
+goTo.marker();
+format.document();
+verify.currentLineContentIs("function bar(a: A): a is B { }");

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ module ts.formatting {`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`function isOnToken(): boolean {`
`227`		`- let current = (lastTokenInfo && lastTokenInfo.token.kind) \|\| scanner.getToken();`
	`227`	`+ let current = (lastTokenInfo && lastTokenInfo.token.kind) \|\| scanner.getToken();`
`228`	`228`	`let startPos = (lastTokenInfo && lastTokenInfo.token.pos) \|\| scanner.getStartPos();`
`229`	`229`	`return startPos < endPos && current !== SyntaxKind.EndOfFileToken && !isTrivia(current);`
`230`	`230`	`}`