From 67f5351c75e62f9f9a051193ff06483fde3edf4c Mon Sep 17 00:00:00 2001 From: Tom <26638278+tomblind@users.noreply.github.com> Date: Sat, 16 Mar 2019 12:44:32 -0600 Subject: [PATCH 1/2] removed escape from backtick --- src/TSHelper.ts | 1 - test/translation/lua/characterEscapeSequence.lua | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/TSHelper.ts b/src/TSHelper.ts index 2de95d570..4c82441b9 100644 --- a/src/TSHelper.ts +++ b/src/TSHelper.ts @@ -677,7 +677,6 @@ export class TSHelper { const escapeSequences: Array<[RegExp, string]> = [ [/[\\]/g, "\\\\"], [/[\']/g, "\\\'"], - [/[\`]/g, "\\\`"], [/[\"]/g, "\\\""], [/[\n]/g, "\\n"], [/[\r]/g, "\\r"], diff --git a/test/translation/lua/characterEscapeSequence.lua b/test/translation/lua/characterEscapeSequence.lua index 36abfe9d0..f54f6b246 100644 --- a/test/translation/lua/characterEscapeSequence.lua +++ b/test/translation/lua/characterEscapeSequence.lua @@ -3,7 +3,7 @@ local quoteInTemplateString = "\' \' \'"; local doubleQuoteInQuotes = "\" \" \""; local doubleQuoteInDoubleQuotes = "\" \" \""; local doubleQuoteInTemplateString = "\" \" \""; -local escapedCharsInQuotes = "\\ \0 \b \t \n \v \f \" \' \`"; -local escapedCharsInDoubleQUotes = "\\ \0 \b \t \n \v \f \" \' \`"; -local escapedCharsInTemplateString = "\\ \0 \b \t \n \v \f \" \' \`"; +local escapedCharsInQuotes = "\\ \0 \b \t \n \v \f \" \' `"; +local escapedCharsInDoubleQUotes = "\\ \0 \b \t \n \v \f \" \' `"; +local escapedCharsInTemplateString = "\\ \0 \b \t \n \v \f \" \' `"; local nonEmptyTemplateString = "Level 0: \n\t " .. (tostring("Level 1: \n\t\t " .. (tostring("Level 3: \n\t\t\t " .. (tostring("Last level \n --") .. " \n --")) .. " \n --")) .. " \n --"); From b3a0f2ab5530073e6f59d7e213a18239c4358efa Mon Sep 17 00:00:00 2001 From: Tom <26638278+tomblind@users.noreply.github.com> Date: Sat, 16 Mar 2019 16:30:09 -0600 Subject: [PATCH 2/2] tweaked test to make more sense --- test/translation/lua/characterEscapeSequence.lua | 5 ++++- test/translation/ts/characterEscapeSequence.ts | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/test/translation/lua/characterEscapeSequence.lua b/test/translation/lua/characterEscapeSequence.lua index f54f6b246..82f43bbaa 100644 --- a/test/translation/lua/characterEscapeSequence.lua +++ b/test/translation/lua/characterEscapeSequence.lua @@ -3,7 +3,10 @@ local quoteInTemplateString = "\' \' \'"; local doubleQuoteInQuotes = "\" \" \""; local doubleQuoteInDoubleQuotes = "\" \" \""; local doubleQuoteInTemplateString = "\" \" \""; +local backQuoteInQuotes = "` ` `"; +local backQuoteInDoubleQuotes = "` ` `"; +local backQuoteInTemplateString = "` ` `"; local escapedCharsInQuotes = "\\ \0 \b \t \n \v \f \" \' `"; -local escapedCharsInDoubleQUotes = "\\ \0 \b \t \n \v \f \" \' `"; +local escapedCharsInDoubleQUotes = "\\ \0 \b \t \n \v \f \" \'"; local escapedCharsInTemplateString = "\\ \0 \b \t \n \v \f \" \' `"; local nonEmptyTemplateString = "Level 0: \n\t " .. (tostring("Level 1: \n\t\t " .. (tostring("Level 3: \n\t\t\t " .. (tostring("Last level \n --") .. " \n --")) .. " \n --")) .. " \n --"); diff --git a/test/translation/ts/characterEscapeSequence.ts b/test/translation/ts/characterEscapeSequence.ts index f99683c32..e3ec0b741 100644 --- a/test/translation/ts/characterEscapeSequence.ts +++ b/test/translation/ts/characterEscapeSequence.ts @@ -5,8 +5,12 @@ let doubleQuoteInQuotes = '" " "'; let doubleQuoteInDoubleQuotes = "\" \" \""; let doubleQuoteInTemplateString = `" " "`; +let backQuoteInQuotes = '` ` `'; +let backQuoteInDoubleQuotes = "` ` `"; +let backQuoteInTemplateString = `\` \` \``; + let escapedCharsInQuotes = '\\ \0 \b \t \n \v \f \" \' \`'; -let escapedCharsInDoubleQUotes = "\\ \0 \b \t \n \v \f \" \' \`"; +let escapedCharsInDoubleQUotes = "\\ \0 \b \t \n \v \f \" \'"; let escapedCharsInTemplateString = `\\ \0 \b \t \n \v \f \" \' \``; let nonEmptyTemplateString = `Level 0: \n\t ${`Level 1: \n\t\t ${`Level 3: \n\t\t\t ${'Last level \n --'} \n --`} \n --`} \n --`;