microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-06 02:33:53 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fixing first example

Browse Source
This commit is contained in:
SaschaNaz 2015-07-05 01:22:13 +09:00
parent b294443c35
commit b402b63f3a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/formatting/formatting.ts
View File

@ -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);

2
tests/cases/fourslash/consistenceOnIndentionsOfChainedFunctionCalls.ts
View File

@ -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);
verify.indentationIs(4);

4
tests/cases/fourslash/functionIndentation.ts
View File

@ -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" +