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

Merge pull request #1746 from Microsoft/formattingTemplateLiterals

Browse Source 
fixed smart indentation\formatting in template literals
This commit is contained in:
Vladimir Matveev
2015-01-20 17:54:47 -08:00
parent bb33167f7e 8497667f33
commit 7f749909da
5 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/cases/fourslash/formatTemplateLiteral.ts Normal file
View File

@@ -0,0 +1,13 @@
/// <reference path="fourslash.ts"/>
////var x = `sadasdasdasdasfegsfd
/////*1*/rasdesgeryt35t35y35 e4 ergt er 35t 3535 `;
////var y = `1${2}/*2*/3`;
goTo.marker("1");
edit.insert("\r\n"); // edit will trigger formatting - should succeeed
goTo.marker("2");
edit.insert("\r\n");
verify.indentationIs(0);
verify.currentLineContentIs("3`;")

17
tests/cases/fourslash/smartIndentTemplateLiterals.ts Normal file
View File

@@ -0,0 +1,17 @@
/// <reference path="fourslash.ts"/>
////var x0 = `sadasdasdasdas/*1*/fegsfdrasdesgeryt35t35y35 e4 ergt er 35t 3535 `;
////var x1 = `sadasdasdasdas/*2*/fegsfdr${0}asdesgeryt35t35y35 e4 ergt er 35t 3535 `;
////var x2 = `sadasdasdasdasfegsfdra${0}sdesge/*3*/ryt35t35y35 e4 ergt er 35t 3535 `;
////var x3 = `sadasdasdasdasfegsfdra${0}sdesge/*4*/ryt35${1}t35y35 e4 ergt er 35t 3535 `;
////var x2 = `sadasdasdasdasfegsfdra${0}sdesge${1}sf/*5*/ryt35t35y35 e4 ergt er 35t 3535 `;
function verifyIndentation(marker: string): void {
goTo.marker(marker);
edit.insert("\r\n");
verify.indentationIs(0);
}
verifyIndentation("1");
verifyIndentation("2");
verifyIndentation("3");
verifyIndentation("4");
verifyIndentation("5");