microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

applying three feedbacks

Browse Source
This commit is contained in:
SaschaNaz
2015-12-10 22:07:01 +09:00
parent cf67f79022
commit f5587151ba
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -847,9 +847,7 @@ namespace ts.formatting {
}
// We need to trim trailing whitespace between the tokens if they were on different lines, and no rule was applied to put them on the same line
trimTrailingWhitespaces =
(rule.Operation.Action & (RuleAction.NewLine | RuleAction.Space | RuleAction.Ignore)) &&
rule.Flag !== RuleFlags.CanDeleteNewLines;
trimTrailingWhitespaces = !(rule.Operation.Action & RuleAction.Delete) && rule.Flag !== RuleFlags.CanDeleteNewLines;
}
else {
trimTrailingWhitespaces = true;
@@ -950,6 +948,7 @@ namespace ts.formatting {
let whitespaceStart = getTrailingWhitespaceStartPosition(lineStartPosition, lineEndPosition);
if (whitespaceStart !== -1) {
Debug.assert(whitespaceStart === lineStartPosition || !isWhiteSpace(sourceFile.text.charCodeAt(whitespaceStart - 1)));
recordDelete(whitespaceStart, lineEndPosition + 1 - whitespaceStart);
}
}
@@ -965,8 +964,6 @@ namespace ts.formatting {
pos--;
}
if (pos !== end) {
// pos must be out of range or non-whitespace
Debug.assert(pos === start - 1 || !isWhiteSpace(sourceFile.text.charCodeAt(pos)));
return pos + 1;
}
return -1;
@@ -981,14 +978,7 @@ namespace ts.formatting {
let startLine = sourceFile.getLineAndCharacterOfPosition(startPosition).line;
let endLine = sourceFile.getLineAndCharacterOfPosition(originalRange.end).line;
let endLineStartPosition = getStartPositionOfLine(endLine, sourceFile);
let endLineEndPosition = getEndLinePosition(endLine, sourceFile);
if (getTrailingWhitespaceStartPosition(endLineStartPosition, endLineEndPosition) === endLineStartPosition) {
// Trim the whole last line when it has whitespaces only
endLine++;
}
trimTrailingWhitespacesForLines(startLine, endLine, previousRange);
trimTrailingWhitespacesForLines(startLine, endLine + 1, previousRange);
}
function newTextChange(start: number, len: number, newText: string): TextChange {