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

Improve merged file generation #283

Merged

Conversation

tobil4sk
Copy link
Contributor

This removes a couple differences between the merged files generated here and the upstreamed files in the vim repository:

@HerringtonDarkholme HerringtonDarkholme merged commit b325c44 into HerringtonDarkholme:master Aug 17, 2024
2 checks passed
@tobil4sk tobil4sk deleted the merged-file-generation branch August 17, 2024 08:41
@tobil4sk
Copy link
Contributor Author

tobil4sk commented Aug 17, 2024

@HerringtonDarkholme Thanks. I wonder, is there any need to keep the merged/typescript.vim and merged/typescriptreact.vim files? If the purpose of these files is just to make it easier to upstream to vim then maybe only merged/typescriptcommon.vim is needed?

EDIT: I did a search and it looks like this was only added to support upstreaming to vim: #113.

@HerringtonDarkholme
Copy link
Owner

I seldomly get patches from upstream vim and vim has been diverging from this repo for a long time.
The necessity of this merging script is not obvious TBH.

@tobil4sk
Copy link
Contributor Author

I seldomly get patches from upstream vim and vim has been diverging from this repo for a long time.
The necessity of this merging script is not obvious TBH.

As I've been working on my PRs I've been comparing against vim and vim hasn't diverged from this repo too much apart from a few changes that have been mentioned in the past (all solved in #288). The vim repo still says to come to this repo to contribute to the typescript syntax rather than making changes directly to the vim repo. The reason I found it useful to update this merge script is to make it easier to update the files in the vim repo with the recent changes here, so for me it seems like the necessity is still there.

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