Skip to content
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

Jump to bottom

Create HTML with dom.ts#$ function calls instead of string concatenation #105510

Merged
merged 1 commit into from
Aug 31, 2020
Merged

Create HTML with dom.ts#$ function calls instead of string concatenation #105510

merged 1 commit into from
Aug 31, 2020

Conversation

annkamsk
Copy link
Contributor

This PR fixes #105509.

@jrieken jrieken requested a review from aeschli August 28, 2020 08:34
@aeschli
Copy link
Contributor

aeschli commented Aug 28, 2020

@annkamsk Thanks a lot!

When I try the changes, I get the following
image

See the missing symbol name on top, and the scope trace that's on a single line.
Maybe a merge conflict with #105502 that I already merged?

@annkamsk annkamsk force-pushed the dom-api-inspect-editor-tokens branch from 5c01fcc to 1ad6332 Compare August 28, 2020 12:33
@annkamsk
Copy link
Contributor Author

@aeschli hi!
It wasn't a merge conflict as this PR and #105502 didn't really have much in common. I just didn't spot that the _renderTokenStyleDefinition also returns html tags inside the string. Now everything should be fixed.

@aeschli aeschli merged commit b0a00a0 into microsoft:master Aug 31, 2020
@aeschli
Copy link
Contributor

aeschli commented Aug 31, 2020

@annkamsk Looks good, thanks a lot!

@aeschli aeschli added this to the August 2020 milestone Aug 31, 2020
@github-actions github-actions bot locked and limited conversation to collaborators Oct 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@aeschli aeschli Awaiting requested review from aeschli

Assignees

@aeschli aeschli

Labels
None yet
Projects
None yet
Milestone
August 2020
2 participants
@annkamsk @aeschli