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

Make lean3 an alias of Lean #2546

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Make lean3 an alias of Lean #2546

merged 5 commits into from
Oct 26, 2023

Conversation

eric-wieser
Copy link
Contributor

At some point there might be a push to make lean refer to Lean 4. This is consistent with how python2 is used for Python 2 code.

@Anteru
Copy link
Collaborator

Anteru commented Oct 25, 2023

This is broken now as I merged the other lean change. Would you mind rebasing this?

At some point there might be a push to make `lean` refer to Lean 4.
This is consistent with how `python2` is used for Python 2 code.
@eric-wieser
Copy link
Contributor Author

Done

@jeanas
Copy link
Contributor

jeanas commented Oct 26, 2023

Looks good, but could you also add a definition Lean3Lexer = LeanLexer?

@jeanas
Copy link
Contributor

jeanas commented Oct 26, 2023

(Hello @PatrickMassot :)

@eric-wieser
Copy link
Contributor Author

@jeanas: does the commit I just pushed look ok?

@jeanas
Copy link
Contributor

jeanas commented Oct 26, 2023

Almost — __all__ should still contain LeanLexer.

@eric-wieser
Copy link
Contributor Author

Done; this results in the mapping file being updated too, but I guess that's ok?

@eric-wieser
Copy link
Contributor Author

Adding such an alias to __all__ breaks the test. I could switch to class LeanLexer(Lean3Lexer): pass if you prefer?

@jeanas
Copy link
Contributor

jeanas commented Oct 26, 2023

Yes, it's ok. However, it now complains that there are several conflicting lexers for the same file types. Never mind, I'll fix it.

@eric-wieser
Copy link
Contributor Author

I think I found the fix

@jeanas
Copy link
Contributor

jeanas commented Oct 26, 2023

Yes, looks right now.

@jeanas jeanas merged commit 74fab4e into pygments:master Oct 26, 2023
15 checks passed
@eric-wieser
Copy link
Contributor Author

Thanks!

@eric-wieser eric-wieser deleted the lean3-alias branch October 26, 2023 11:19
@Anteru Anteru added this to the 2.17 milestone Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants