Improve findAlignedLines
#706
Merged
Conversation
This file contains 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
|
bot please update playwright snapshots |
|
Playwright windows-latest snapshots updated. |
|
@fcollonval thanks for this PR. I have tried it on a case that was not producing correct results (the case reported in issue #669 that is close to the one present in this PR) and it seems to work. |
fcollonval
force-pushed
the
fix/align-chunk
branch
from
a960ea3
to
52c406e
Compare
vidartf
reviewed
Oct 13, 2023
| ? this._base.cm.defaultLineHeight | ||
| : this._diffViews[0].remoteEditorWidget.cm.defaultLineHeight; | ||
| if (this._aligning) { | ||
| return; | ||
| } | ||
| this._aligning = true; | ||
| // Find matching lines | ||
| let linesToAlign = findAlignedLines(this._diffViews); | ||
| const linesToAlign = findAlignedLines(this._diffViews); | ||
| console.log(linesToAlign) |
There was a problem hiding this comment.
debug log statement left behind
vidartf
reviewed
Oct 13, 2023
| break; | ||
| } | ||
| } | ||
| return toMatch.baseTo; | ||
| // toMatch is not in chunks list, add lines delta from the last chunk | ||
| console.log(previous, toMatch.baseTo + (previous ? (previous.remoteTo - previous.baseTo) : 0)) |
There was a problem hiding this comment.
debug log statement left behind
vidartf
reviewed
Oct 13, 2023
| @@ -1179,17 +1179,26 @@ function getMatchingEditLine(baseLine: number, chunks: Chunk[]): number { | |||
| * | |||
| */ | |||
| function getMatchingEditLineLC(toMatch: Chunk, chunks: Chunk[]): number { | |||
| let editLine = toMatch.baseFrom; | |||
| console.log(toMatch, chunks) | |||
fcollonval
added a commit
to fcollonval/nbdime
that referenced
this pull request
Oct 16, 2023
Review comment from jupyter#706
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #669
Compute correctly the alignment for a chunk in another diff view.
Before
After