From b402b63f3a1e01ac3c38930bcdb38c53014e7244 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Sun, 5 Jul 2015 01:22:13 +0900 Subject: [PATCH] Fixing first example --- src/services/formatting/formatting.ts | 4 +++- .../consistenceOnIndentionsOfChainedFunctionCalls.ts | 2 +- tests/cases/fourslash/functionIndentation.ts | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts index 011f7d7fa5e..66cdbd53750 100644 --- a/src/services/formatting/formatting.ts +++ b/src/services/formatting/formatting.ts @@ -480,6 +480,8 @@ namespace ts.formatting { case SyntaxKind.CloseBraceToken: case SyntaxKind.OpenBracketToken: case SyntaxKind.CloseBracketToken: + case SyntaxKind.OpenParenToken: + case SyntaxKind.CloseParenToken: case SyntaxKind.ElseKeyword: case SyntaxKind.WhileKeyword: case SyntaxKind.AtToken: @@ -644,7 +646,7 @@ namespace ts.formatting { // consume list start token startLine = sourceFile.getLineAndCharacterOfPosition(tokenInfo.token.pos).line; let indentation = - computeIndentation(tokenInfo.token, startLine, Constants.Unknown, parent, parentDynamicIndentation, startLine); + computeIndentation(tokenInfo.token, startLine, Constants.Unknown, parent, parentDynamicIndentation, parentStartLine); listDynamicIndentation = getDynamicIndentation(parent, parentStartLine, indentation.indentation, indentation.delta); consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation); diff --git a/tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts b/tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts index 3692974f5fb..ec2ae9b3c22 100644 --- a/tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts +++ b/tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts @@ -18,4 +18,4 @@ goTo.marker("1"); edit.insert("\r\n"); goTo.marker("0"); // Won't-fixed: Smart indent during chained function calls -verify.indentationIs(8); \ No newline at end of file +verify.indentationIs(4); \ No newline at end of file diff --git a/tests/cases/fourslash/functionIndentation.ts b/tests/cases/fourslash/functionIndentation.ts index db0379e2068..8fd568629d9 100644 --- a/tests/cases/fourslash/functionIndentation.ts +++ b/tests/cases/fourslash/functionIndentation.ts @@ -46,7 +46,7 @@ verify.currentFileContentIs( " C;\n" + " class C {\n" + " constructor(b\n" + -" ) {\n" + +" ) {\n" + " }\n" + " foo(a\n" + " : string) {\n" + @@ -54,7 +54,7 @@ verify.currentFileContentIs( " || true;\n" + " }\n" + " get bar(\n" + -" ) {\n" + +" ) {\n" + " return 1;\n" + " }\n" + " }\n" +