Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply suppression to tokens

Browse Source
This commit is contained in:
SaschaNaz
2015-09-13 04:02:18 +09:00
parent 07fbf8bfd1
commit f2329846cb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/formatting/formatting.ts
+5 -3
View File
@@ -387,9 +387,7 @@ namespace ts.formatting {
let indentation = inheritedIndentation;
if (indentation === Constants.Unknown) {
if (SmartIndenter.shouldInheritParentIndentation(parent, node) ||
SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
indentation = parentDynamicIndentation.getIndentation();
}
else {
@@ -590,6 +588,10 @@ namespace ts.formatting {
return inheritedIndentation;
}
if (SmartIndenter.shouldInheritParentIndentation(parent, child)) {
parentDynamicIndentation = getDynamicIndentation(parent, parentStartLine, indentation, 0);
}
if (isToken(child)) {
// if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules
let tokenInfo = formattingScanner.readTokenInfo(child);