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

Replace 1C Enterprise grammar #7096

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

nixel2007
Copy link
Contributor

@nixel2007 nixel2007 commented Oct 17, 2024

Replace source repo for bsl (1C Enterprise) language

Description

Since atom was sunset and atom plugin is not maintained anymore, let's get grammar from vscode plugin.

Checklist:

Copy link
Member

@lildude lildude left a comment

Choose a reason for hiding this comment

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

I'm not sure how you did it, but we only need the cached license from the new grammar. Please remove the others.

@lildude lildude changed the title Replase bsl grammar source Replace 1C Enterprise grammar Oct 17, 2024
@nixel2007
Copy link
Contributor Author

nixel2007 commented Oct 17, 2024

@lildude yeah, they came from submodule init. let me change it.

@nixel2007
Copy link
Contributor Author

@lildude done

@nixel2007
Copy link
Contributor Author

Kindly ping @lildude

lildude
lildude previously approved these changes Oct 22, 2024
Copy link
Member

@lildude lildude left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

As an aside, there's really no need for the repeated pings. Why? 👇

Note: this PR will not be merged until close to when the next release is made. See here for more details.

@nixel2007
Copy link
Contributor Author

Hello, @lildude!

I just migrated grammar files in vsc-language-1c-bsl repo from tmLanguage (plist) to tmLanguage.json

I've checked other grammars in this repo and looks like linguist natively supports grammars in json, but I want to double check that everything will work during the linguist release.

How could I test, if new format of grammar works correctly? Thanks in advance.

@lildude
Copy link
Member

lildude commented Nov 6, 2024

How could I test, if new format of grammar works correctly? Thanks in advance.

Replace the grammar with itself like you did when replacing the old grammar with the new.

@nixel2007
Copy link
Contributor Author

Thanks, Colin.
I re-added the grammar and only warning I got was:

- Unknown keys in grammar: `source.sdbl` (in `syntaxes/1c-query.tmLanguage.json`) contains invalid keys (`displayName`)
- Unknown keys in grammar: `source.bsl` (in `syntaxes/1c.tmLanguage.json`) contains invalid keys (`displayName`)

This key is required to some other syntax highlighters (as shiki). Also I checked that new grammar file works in VSCode without errors.

I rebased and pushed latest changes (with new sha for submodule, just in case).
Thanks for your support.

@nixel2007 nixel2007 force-pushed the feature/replqce-bsl branch 2 times, most recently from e5275e4 to 3f13173 Compare November 6, 2024 11:55
@lildude lildude added this pull request to the merge queue Nov 25, 2024
Merged via the queue into github-linguist:main with commit 1b01393 Nov 25, 2024
5 checks passed
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.

2 participants