Conversation
…rithmManager Implement side-by-side diff calculation with both synchronous and asynchronous variants. The new functionality converts unified diff results into a side-by-side format, maintaining alignment between left and right sides.
- Implement display mode management (SideBySide/Inline) - Add QAlgorithmManager integration for diff calculations - Add slots for handling diff calculation results - Update diff display logic based on selected mode - Add helper methods for signal management and diff display
…k on Diff and Highlighting Features This PR merges the latest `main` changes into the working development branch. This ensures compatibility and stability before continuing work on advanced diffing features and UI improvements. --- - All recent commits from `main` (bug fixes, infra, etc.) - QDiffTextBrowser line number and diff highlighting system - Word-by-word diffing implementation - Cleanup of DTL and DMP algorithms ---
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
1 participant
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.
Key Features & Changes
DisplayMode { SideBySide, Inline }toQDiffWidget.Asynchronous Side-by-Side Calculation
calculateSideBySideDiffcalculateSideBySideDiffAsyncsideBySideDiffCalculated(QSideBySideDiffResult)New Data Structure
QSideBySideDiffResult, containing:QAlgorithmManager
divideDiffForSideBySide:QDiffResultinto left/right panel results.QDiffWidget
sideBySideDiffCalculatedsignal.displaySideBySideDiffto render the two panels.updateDiffto choose the correct diff algorithm based onDisplayMode.