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

Flatten all the editing methods into DAG #34

Merged
merged 19 commits into from
Dec 10, 2020
Merged

Conversation

kneasle
Copy link
Owner

@kneasle kneasle commented Dec 6, 2020

Resolves #24.

TODO:

  • Fix the fact that inserting siblings of a field is VERY broken
  • Deal with the results from the Ast operations
  • Perhaps replace CannotInsertInto and CannotReplace with something like InvalidChild

@kneasle kneasle force-pushed the edit-method-cleanup branch 5 times, most recently from 37cb13b to 3ca0d35 Compare December 7, 2020 11:12
src/editable_tree/mod.rs Outdated Show resolved Hide resolved
src/editable_tree/mod.rs Outdated Show resolved Hide resolved
@kneasle
Copy link
Owner Author

kneasle commented Dec 7, 2020

@Kixunil, what do you think of this? I think most of the stuff has been pretty good and feels much better, except the things I've flagged up - this still took me most of yesterday, though 😆.

@kneasle kneasle marked this pull request as ready for review December 7, 2020 17:36
src/editable_tree/mod.rs Outdated Show resolved Hide resolved
src/editable_tree/mod.rs Outdated Show resolved Hide resolved
src/editable_tree/mod.rs Outdated Show resolved Hide resolved
src/editable_tree/mod.rs Show resolved Hide resolved
src/editable_tree/mod.rs Show resolved Hide resolved
src/editable_tree/mod.rs Outdated Show resolved Hide resolved
src/editor.rs Outdated Show resolved Hide resolved
@kneasle
Copy link
Owner Author

kneasle commented Dec 10, 2020

Right I think in the interests of letting other stuff happen and not generate merge conflicts, I think we should merge this. I fixed a very rogue crash bug that had been introduced earlier, but it's seeming pretty stable now. We could do with some integration tests, but that's for another PR I reckon.

@Kixunil, what do you think?

@Kixunil
Copy link
Contributor

Kixunil commented Dec 10, 2020

Sounds good. We can always refactor more later. Doing it in chunks is better anyway.

@kneasle
Copy link
Owner Author

kneasle commented Dec 10, 2020

Coool! Done another rebase to fix merge conflicts, now merging...

@kneasle kneasle merged commit 4532e7b into master Dec 10, 2020
@kneasle kneasle deleted the edit-method-cleanup branch December 10, 2020 16:47
kneasle added a commit that referenced this pull request Dec 10, 2020
After #34, inserting into JSON objects is now possible.  This is now reflected in the README.
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.

is_insert_char seems to be redundant
2 participants