Desktop: Improve beta editor support for the Rich Markdown plugin #9935
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
personalizedrefrigerator
changed the title
|
@personalizedrefrigerator, there's just one conflict and then we can merge |
| @@ -10,6 +10,8 @@ import { ViewPlugin, DecorationSet, ViewUpdate } from '@codemirror/view'; | |||
| import { ensureSyntaxTree } from '@codemirror/language'; | |||
| import { RangeSetBuilder } from '@codemirror/state'; | |||
|
|
|||
| const baseLineDecoration = Decoration.line({ class: 'CodeMirror-line' }); | |||
There was a problem hiding this comment.
- <div class="cm-line">...</div>
+ <div class="cm-line CodeMirror-line">...</div>- Check which plugins need this.
There was a problem hiding this comment.
I've removed the CodeMirror-line class — RichMarkdown only needs it in 1-2 places.
Other plugins like ReMoods seem to use it, but also rely on other CSS classes being present that we don't seem to have.
Comment on lines
+101
to
+106
| '&.CodeMirror': { | ||
| height: 'unset', | ||
| background: 'unset', | ||
| overflow: 'unset', | ||
| direction: 'unset', | ||
| }, |
There was a problem hiding this comment.
Adding the .CodeMirror class to the editor makes it easier to migrate styles originally intended for CodeMirror 5. It does, however, mean that several CodeMirror 5 styles need to be overridden.
This was referenced Feb 21, 2024
|
Here as well, some more conflicts |
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.
Summary
This pull request builds on the changes to the CodeMirror 5 emulation in #9928 to make more features of the Rich Markdown plugin work in the CodeMirror 6 beta editor.
Note
This pull request currently includes all changes from #9928.
It also requires this Rich Markdown pull request to be merged.
Specifically, it,
CodeMirrorclass to the CodeMirror 6 editor. This allows existing Rich Markdown stylesheets to be applied to the editor..CodeMirrorelements, this pull request adjusts several existing styles.styleActiveLineCodeMirror 5 optioneditor.addWidgeteditor.markText(originally from Desktop: Resolves #9927: Beta editor: Fix search results not highlighted #9928)defineExtensiondoesn't override existing extensions with the same namecoordsCharhandles thepagemodeCodeMirror-lineclass to visible lines in the editorThis pull request still requires changes to the Rich Markdown plugin. A pull request will be opened shortly.
Testing
Regression testing (desktop):
This has been successfully tested on Ubuntu 23.10.
Regression testing (mobile):
This has been tested successfully on Android 7.