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

Code folding #5761

Merged
merged 7 commits into from Jan 20, 2019
Merged

Code folding #5761

merged 7 commits into from Jan 20, 2019

Conversation

@fcollonval
Copy link
Member

@fcollonval fcollonval commented Dec 13, 2018

Fixes #4083

Screenshots
codefolding

Copy link
Member

@ian-r-rose ian-r-rose left a comment

Thanks @fcollonval, this looks great. I have a few comments, similar to #5750, but overall it looks sound and works well.

packages/codeeditor/src/editor.ts Outdated Show resolved Hide resolved
packages/fileeditor-extension/schema/plugin.json Outdated Show resolved Hide resolved
packages/codemirror/src/editor.ts Outdated Show resolved Hide resolved
@fcollonval
Copy link
Member Author

@fcollonval fcollonval commented Jan 11, 2019

I went for the new proposal. What do you think?

Copy link
Member

@ian-r-rose ian-r-rose left a comment

Very nice! I think your getActiveGutters approach is much cleaner.
I've added a note for how to get rid of the tsc error, and then I am happy to merge!

Also, it looks like this has conflicts with the rulers branch, so it will need a rebase.

packages/codemirror/src/editor.ts Outdated Show resolved Hide resolved
@ian-r-rose
Copy link
Member

@ian-r-rose ian-r-rose commented Jan 16, 2019

@fcollonval pinging on this

@fcollonval
Copy link
Member Author

@fcollonval fcollonval commented Jan 18, 2019

@ian-r-rose here it is 😉

Copy link
Member

@ian-r-rose ian-r-rose left a comment

Thanks @fcollonval! FYI I pushed a commit increasing the memory limit on appveyor, since that was frequently running into node stack errors.

@ian-r-rose ian-r-rose merged commit e2b7087 into jupyterlab:master Jan 20, 2019
3 checks passed
@fcollonval fcollonval deleted the code-folding branch Apr 30, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Aug 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants