-
Notifications
You must be signed in to change notification settings - Fork 1
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
Bump Packages dependency to point to Sourcegraph fork #9
Comments
I tried a bunch of configurations for running tests and here are the results:
†fa6b8629 is a commit from 2017 on sublimehq/st3 (there were some changes to that branch, until 2019), which is currently being using by upstream syntect/master. (Aside: Test failuresConfig 1 and 2
Config 4 and 5 - same failures as for 1 & 2, plus extra failure
Config 6 - same failures as for 1 & 2, except for:
|
On bisecting between the current
|
Closing this; we can bump the commit of Sourcegraph/Packages later. |
Reopened because the bump was incorrect -- we are not including any of the changes in Sourcegraph/Packages. |
Fixed in #11 |
I recently created a Sourcegraph-specific fork of Packages and updated it with changes from Stephen's fork.
sourcegraph/Packages#1
Additionally, this fork is largely up-to-date with upstream syntect.
However, when we try to update this fork to use a recent commit of sourcegraph/Packages, we run into issues because the grammars use features such as
meta_prepend:
etc. which are "new" in Sublime Text 4.Upstream is tracking adding support for these: trishume#323 ; there are several new features and it looks like every new feature is being used by some grammar in the Packages repo. 😬
There are a couple of options here:
Create a st3 branch in sourcegraph/Packages, and base it off a merge of the commit currently being used by syntect/master and slimsag/master. Point this repo to the st3 branch until upstream adds support for ST4 grammar features; after that we can update this repo and then point to the master branch instead of st3.
Since I recently fixed the merge conflicts for sourcegraph/Packages, maybe it's not that hard to do that for a st3 branch as well. If we pick this option, we should make sure to set up CI for the st3 branch and mention the branch in the README on the master branch.
Work with upstream to add support for newer ST4 grammar features.
These don't have to be mutually exclusive. Maybe we should do the first one in the short-term and the second one after that?
The text was updated successfully, but these errors were encountered: