Skip to content

Fix space tab indentation #8487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhegazy merged 3 commits into from
May 6, 2016
Merged

Fix space tab indentation #8487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba2a330
Formatting space vs tabs tests added
ziacik May 5, 2016
06d05b0
Fixes space-tab indentation issues
ziacik May 5, 2016
e11b08f
Simplified check for indentation difference
May 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/services/formatting/formatting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,13 +866,17 @@ namespace ts.formatting {
}
else {
let tokenStart = sourceFile.getLineAndCharacterOfPosition(pos);
if (indentation !== tokenStart.character) {
let startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);
let startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);
if (indentation !== tokenStart.character || indentationIsDifferent(indentationString, startLinePosition)) {

@mhegazy mhegazy May 5, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just indentationString === soruceFile.text.substr(startLinePosition , indentationString.length);

recordReplace(startLinePosition, tokenStart.character, indentationString);
}
}
}

function indentationIsDifferent(indentationString: string, startLinePosition: number): boolean {
return indentationString !== sourceFile.text.substr(startLinePosition , indentationString.length);
}

function indentMultilineComment(commentRange: TextRange, indentation: number, firstLineIsIndented: boolean) {
// split comment in lines
let startLine = sourceFile.getLineAndCharacterOfPosition(commentRange.pos).line;
Expand Down Expand Up @@ -1152,4 +1156,4 @@ namespace ts.formatting {
return s;
}
}
}
}
35 changes: 35 additions & 0 deletions tests/cases/fourslash/formattingReplaceSpacesWithTabs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/// <reference path="fourslash.ts"/>

////module Foo {
/////*1*/class Test { }
/////*2*/ class Test { }
/////*3*/ class Test { }
/////*4*/ class Test { }
/////*5*/ class Test { }
/////*6*/ class Test { }
/////*7*/ class Test { }
////}

var options = format.copyFormatOptions();
options.ConvertTabsToSpaces = false;
var oldOptions = format.setFormatOptions(options);
try {
format.document();
goTo.marker("1");
verify.currentLineContentIs("\tclass Test { }")
goTo.marker("2");
verify.currentLineContentIs("\tclass Test { }")
goTo.marker("3");
verify.currentLineContentIs("\tclass Test { }")
goTo.marker("4");
verify.currentLineContentIs("\tclass Test { }")
goTo.marker("5");
verify.currentLineContentIs("\tclass Test { }")
goTo.marker("6");
verify.currentLineContentIs("\tclass Test { }")
goTo.marker("7");
verify.currentLineContentIs("\tclass Test { }")
}
finally {
format.setFormatOptions(oldOptions);
}
27 changes: 27 additions & 0 deletions tests/cases/fourslash/formattingReplaceTabsWithSpaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/// <reference path="fourslash.ts"/>

////module Foo {
/////*1*/ class Test { }
/////*2*/ class Test { }
/////*3*/class Test { }
/////*4*/ class Test { }
/////*5*/ class Test { }
/////*6*/ class Test { }
/////*7*/ class Test { }
////}

format.document();
goTo.marker("1");
verify.currentLineContentIs(" class Test { }")
goTo.marker("2");
verify.currentLineContentIs(" class Test { }")
goTo.marker("3");
verify.currentLineContentIs(" class Test { }")
goTo.marker("4");
verify.currentLineContentIs(" class Test { }")
goTo.marker("5");
verify.currentLineContentIs(" class Test { }")
goTo.marker("6");
verify.currentLineContentIs(" class Test { }")
goTo.marker("7");
verify.currentLineContentIs(" class Test { }")