Fix stage this hunk #132
Merged
Fix stage this hunk #132
Conversation
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
This reverts commit f42c4bf.
There was a problem hiding this comment.
Pull Request Overview
This PR fixes issues with staging file and chunk diffs by improving how optional values are handled and updating patch outputs.
- Changes optional checks from shorthand binding to explicit nil checks in cachedDiff and diff.
- Updates patch handling to safely unwrap optional values before processing.
- Explicitly ignores the output of the GitAddPatch process.
Comment on lines
+73
to
+82
| if cachedDiff != nil { | ||
| StagedView( | ||
| fileDiffs: $cachedExpandableFileDiffs, | ||
| onSelectFileDiff: { fileDiff in | ||
| let newDiff = cachedDiff.updateFileDiffStage(fileDiff, stage: false) | ||
| restorePatch(newDiff) | ||
| if let newDiff = self.cachedDiff?.updateFileDiffStage(fileDiff, stage: false) { | ||
| restorePatch(newDiff) | ||
| } | ||
| }, | ||
| onSelectChunk: { fileDiff, chunk in | ||
| let newDiff = cachedDiff.updateChunkStage(chunk, in: fileDiff, stage: false) | ||
| restorePatch(newDiff) | ||
| if let newDiff = self.cachedDiff?.updateChunkStage(chunk, in: fileDiff, stage: false) { |
There was a problem hiding this comment.
Consider using optional binding (e.g., 'if let cached = self.cachedDiff') instead of checking 'cachedDiff != nil' to avoid redundant optional chaining when calling updateFileDiffStage.
Copilot uses AI. Check for mistakes.
Comment on lines
+90
to
+100
| if diff != nil { | ||
| UnstagedView( | ||
| fileDiffs: $expandableFileDiffs, | ||
| untrackedFiles: status?.untrackedFiles ?? [], | ||
| onSelectFileDiff: { fileDiff in | ||
| let newDiff = diff.updateFileDiffStage(fileDiff, stage: true) | ||
| addPatch(newDiff) | ||
| if let newDiff = self.diff?.updateFileDiffStage(fileDiff, stage: true) { | ||
| addPatch(newDiff) | ||
| } | ||
| }, | ||
| onSelectChunk: { fileDiff, chunk in | ||
| let newDiff = diff.updateChunkStage(chunk, in: fileDiff, stage: true) | ||
| addPatch(newDiff) | ||
| if let newDiff = self.diff?.updateChunkStage(chunk, in: fileDiff, stage: true) { |
There was a problem hiding this comment.
Utilize optional binding (e.g., 'if let diffValue = diff') to safely unwrap and reuse the value for updateFileDiffStage, rather than checking for nil separately.
Copilot uses AI. Check for mistakes.
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.
No description provided.