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

fix: update aura html grammar scope #5159

Merged
merged 2 commits into from
Oct 17, 2023

Conversation

gbockus-sf
Copy link
Contributor

@gbockus-sf gbockus-sf commented Oct 17, 2023

What does this PR do?

The html grammar in the Aura extension had a three part name that forced it to take precedence when looking at html associated files. (text.html.basic). This has been reported as an issue a couple of times for php which has an html grammar scope of (html.php).

I altered the scope name to be simpler (aura.html) and now php html files are correctly parsed and visually marked up by the php grammar file.

What issues does this PR fix or reference?

@W-10934996@
#5154
#1988

Functionality Before

image

Functionality After

Aura html file still works properly
image

php files also works properly
image

@gbockus-sf gbockus-sf requested a review from a team as a code owner October 17, 2023 05:45
@@ -116,7 +116,7 @@
"grammars": [
{
"language": "html",
"scopeName": "text.html.basic",
"scopeName": "aura.html",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

By making this name have 2 parts instead of 3 it keeps it from overriding the styles incorrectly for php html.

@gbockus-sf gbockus-sf requested review from daphne-sfdc and removed request for randi274 October 17, 2023 05:49
Copy link
Contributor

@daphne-sfdc daphne-sfdc left a comment

Choose a reason for hiding this comment

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

Approved! 🎉 Thanks for the fix!

@gbockus-sf gbockus-sf merged commit 1b63138 into develop Oct 17, 2023
15 checks passed
@gbockus-sf gbockus-sf deleted the gbockus/W-10934996-reduce-scope-on-aura-html branch October 17, 2023 17:29
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.

None yet

2 participants