maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1277 from Microsoft/formatting_regexes

Browse source 
handle regexes correctly in formatting
This commit is contained in:
Vladimir Matveev 2014-11-26 11:23:06 -08:00
parent cf3d28400e eda4b1bea0
commit 526aed36a0
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/services/formatting.ts
View file

@ -505,7 +505,7 @@ module ts.formatting {
if (isToken(child)) {
// if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules
var tokenInfo = formattingScanner.readTokenInfo(node);
var tokenInfo = formattingScanner.readTokenInfo(child);
Debug.assert(tokenInfo.token.end === child.end);
consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation);
return inheritedIndentation;

3
src/services/formatting/formattingScanner.ts
View file

@ -114,7 +114,8 @@ module ts.formatting {
}
function shouldRescanTemplateToken(container: Node): boolean {
return container.kind === SyntaxKind.TemplateSpan;
return container.kind === SyntaxKind.TemplateMiddle ||
container.kind === SyntaxKind.TemplateTail;
}
function startsWithSlashToken(t: SyntaxKind): boolean {

8
tests/cases/fourslash/formattingRegexes.ts Normal file
View file

@ -0,0 +1,8 @@
///<reference path="fourslash.ts"/>
////removeAllButLast(sortedTypes, undefinedType, /keepNullableType**/ true)/*1*/
goTo.marker("1");
edit.insert(";");
verify.currentLineContentIs("removeAllButLast(sortedTypes, undefinedType, /keepNullableType**/ true);");