Skip to content

fix(lib/writer): call ts.trivia with actual string #309

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
saschanaz merged 1 commit into from
Apr 19, 2019
Merged

fix(lib/writer): call ts.trivia with actual string #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion lib/writer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ export function write(ast, { templates: ts = templates } = {}) {
]);
}
function identifier(id) {
return wrap`${ts.trivia(id.trivia)}${reference(id.value)}${token(id.tokens.separator)}`;
return ts.wrap([
reference_token(id.tokens.value),
token(id.tokens.separator)
]);
}
function make_ext_at(it) {
const { rhsType } = it.params;
Expand Down
4 changes: 2 additions & 2 deletions test/writer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ describe("Writer template functions", () => {
});

it("catches trivia", () => {
const result = rewrite("/* longcat is long */ interface X {};", {
const result = rewrite("/* longcat is long */ [Exposed=( Window )] interface X {};", {
trivia: bracket
});
expect(result).toBe("</* longcat is long */ >interface< >X< >{<>}<>;<>");
expect(result).toBe("</* longcat is long */ >[<>Exposed<>=<>(< >Window< >)<>]< >interface< >X< >{<>}<>;<>");
});

it("catches names", () => {
Expand Down