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

:reload #374

Merged
merged 27 commits into from
Jul 2, 2021
Merged

:reload #374

merged 27 commits into from
Jul 2, 2021

Conversation

kirawi
Copy link
Member

@kirawi kirawi commented Jun 24, 2021

This was only updated enough to pass compilation. I'll need to do some more work to get it working properly. I wonder if there's a way to be performant without using unsafe. Removed unsafe for now.

helix-view/src/document.rs Outdated Show resolved Hide resolved
helix-view/src/document.rs Outdated Show resolved Hide resolved
helix-view/Cargo.toml Outdated Show resolved Hide resolved
@kirawi
Copy link
Member Author

kirawi commented Jun 27, 2021

I've also added an simd feature for encoding_rs/simd-accel.

@kirawi kirawi marked this pull request as ready for review July 1, 2021 22:34
@kirawi
Copy link
Member Author

kirawi commented Jul 1, 2021

I'll move the simd into a separate PR.

helix-view/src/document.rs Outdated Show resolved Hide resolved
helix-core/src/diff.rs Outdated Show resolved Hide resolved
helix-core/src/diff.rs Outdated Show resolved Hide resolved
helix-view/src/document.rs Show resolved Hide resolved
helix-term/src/commands.rs Show resolved Hide resolved
helix-view/src/document.rs Show resolved Hide resolved
@cessen
Copy link
Contributor

cessen commented Jul 2, 2021

Over-all, this looks really great. The only comment I made that I really care about getting addressed is the one about the timeout length. But other than that, as far as I'm concerned it looks good to merge. Really clear, clean code. Awesome job!

@kirawi
Copy link
Member Author

kirawi commented Jul 2, 2021

Addressed the stuff in the review :)

Copy link
Contributor

@cessen cessen left a comment

Choose a reason for hiding this comment

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

Looks good to me!

Edit: oh, but looks like conflicts need to be addressed.

@archseer archseer merged commit c5b2973 into helix-editor:master Jul 2, 2021
@kirawi kirawi deleted the patch-reload branch August 22, 2021 01:05
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.

4 participants