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.

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

Meta: bump ecmarkup to 15.0.0 and apply new formatting/lint rules #2901

Merged
merged 4 commits into from
Nov 2, 2022

Conversation

bakkot
Copy link
Contributor

@bakkot bakkot commented Sep 8, 2022

Depends on #2896, and is based on that branch.

I recommend reviewing commits individually, and commits should land individually.

The "Markup: replace HTML entities" commit was generated by running npm run format; no manual changes were applied. Sidebar: we sure do have a lot of fancy quote marks.

The "Markup: mark certain non-obvious variable declarations" commit is necessary to get the linter's new "variables must be defined" lint to pass; the ten lines it touches make use of variables in non-obvious ways that I didn't want to teach the linter about.


This has landed and will inevitably cause merge conflicts with almost everything, but fear not, you don't need to deal with it manually. To rebase a branch onto this, you can use the following commands:

git rebase -i 0090daf^ # 0090daf is the commit where the formatter is applied
git rebase -X theirs 0090daf --exec "npm i && npm run format && git commit --amend -a --no-edit"
git rebase -i main

This splits up the rebase into 1) everything before the formatter was applied, 2) the formatter, which will be done for you, 3) everything after the formatter. any conflicts in parts 1 and 3 you will need to handle manually, just like you would in the absence of the formatter (or feel free to ask the editors for help).

spec.html Outdated Show resolved Hide resolved
@@ -29911,7 +29911,7 @@ <h1>Function ( _p1_, _p2_, &hellip; , _pn_, _body_ )</h1>
<p>This function performs the following steps when called:</p>
<emu-alg>
1. Let _C_ be the active function object.
1. Let _args_ be the _argumentsList_ that was passed to this function by [[Call]] or [[Construct]].
1. [declared="argumentsList"] Let _args_ be the _argumentsList_ that was passed to this function by [[Call]] or [[Construct]].
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI see #2902

spec.html Outdated Show resolved Hide resolved
Copy link
Member

@michaelficarra michaelficarra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but I'd like to see #2902 and #2911 resolved first.

@bakkot bakkot force-pushed the combine-has-call-in-tail-position branch from b086396 to f3bc5bc Compare October 20, 2022 01:50
@bakkot bakkot force-pushed the add-declared-attributes branch from 1fbe3fb to 69197b6 Compare October 20, 2022 02:19
@bakkot
Copy link
Contributor Author

bakkot commented Oct 20, 2022

This now incorporates changes necessary to make #2902 pass. It also adds a new marked non-obvious declaration for an alias introduced in #2781 (in a fixup commit, which should get squashed into the "mark certain non-obvious variable declarations" commit when landing).

It's ready to go as soon as #2896 lands, and will then un-block #2902.

@ljharb ljharb force-pushed the combine-has-call-in-tail-position branch from f3bc5bc to cf1ea07 Compare October 20, 2022 05:20
Base automatically changed from combine-has-call-in-tail-position to main October 20, 2022 05:23
@bakkot bakkot added the ready to merge Editors believe this PR needs no further reviews, and is ready to land. label Oct 20, 2022
@ljharb ljharb force-pushed the add-declared-attributes branch from 69197b6 to 0090daf Compare November 2, 2022 21:56
@ljharb ljharb merged commit 0090daf into main Nov 2, 2022
@ljharb ljharb deleted the add-declared-attributes branch November 2, 2022 22:03
ptomato added a commit to tc39/proposal-temporal that referenced this pull request Jul 24, 2024
ptomato added a commit to tc39/proposal-temporal that referenced this pull request Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge Editors believe this PR needs no further reviews, and is ready to land.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants