Use Monaco for displaying diffs (fixes #2275, #2260) #2334
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
|
CI for this is failing because jest can't handle Monaco's esm syntax (see react-monaco-editor/react-monaco-editor/#176). A simple fix is to use identity-object-proxy, since we don't actually care about the behaviour of the editor component for the purposes of testing our own business logic. |
wlach
force-pushed
the
2019-10-revision-diff-content
branch
from
11575f2 to
7d4370c
Compare
Codecov Report
@@ Coverage Diff @@
## master #2334 +/- ##
=======================================
Coverage 69.51% 69.51%
=======================================
Files 223 223
Lines 5451 5451
Branches 877 877
=======================================
Hits 3789 3789
Misses 1643 1643
Partials 19 19
|
|
To expedite getting this (lovely lovely) feature landed, I fixed up the issue above locally and pushed to @mehmetoguzderin's branch. Assuming this works, I'll go ahead and merge. Thank you Oguz for doing the lion's share of the work here! |
wlach
changed the title
DiffEditor of monaco (fix for #2275 and #2260)
wlach
force-pushed
the
2019-10-revision-diff-content
branch
from
7d4370c to
cdb9db8
Compare
We don't actually need to import monaco to test the business logic of the diff viewer, and jest doesn't understand the ESM syntax it uses (see e.g. react-monaco-editor/react-monaco-editor/iodide-project#176).
wlach
force-pushed
the
2019-10-revision-diff-content
branch
from
cdb9db8 to
eab03a5
Compare
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.
Aims to solve #2275 and #2260.
This pull request migrates generation of content for
revision-difffromReactDiffViewertoDiffEditorprovided bymonacoitself.revision-diff-contentserves as a non-redux wrapper for abstracting details ofmonacoaway. Further connections such as theming should be communicated as properties fromrevision-difftorevision-diff-contentin render function.