Skip to content

removed escape from backtick #482

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
tomblind merged 2 commits into from
Mar 17, 2019
Merged

removed escape from backtick #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67f5351
removed escape from backtick
tomblind Mar 16, 2019
b3a0f2a
tweaked test to make more sense
tomblind Mar 16, 2019
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
1 change: 0 additions & 1 deletion src/TSHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,6 @@ export class TSHelper {
const escapeSequences: Array<[RegExp, string]> = [
[/[\\]/g, "\\\\"],
[/[\']/g, "\\\'"],
[/[\`]/g, "\\\`"],
[/[\"]/g, "\\\""],
[/[\n]/g, "\\n"],
[/[\r]/g, "\\r"],
Expand Down
9 changes: 6 additions & 3 deletions test/translation/lua/characterEscapeSequence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ 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 backQuoteInQuotes = "` ` `";
local backQuoteInDoubleQuotes = "` ` `";
local backQuoteInTemplateString = "` ` `";
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 --");
6 changes: 5 additions & 1 deletion test/translation/ts/characterEscapeSequence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 --`;