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

lang(json): make field key highlighting consistent with toml and yaml #10676

Merged
merged 1 commit into from
May 6, 2024
Merged

lang(json): make field key highlighting consistent with toml and yaml #10676

merged 1 commit into from
May 6, 2024

Conversation

cotneit
Copy link
Contributor

@cotneit cotneit commented May 4, 2024 •
edited
Loading

This PR makes json and json5 highlighting more consistent with yaml and toml by using @variable.other.member for member keys. Aside from being consistent with yaml and toml, this key simply makes sense in this context so it should be more consistent across all languages.

the-mikedavis
the-mikedavis approved these changes May 6, 2024
View reviewed changes
Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

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

The @keyword highlight for json always struck me as odd. I think it was done so themes like onedark would match how they look in other editors for JSON. I would prefer that we be consistent between languages like YAML/TOML though as you say

@pascalkuthe pascalkuthe merged commit 6876f92 into helix-editor:master May 6, 2024
6 checks passed
Vulpesx pushed a commit to Vulpesx/helix that referenced this pull request Jun 7, 2024
@cotneit @Vulpesx
lang(json): make field key highlighting consistent with toml and yaml (…
0d7cbf2 
…helix-editor#10676)
Chirikumbrah pushed a commit to Chirikumbrah/helix that referenced this pull request Jun 15, 2024
@cotneit @Chirikumbrah
lang(json): make field key highlighting consistent with toml and yaml (…
36da72c 
…helix-editor#10676)
smortime pushed a commit to smortime/helix that referenced this pull request Jul 10, 2024
@cotneit
lang(json): make field key highlighting consistent with toml and yaml (…
76f695b 
…helix-editor#10676)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pascalkuthe pascalkuthe pascalkuthe approved these changes

@the-mikedavis the-mikedavis the-mikedavis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cotneit @the-mikedavis @pascalkuthe