maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4303 from SaschaNaz/fixClassExpressionFormatting

Browse source 
Fix formatting for class expression + expressionWithTypeArguments
This commit is contained in:
Mohamed Hegazy 2015-08-13 12:27:26 -07:00
parent f92aa8681a f832bd20f2
commit 82b78d85d7
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/services/formatting/rules.ts
View file

@ -715,6 +715,7 @@ namespace ts.formatting {
case SyntaxKind.TypeReference:
case SyntaxKind.TypeAssertionExpression:
case SyntaxKind.ClassDeclaration:
case SyntaxKind.ClassExpression:
case SyntaxKind.InterfaceDeclaration:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.FunctionExpression:
@ -725,6 +726,7 @@ namespace ts.formatting {
case SyntaxKind.ConstructSignature:
case SyntaxKind.CallExpression:
case SyntaxKind.NewExpression:
case SyntaxKind.ExpressionWithTypeArguments:
return true;
default:
return false;

15
tests/cases/fourslash/genericsFormatting.ts
View file

@ -14,6 +14,13 @@
////
////foo()<number, string, T >();
////(a + b)<number, string, T >();
////
////function bar<T>() {
/////*inClassExpression*/ return class < T2 > {
//// }
////}
/////*expressionWithTypeArguments*/class A < T > extends bar < T >( ) < T > {
////}
format.document();
@ -33,4 +40,10 @@ goTo.marker("inNewSignature");
verify.currentLineContentIs(" new <T>(a: T);");
goTo.marker("inOptionalMethodSignature");
verify.currentLineContentIs(" op?<T, M>(a: T, b: M);");
verify.currentLineContentIs(" op?<T, M>(a: T, b: M);");
goTo.marker("inClassExpression");
verify.currentLineContentIs(" return class <T2> {");
goTo.marker("expressionWithTypeArguments");
verify.currentLineContentIs("class A<T> extends bar<T>()<T> {");