Upgrade to CodeMirror 6 #2058
Open
Upgrade to CodeMirror 6 #2058
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
- upgrade to CM6 - migrated editor line highlighter composable TODO - code completion - test migration
Removed obsolete CSS
gardener-robot
added
needs/review
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-2
added
needs/ok-to-test
|
@grolu You need rebase this pull request with latest master branch. Please check. |
gardener-robot-ci-1
added
reviewed/ok-to-test
gardener-robot-ci-2
added
reviewed/ok-to-test
gardener-robot-ci-3
added
the
reviewed/ok-to-test
grolu
force-pushed
the
enh/upgrade_cm_6
branch
from
3d3f503
to
aa0192d
Compare
gardener-robot-ci-3
removed
the
reviewed/ok-to-test
- Restructured main scss theme dependant classes
gardener-robot-ci-1
added
reviewed/ok-to-test
Make editor always consume 100% height Cleaned-up some comments
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-3
removed
the
reviewed/ok-to-test
…m:gardener/dashboard into enh/upgrade_cm_6
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-3
removed
the
reviewed/ok-to-test
petersutter
reviewed
Sep 19, 2024
| let [startLine, endLine = startLine] = values | ||
| const [startLineCurrent, endLineCurrent] = valuesCurrent | ||
|
|
||
| if (endLine === startLine && startLine === startLineCurrent && !endLineCurrent) { |
There was a problem hiding this comment.
I had similar code in my PR where I introduce the feature to clear the selected line if the current selected line is clicked again, however holger propsed to use ESC-key instead to clear the selection. Clearing with ESC-key currently does not work anymore
There was a problem hiding this comment.
I know. The problem here is that I did not find a way to add a key listener to the gutter. It is possible to add a key listener to the editor itself and clear the highlight on escape. However, the editor needs to be focused, so you would need to click inside the editor to make this work.
So I checked how Github does the highlighting and it does not clear the selection on escape, it works exactly like I implemented it now.
# Conflicts: # .pnp.cjs # .yarn/cache/codemirror-npm-5.65.18-debbbac10b-806e00c708.zip # frontend/src/composables/useShootEditor/helper.js # frontend/src/composables/useShootEditor/index.js # yarn.lock
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
petersutter
approved these changes
Oct 14, 2024
holgerkoser
reviewed
Oct 15, 2024
| <div v-bind="slotProps.props"> | ||
| <g-action-button | ||
| size="x-small" | ||
| :icon="renderWhitespaces ? 'mdi-grid' : 'mdi-grid-off'" |
There was a problem hiding this comment.
These icons are not intuitive to me. I would use these ones. We should use Hide and Show (not Render). And I think we can delete the tab icon in assets?
<v-tooltip location="top">
<template #activator="slotProps">
<div v-bind="slotProps.props">
<v-btn
variant="text"
size="x-small"
flat
icon
color="black"
@click="renderWhitespaces = !renderWhitespaces"
>
<span v-html="renderWhitespaces ? whitespaceEye : whitespaceEyeOff" style="width: 18px; height: 18px"/>
</v-btn>
</div>
</template>
<span>{{ renderWhitespaces ? 'Hide' : 'Render' }} whitespaces</span>
</v-tooltip>There was a problem hiding this comment.
@petersutter WDYT?
Also, do you think we should render line breaks at all?
Moreover, the setting is not stored anywhere currently. Should we store the state in local storage?
There was a problem hiding this comment.
the suggestion sounds good to me.
Also, do you think we should render line breaks at all?
I think we should not render the line breaks, it does not give much value
Moreover, the setting is not stored anywhere currently. Should we store the state in local storage?
hm, yes probably this should be stored in local storage
There was a problem hiding this comment.
Okay
- removed the new line symbols.
- included the proposed icons
- store whitespace setting in local storage
gardener-robot-ci-2
added
the
reviewed/ok-to-test
gardener-robot-ci-3
removed
the
reviewed/ok-to-test
# Conflicts: # .pnp.cjs
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
- removed the new line symbols. - included the proposed icons - store whitespace setting in local storage
gardener-robot-ci-1
added
reviewed/ok-to-test
holgerkoser
reviewed
Oct 18, 2024
| @@ -246,6 +255,27 @@ const showToolbar = computed(() => { | |||
| return !isReadOnly.value && !props.hideToolbar | |||
| }) | |||
|
|
|||
| const whitespaceEye = computed(() => { | |||
| return ` | |||
| <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||
There was a problem hiding this comment.
Import the svg images from the assets folder.
import whitespaceEye from '@/assets/whitespace-eye.svg?raw'
import whitespaceEyeOff from '@/assets/whitespace-eye-off.svg?raw'
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.
What this PR does / why we need it:
Upgrade CodeMirror 5 to CodeMirror 6
Which issue(s) this PR fixes:
Fixes #1892
Special notes for your reviewer:
Release note: