Merge in COSMOS enhancements to ace-diff#119
Merged
ryan-pratt merged 15 commits intomasterfrom May 30, 2025
Merged
Conversation
jmthomas
commented
May 19, 2025
Collaborator
Author
jmthomas
left a comment
jmthomas
left a comment
There was a problem hiding this comment.
The majority of this was cleanup including var -> let and removing semicolons
src/diff-match-patch.js
Outdated
| // [new diff_match_patch.Diff(DIFF_EQUAL, mid_common)], | ||
| // diffs_b, | ||
| // ) | ||
| // } |
Collaborator
Author
There was a problem hiding this comment.
I didn't get good results with this part of the algorithm so commented it out
src/diff-match-patch.js
Outdated
| let commonString = edit.substring(edit.length - commonOffset) | ||
| equality1 = equality1.substring(0, equality1.length - commonOffset) | ||
| edit = commonString + edit.substring(0, edit.length - commonOffset) | ||
| equality2 = commonString + equality2 |
Collaborator
Author
There was a problem hiding this comment.
Fix to prefer training newlines in the diff
ryan-pratt
requested changes
May 20, 2025
package.json
Outdated
Comment on lines
8
to
11
| "serve": "vite build --watch --mode dev-server", | ||
| "dev": "vite server test --port 8081", | ||
| "build": "vite build", | ||
| "lint": "eslint src", |
Collaborator
There was a problem hiding this comment.
I don't think we should bring in the vite stuff since that was just to get it working in COSMOS 6. Bringing these changes to this repo will require extra work, and that's why the test workflow is failing
Collaborator
Author
There was a problem hiding this comment.
We could keep the existing parcel build but that went through a major release revision so it's still work.
ryan-pratt
approved these changes
May 30, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.