This repository has been archived by the owner on Dec 15, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 391
Render file patches with a decorated Editor #1512
Merged
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
smashwilson
force-pushed
the
aw/file-patch-editor
branch
from
June 10, 2018 00:39
d5aefd6
to
33595a8
Compare
This comment has been minimized.
This comment has been minimized.
smashwilson
removed this from In progress π§
in Feature Sprint: 18 June - 6 July 2018
Jul 10, 2018
4 tasks
smashwilson
added this to In Progress π§
in Feature Sprint : 27 August - 14 September 2018 : v0.20.0
Aug 14, 2018
Closed
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This was referenced Oct 25, 2018
Feature Sprint : 1 October - 19 November 2018 : v0.21.0
automation
moved this from QA Review π¬
to Merged βοΈ
Oct 25, 2018
I shall remember this PR as "The wall of checkboxes PR". π |
This was referenced Nov 30, 2018
6 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Use decorations within an Atom TextEditor element to implement a file patch item. This should get us improved performance for large diffs, editable diff support, and open the path for multi-file diff views like a commit or pull request pane.
Just to set proper expectations, I'll likely need to pause and resume this a few times before it lands. Don't worry, I won't forget about it π
Remaining Work
FilePatchController
out into aFilePatchItem
,FilePatchContainer
,FilePatchController
, andFilePatchView
, as per Improve React component organizationΒ #1436.getTitle()
, etc) ontoFilePatchItem
.<AtomTextEditor>
within theFilePatchView
.FilePatch
to the unadorned text that should be displayed within the editor accompanied by the buffer line ranges that correspond to each hunk and line rangeTextBuffer
in thePatch
model instead of a StringAtomTextEditor
to be initialized with an externally ownedTextBuffer
.Regions
andHunks
instead ofIndexedRowRanges
.IndexedRowRanges
inbuildFilePatch()
.getHunkAt()
intoPatch
andFilePatch
.FilePatchView
.CommitView
use an external text buffer for the commit message.v0.19.1-0
v0.19.1-1
v0.19.1-2
TypeError: Cannot destructure property
holderof 'undefined' or 'null'
when conflicts are encounteredv0.19.1-3
v0.19.1-5
+
and-
indicators in a gutterv0.19.1-6
v0.22.1-0
Concurrent with review
package.json
- Skip all tests when engines.atom has been bumped to exclude the current Atom versionΒ #1664Checks
.old.js
files π¬Stretch goals
FilePatch
accordingly. Filed as Editable diffs in FilePatchItemsΒ #1720.Resources
A Guided Tour to that Giant "Files changed" Tab
Fixes #1502. ...Eventually π