Skip to content

WIP attempt to fix code folding provider in VSCode 1.25 #1410

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

Closed
wants to merge 2 commits into from

Conversation

rkeithhill
Copy link
Contributor

@rkeithhill rkeithhill commented Jul 9, 2018

PR Summary

VSCode 1.25 updated its vscode-textmate npm module from v3.3.3 to v4. In the process, that module removed a method we relied upon. I've substituted in the new method but it isn't working right.

I also added an ILogger interface to make the MockLogger easier to implement and hopefully make the tests a bit more reliable.

@glennsarti could you please take a look at this. Feel free to checkout this branch and update it.

PR Checklist

Note: Tick the boxes below that apply to this pull request by putting an x between the square brackets.
Please mark anything not applicable to this PR NA.

  • PR has a meaningful title
  • Summarized changes
  • This PR is ready to merge and is not work in progress
    • If the PR is work in progress, please add the prefix WIP: to the beginning of the title and remove the prefix when the PR is ready

@rkeithhill rkeithhill requested a review from TylerLeonhardt July 9, 2018 02:11
The logging issue was elsewhere. I submitted a different PR to fix it.
@rkeithhill
Copy link
Contributor Author

Note that it builds successfully because I switched from the "removed" method to use the new method. Unfortunately, I'm not using the new method hard enough because it's not getting back an IGrammar object.

@glennsarti
Copy link
Contributor

The idea looks good!

@rkeithhill
Copy link
Contributor Author

rkeithhill commented Jul 9, 2018

One issue is now we either have to require VSCode 1.25 or we have conditional code for <= 1.24 and >= 1.25.

@glennsarti
Copy link
Contributor

Yeah I thought that too.... Ideally branching on the major version of the vscode-textmate module

@glennsarti
Copy link
Contributor

@rkeithhill I've put up my own version of your PR at #1414

@rkeithhill
Copy link
Contributor Author

Going with @glennsarti PR #1414

@rkeithhill rkeithhill closed this Jul 9, 2018
@rkeithhill rkeithhill deleted the rkeithhill/fix-code-folding-provider branch July 9, 2018 14:49
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