From 3e572f5b71dc38125f3d01114e4f7efc724ca00c Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Fri, 28 Aug 2015 00:00:34 +0900 Subject: [PATCH 1/3] change some template literal tests --- tests/cases/fourslash/formatTemplateLiteral.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cases/fourslash/formatTemplateLiteral.ts b/tests/cases/fourslash/formatTemplateLiteral.ts index 29e58160cc..007ebb344f 100644 --- a/tests/cases/fourslash/formatTemplateLiteral.ts +++ b/tests/cases/fourslash/formatTemplateLiteral.ts @@ -2,8 +2,8 @@ ////var x = `sadasdasdasdasfegsfd /////*1*/rasdesgeryt35t35y35 e4 ergt er 35t 3535 `; ////var y = `1${2}/*2*/3`; -////let z= `foo`/*3*/ -////let w= `bar${3}`/*4*/ +////String.raw`foo`/*3*/ +////String.raw `bar${3}`/*4*/ ////String.raw //// `template`/*5*/ @@ -18,10 +18,10 @@ verify.currentLineContentIs("3`;") goTo.marker("3"); edit.insert(";"); -verify.currentLineContentIs("let z = `foo`;"); +verify.currentLineContentIs("String.raw `foo`;"); goTo.marker("4"); edit.insert(";"); -verify.currentLineContentIs("let w = `bar${3}`;"); +verify.currentLineContentIs("String.raw `bar${3}`;"); goTo.marker("5"); edit.insert(";"); From 070353538158b62c7b877cc2db1be4ecfa5e6441 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Fri, 28 Aug 2015 23:12:30 +0900 Subject: [PATCH 2/3] Do not replace but do extend --- tests/cases/fourslash/formatTemplateLiteral.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tests/cases/fourslash/formatTemplateLiteral.ts b/tests/cases/fourslash/formatTemplateLiteral.ts index 007ebb344f..45ad17c4c9 100644 --- a/tests/cases/fourslash/formatTemplateLiteral.ts +++ b/tests/cases/fourslash/formatTemplateLiteral.ts @@ -2,10 +2,12 @@ ////var x = `sadasdasdasdasfegsfd /////*1*/rasdesgeryt35t35y35 e4 ergt er 35t 3535 `; ////var y = `1${2}/*2*/3`; -////String.raw`foo`/*3*/ -////String.raw `bar${3}`/*4*/ +////let z= `foo`/*3*/ +////let w= `bar${3}`/*4*/ ////String.raw //// `template`/*5*/ +////String.raw`foo`/*6*/ +////String.raw `bar${3}`/*7*/ goTo.marker("1"); @@ -18,11 +20,17 @@ verify.currentLineContentIs("3`;") goTo.marker("3"); edit.insert(";"); -verify.currentLineContentIs("String.raw `foo`;"); +verify.currentLineContentIs("let z = `foo`;"); goTo.marker("4"); edit.insert(";"); -verify.currentLineContentIs("String.raw `bar${3}`;"); +verify.currentLineContentIs("let w = `bar${3}`;"); goTo.marker("5"); edit.insert(";"); -verify.currentLineContentIs(" `template`;"); \ No newline at end of file +verify.currentLineContentIs(" `template`;"); +goTo.marker("6"); +edit.insert(";"); +verify.currentLineContentIs("String.raw `foo`;"); +goTo.marker("7"); +edit.insert(";"); +verify.currentLineContentIs("String.raw `bar${3}`;"); \ No newline at end of file From 019993ea8b926c71c89b985c166f28c141100070 Mon Sep 17 00:00:00 2001 From: SaschaNaz Date: Fri, 28 Aug 2015 23:13:15 +0900 Subject: [PATCH 3/3] remove spaces --- tests/cases/fourslash/formatTemplateLiteral.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cases/fourslash/formatTemplateLiteral.ts b/tests/cases/fourslash/formatTemplateLiteral.ts index 45ad17c4c9..6d1352fcf0 100644 --- a/tests/cases/fourslash/formatTemplateLiteral.ts +++ b/tests/cases/fourslash/formatTemplateLiteral.ts @@ -20,10 +20,10 @@ verify.currentLineContentIs("3`;") goTo.marker("3"); edit.insert(";"); -verify.currentLineContentIs("let z = `foo`;"); +verify.currentLineContentIs("let z = `foo`;"); goTo.marker("4"); edit.insert(";"); -verify.currentLineContentIs("let w = `bar${3}`;"); +verify.currentLineContentIs("let w = `bar${3}`;"); goTo.marker("5"); edit.insert(";");