-
Notifications
You must be signed in to change notification settings - Fork 647
Port TypeScript PR #60303: Fix template string escaping #1142
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.
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
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
45314e4
Initial plan for issue
Copilot 3e616fb
Initial plan for TypeScript PR #60303 template string escaping fix
Copilot 1d3732b
Fix template string escaping per TypeScript PR #60303
Copilot 942edc6
Fix template string escaping: change ch < '\u001f' to ch <= '\u001f'
Copilot 9f87b5f
Remove TestEscapeStringTemplateStrings test as it duplicates existing…
Copilot fadf221
Add test for template string escaping fix and force escaping for cont…
Copilot f5a06a8
Simplify template string escaping fix by removing unnecessary canUseO…
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrewbranch marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
package printer_test | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/microsoft/typescript-go/internal/ast" | ||
"github.com/microsoft/typescript-go/internal/testutil/emittestutil" | ||
"github.com/microsoft/typescript-go/internal/testutil/parsetestutil" | ||
) | ||
|
||
// TestTemplateStringEscapingFix tests the fix for TypeScript issue #59150 | ||
// This test mirrors the test case added in TypeScript PR #60303 | ||
func TestTemplateStringEscapingFix(t *testing.T) { | ||
t.Parallel() | ||
|
||
// https://github.com/microsoft/TypeScript/issues/59150 | ||
// Replicates: printsCorrectly("template string", {}, printer => | ||
// printer.printNode( | ||
// ts.EmitHint.Unspecified, | ||
// ts.factory.createNoSubstitutionTemplateLiteral("\n"), | ||
// ts.createSourceFile("source.ts", "", ts.ScriptTarget.ESNext), | ||
// )); | ||
|
||
var factory ast.NodeFactory | ||
|
||
// Create a synthetic NoSubstitutionTemplateLiteral with just a newline character | ||
templateLiteral := factory.NewNoSubstitutionTemplateLiteral("\n") | ||
|
||
// Create a synthetic source file | ||
file := factory.NewSourceFile("/source.ts", "/source.ts", "/source.ts", factory.NewNodeList([]*ast.Node{ | ||
factory.NewExpressionStatement(templateLiteral), | ||
})) | ||
ast.SetParentInChildren(file) | ||
parsetestutil.MarkSyntheticRecursive(file) | ||
|
||
// The fix ensures that LF newlines are NOT escaped in template literals | ||
// Expected: `\n` (with literal newline character, not escaped) | ||
// Bug would produce: `\\n` (with escaped newline) | ||
emittestutil.CheckEmit(t, nil, file.AsSourceFile(), "`\n`;") | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was mistaken; this test passes even without this PR's change. Add a test which would have failed before this PR's fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a test case for
\u001f
character in template literals that would have failed before this PR's fix. The test demonstrates that\u001f
is now properly escaped to\u001F
while preserving the correct behavior for\n
(which should not be escaped). Commit fadf221.