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.

Sign up for GitHub

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

Jump to bottom

[WIP] Fix/improve manual edit #211

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open

[WIP] Fix/improve manual edit #211

wants to merge 48 commits into from

Commits on May 7, 2018

  1. extendArray utility

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    72da019 View commit details
    Browse the repository at this point in the history

  2. Add IModel with parent field to all models

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    dfb4c69 View commit details
    Browse the repository at this point in the history

  3. Have tests use IModel parent

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    c568019 View commit details
    Browse the repository at this point in the history

  4. Allow forcing 4-way view

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    6a68099 View commit details
    Browse the repository at this point in the history

  5. Add unchanged models for deleted cells 

    Need to be there for manual edits.
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    cdad268 View commit details
    Browse the repository at this point in the history

  6. Manual edits WIP

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    6169cfb View commit details
    Browse the repository at this point in the history

  7. Add yellow highlighting for custom diffs

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    13dcd61 View commit details
    Browse the repository at this point in the history

  8. Do not highlight custom characters 

    All custom edits gets their own lines, so character highlighting is
unnecessary.
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    a53dab9 View commit details
    Browse the repository at this point in the history

  9. Fix picker for custom diffs

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    d4f065a View commit details
    Browse the repository at this point in the history

  10. Fix replaceArray bug

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    97e88f9 View commit details
    Browse the repository at this point in the history

  11. Improve partial finding

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    a32b4a1 View commit details
    Browse the repository at this point in the history

  12. Improve/fix edit/diff overlap matching

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    42c8a65 View commit details
    Browse the repository at this point in the history

  13. Label manual edits with source

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    2fae680 View commit details
    Browse the repository at this point in the history

  14. Fix tests

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    80ed514 View commit details
    Browse the repository at this point in the history

  15. Copy source when converting patch ops

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    6cffc25 View commit details
    Browse the repository at this point in the history

  16. Adjust getPartials

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    bbc9139 View commit details
    Browse the repository at this point in the history

  17. Ensure manual diff is labeled with source

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    e7c136e View commit details
    Browse the repository at this point in the history

  18. Rename findDeletionOverlap -> findEditOverlap

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    071dbc1 View commit details
    Browse the repository at this point in the history

  19. Add editing of unchanged models

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    35730e0 View commit details
    Browse the repository at this point in the history

  20. Add level to manual edit tests

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    c08a168 View commit details
    Browse the repository at this point in the history

  21. Remove unneeded casting

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    f980c97 View commit details
    Browse the repository at this point in the history

  22. Fix convertPatchOps 

    - Use actual patched value
- Copy over source also if it is not present on patch op itself
(typically for pushed patches)
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    472353f View commit details
    Browse the repository at this point in the history

  23. Allow findEditOverlap to also accept patch ops

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    7a7c491 View commit details
    Browse the repository at this point in the history

  24. combineDecisions also combines local/remote diff

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    99739fd View commit details
    Browse the repository at this point in the history

  25. Add ability to edit patched cells

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    0889421 View commit details
    Browse the repository at this point in the history

  26. Invalidate edited model

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    96c2a30 View commit details
    Browse the repository at this point in the history

  27. Enable tests for unchanged model

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    15bde1e View commit details
    Browse the repository at this point in the history

  28. Adjustments to edit of patched cells

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    ecead75 View commit details
    Browse the repository at this point in the history

  29. MergeView code for editing by hand

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    c6543ef View commit details
    Browse the repository at this point in the history

  30. Mark origin of syncModel editor text replacements

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    2f1e246 View commit details
    Browse the repository at this point in the history

  31. Outline decisions with mixed sources

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    0af12a4 View commit details
    Browse the repository at this point in the history

  32. Consider line no. changes in syncModel updating

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    d063f38 View commit details
    Browse the repository at this point in the history

  33. Web: Improve manual edit decision overlap detection

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    77bc591 View commit details
    Browse the repository at this point in the history

  34. Mergeview: Adjust syncing 

    Don't try to replace text if already synced (will lead to invalid
value).
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    5f12315 View commit details
    Browse the repository at this point in the history

  35. Fix manual edit tests for deleted cells

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    718f13a View commit details
    Browse the repository at this point in the history

  36. Fix replaceArrayContent bug

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    e99c846 View commit details
    Browse the repository at this point in the history

  37. Add getMatchinBaseLine clipping

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    ba24353 View commit details
    Browse the repository at this point in the history

  38. Adjust merge styles 

    Don't apply mixed chunk borders on top of custom chunks
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    331dd41 View commit details
    Browse the repository at this point in the history

  39. Avoid race condition in manual edit 

    The value of `cm.getValue()` was previously not well-defined if multiple
changes had occurred within the same operation (e.g. a newline followed
by an automatic indent). By reconstructing ourself, we should be OK as
long as model stays in sync!
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    315b08d View commit details
    Browse the repository at this point in the history

  40. Web: Don't combine diffs in flattenStringDiffs 

    Assumed not to be critical. If reverting, some of the manual edit
alignment might be off, as line chunking becomes unreliable.
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    981c1d3 View commit details
    Browse the repository at this point in the history

  41. Lint

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    770ba83 View commit details
    Browse the repository at this point in the history

  42. Manual edit: Affected diffs use offset of preceding

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    b540e55 View commit details
    Browse the repository at this point in the history

  43. Manual edit: Fix paths + decision combining

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    2f061ac View commit details
    Browse the repository at this point in the history

  44. Fix bug in forceFourWayViews

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    8d2ec89 View commit details
    Browse the repository at this point in the history

  45. Manual edit: Simplify add/remove of full lines 

    Always choose the simplest diff.
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    7b0ceb6 View commit details
    Browse the repository at this point in the history

  46. Remove unused imports

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    fee8b66 View commit details
    Browse the repository at this point in the history

  47. ManualEdit: Fix bug when syncing last range

    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    c49c68a View commit details
    Browse the repository at this point in the history

  48. Remove decision + picker when picking base on edit 

    If you undo a manual edit by using the pickers, the decision should be
deleted unless there is a local/remote diff. If all decisions of a chunk
are removed, the picker should be removed as well.
    @vidartf
    vidartf committed May 7, 2018
    Configuration menu
    Copy the full SHA
    0d97fc9 View commit details
    Browse the repository at this point in the history