github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-28 21:13:20 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12677 from overleaf/ae-codemirror-view-upgrade

Browse source 
[cm6] Upgrade CodeMirror dependencies

GitOrigin-RevId: cc973b1c5b23eca0fc93a9b3a970c832212e47af
This commit is contained in:
Mathias Jakobsen 2023-04-20 10:58:22 +01:00 committed by Copybot
parent 5ff575e3e5
commit c2292a8567
47 changed files with 124 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
package-lock.json generated
View file

@ -3145,9 +3145,9 @@
"dev": true "dev": true
}, },
"node_modules/@codemirror/autocomplete": { "node_modules/@codemirror/autocomplete": {
"version": "6.4.2", "version": "6.5.1",
"resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz", "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.5.1.tgz",
"integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==", "integrity": "sha512-/Sv9yJmqyILbZ26U4LBHnAtbikuVxWUp+rQ8BXuRGtxZfbfKOY/WPbsUtvSP2h0ZUZMlkxV/hqbKRFzowlA6xw==",
"dependencies": { "dependencies": {
"@codemirror/language": "^6.0.0", "@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.0.0", "@codemirror/state": "^6.0.0",
@ -3238,9 +3238,9 @@
} }
}, },
"node_modules/@codemirror/lint": { "node_modules/@codemirror/lint": {
"version": "6.2.0", "version": "6.2.1",
"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz", "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.1.tgz",
"integrity": "sha512-KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg==", "integrity": "sha512-y1muai5U/uUPAGRyHMx9mHuHLypPcHWxzlZGknp/U5Mdb5Ol8Q5ZLp67UqyTbNFJJ3unVxZ8iX3g1fMN79S1JQ==",
"dependencies": { "dependencies": {
"@codemirror/state": "^6.0.0", "@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0", "@codemirror/view": "^6.0.0",
@ -3263,9 +3263,9 @@
"integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==" "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="
}, },
"node_modules/@codemirror/view": { "node_modules/@codemirror/view": {
"version": "6.9.4", "version": "6.9.5",
"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.4.tgz", "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.5.tgz",
"integrity": "sha512-Ov2H9gwlGUxiH94zWxlLtTlyogSFaQDIYjtSEcfzgh7MkKmKVchkmr4JbtR5zBev3jY5DVtKvUC8yjd1bKW55A==", "integrity": "sha512-IZwGdkn8PDyMkGms7bCMpFuTCg6+6eCZNgLOe9xQL4RYvMw1yYLviH+qoAqsNoYGpDt4HhHoW9v3FmalobFoKw==",
"dependencies": { "dependencies": {
"@codemirror/state": "^6.1.4", "@codemirror/state": "^6.1.4",
"style-mod": "^4.0.0", "style-mod": "^4.0.0",
@ -35087,14 +35087,14 @@
"@babel/preset-env": "^7.14.5", "@babel/preset-env": "^7.14.5",
"@babel/preset-react": "^7.14.5", "@babel/preset-react": "^7.14.5",
"@babel/preset-typescript": "^7.16.0", "@babel/preset-typescript": "^7.16.0",
"@codemirror/autocomplete": "^6.4.2", "@codemirror/autocomplete": "^6.5.1",
"@codemirror/commands": "^6.2.2", "@codemirror/commands": "^6.2.2",
"@codemirror/lang-markdown": "^6.1.0", "@codemirror/lang-markdown": "^6.1.0",
"@codemirror/language": "^6.6.0", "@codemirror/language": "^6.6.0",
"@codemirror/lint": "^6.2.0", "@codemirror/lint": "^6.2.1",
"@codemirror/search": "^6.3.0", "@codemirror/search": "^6.3.0",
"@codemirror/state": "^6.2.0", "@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.4", "@codemirror/view": "^6.9.5",
"@contentful/rich-text-html-renderer": "^16.0.2", "@contentful/rich-text-html-renderer": "^16.0.2",
"@contentful/rich-text-types": "^16.0.2", "@contentful/rich-text-types": "^16.0.2",
"@google-cloud/bigquery": "^6.0.1", "@google-cloud/bigquery": "^6.0.1",
@ -39847,9 +39847,9 @@
"dev": true "dev": true
}, },
"@codemirror/autocomplete": { "@codemirror/autocomplete": {
"version": "6.4.2", "version": "6.5.1",
"resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz", "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.5.1.tgz",
"integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==", "integrity": "sha512-/Sv9yJmqyILbZ26U4LBHnAtbikuVxWUp+rQ8BXuRGtxZfbfKOY/WPbsUtvSP2h0ZUZMlkxV/hqbKRFzowlA6xw==",
"requires": { "requires": {
"@codemirror/language": "^6.0.0", "@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.0.0", "@codemirror/state": "^6.0.0",
@ -39934,9 +39934,9 @@
} }
}, },
"@codemirror/lint": { "@codemirror/lint": {
"version": "6.2.0", "version": "6.2.1",
"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz", "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.1.tgz",
"integrity": "sha512-KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg==", "integrity": "sha512-y1muai5U/uUPAGRyHMx9mHuHLypPcHWxzlZGknp/U5Mdb5Ol8Q5ZLp67UqyTbNFJJ3unVxZ8iX3g1fMN79S1JQ==",
"requires": { "requires": {
"@codemirror/state": "^6.0.0", "@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0", "@codemirror/view": "^6.0.0",
@ -39959,9 +39959,9 @@
"integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==" "integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="
}, },
"@codemirror/view": { "@codemirror/view": {
"version": "6.9.4", "version": "6.9.5",
"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.4.tgz", "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.5.tgz",
"integrity": "sha512-Ov2H9gwlGUxiH94zWxlLtTlyogSFaQDIYjtSEcfzgh7MkKmKVchkmr4JbtR5zBev3jY5DVtKvUC8yjd1bKW55A==", "integrity": "sha512-IZwGdkn8PDyMkGms7bCMpFuTCg6+6eCZNgLOe9xQL4RYvMw1yYLviH+qoAqsNoYGpDt4HhHoW9v3FmalobFoKw==",
"requires": { "requires": {
"@codemirror/state": "^6.1.4", "@codemirror/state": "^6.1.4",
"style-mod": "^4.0.0", "style-mod": "^4.0.0",
@ -44765,14 +44765,14 @@
"@babel/preset-react": "^7.14.5", "@babel/preset-react": "^7.14.5",
"@babel/preset-typescript": "^7.16.0", "@babel/preset-typescript": "^7.16.0",
"@babel/register": "^7.14.5", "@babel/register": "^7.14.5",
"@codemirror/autocomplete": "^6.4.2", "@codemirror/autocomplete": "^6.5.1",
"@codemirror/commands": "^6.2.2", "@codemirror/commands": "^6.2.2",
"@codemirror/lang-markdown": "^6.1.0", "@codemirror/lang-markdown": "^6.1.0",
"@codemirror/language": "^6.6.0", "@codemirror/language": "^6.6.0",
"@codemirror/lint": "^6.2.0", "@codemirror/lint": "^6.2.1",
"@codemirror/search": "^6.3.0", "@codemirror/search": "^6.3.0",
"@codemirror/state": "^6.2.0", "@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.4", "@codemirror/view": "^6.9.5",
"@contentful/rich-text-html-renderer": "^16.0.2", "@contentful/rich-text-html-renderer": "^16.0.2",
"@contentful/rich-text-types": "^16.0.2", "@contentful/rich-text-types": "^16.0.2",
"@google-cloud/bigquery": "^6.0.1", "@google-cloud/bigquery": "^6.0.1",

4
services/web/frontend/js/features/source-editor/extensions/empty-line-filler.ts
View file

@ -68,8 +68,8 @@ export const emptyLineFiller = () => {
), ),
EditorView.baseTheme({ EditorView.baseTheme({
'.ol-cm-filler': { '.ol-cm-filler': {
display: 'inline-block', display: 'inline',
width: '4px', padding: '2px',
}, },
}), }),
] ]

5
services/web/frontend/js/features/source-editor/extensions/index.ts
View file

@ -38,7 +38,7 @@ import { thirdPartyExtensions } from './third-party-extensions'
import { lineNumbers } from './line-numbers' import { lineNumbers } from './line-numbers'
import { highlightActiveLine } from './highlight-active-line' import { highlightActiveLine } from './highlight-active-line'
import importOverleafModules from '../../../../macros/import-overleaf-module.macro' import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
// import { emptyLineFiller } from './empty-line-filler' import { emptyLineFiller } from './empty-line-filler'
import { goToLinePanel } from './go-to-line' import { goToLinePanel } from './go-to-line'
import { parserWatcher } from './wait-for-parser' import { parserWatcher } from './wait-for-parser'
import { drawSelection } from './draw-selection' import { drawSelection } from './draw-selection'
@ -138,8 +138,7 @@ export const createExtensions = (options: Record<string, any>): Extension[] => [
spelling(options.spelling), spelling(options.spelling),
shortcuts(), shortcuts(),
symbolPalette(), symbolPalette(),
// TODO: re-enable this once incompatibility with @codemirror/view is fixed emptyLineFiller(), // NOTE: must be before `trackChanges`
// emptyLineFiller(), // NOTE: must be before `trackChanges`
trackChanges(options.currentDoc, options.changeManager), trackChanges(options.currentDoc, options.changeManager),
visual(options.currentDoc, options.visual), visual(options.currentDoc, options.visual),
verticalOverflow(), verticalOverflow(),

2
services/web/frontend/js/features/source-editor/extensions/theme.ts
View file

@ -185,7 +185,7 @@ const staticTheme = EditorView.theme({
userSelect: 'none', userSelect: 'none',
}, },
// make cursor visible with reduced opacity when the editor is not focused // make cursor visible with reduced opacity when the editor is not focused
'&:not(.cm-focused) .cm-cursor': { '&:not(.cm-focused) > .cm-scroller > .cm-cursorLayer .cm-cursor': {
display: 'block', display: 'block',
opacity: 0.2, opacity: 0.2,
}, },

50
services/web/frontend/js/features/source-editor/languages/latex/completions/apply.ts
View file

@ -1,10 +1,12 @@
import { codePointAt, codePointSize, Text } from '@codemirror/state'
import { import {
clearSnippet, codePointAt,
Completion, codePointSize,
insertCompletionText, EditorSelection,
snippet, EditorState,
} from '@codemirror/autocomplete' Text,
TransactionSpec,
} from '@codemirror/state'
import { clearSnippet, Completion, snippet } from '@codemirror/autocomplete'
import { EditorView } from '@codemirror/view' import { EditorView } from '@codemirror/view'
import { prepareSnippetTemplate } from '../snippets' import { prepareSnippetTemplate } from '../snippets'
import { ancestorNodeOfType } from '../../../utils/tree-query' import { ancestorNodeOfType } from '../../../utils/tree-query'
@ -22,6 +24,42 @@ export const prevChar = (doc: Text, pos: number) => {
: prev.slice(1) : prev.slice(1)
} }
// from https://github.com/codemirror/autocomplete/blob/6.4.2/src/completion.ts
// forked due to an issue with `to` in https://github.com/codemirror/autocomplete/commit/a4cce022daea903c8b9ffcb7ca2fb598b17bfb66
export function insertCompletionText(
state: EditorState,
text: string,
from: number,
to: number
): TransactionSpec {
return {
...state.changeByRange(range => {
if (range === state.selection.main) {
return {
changes: { from, to, insert: text },
range: EditorSelection.cursor(from + text.length),
}
}
if (!range.empty) {
return { range }
}
const len = to - from
if (
len &&
state.sliceDoc(range.from - len, range.from) !==
state.sliceDoc(from, to)
) {
return { range }
}
return {
changes: { from: range.from - len, to: range.from, insert: text },
range: EditorSelection.cursor(range.from - len + text.length),
}
}),
userEvent: 'input.complete',
}
}
// Apply a completed command, removing any subsequent closing brace, optionally // Apply a completed command, removing any subsequent closing brace, optionally
// providing a function that generates the completion text. If missing, the // providing a function that generates the completion text. If missing, the
// completion label is used. // completion label is used.

2
services/web/frontend/js/features/source-editor/themes/cm6/ambiance.json
View file

@ -19,7 +19,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"borderLeft": "1px solid #7991E8" "borderLeft": "1px solid #7991E8"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(221, 240, 255, 0.20)" "background": "rgba(221, 240, 255, 0.20)"
}, },
".cm-selectionMatch.cm-selectionMatch, .cm-searchMatch.cm-searchMatch": { ".cm-selectionMatch.cm-selectionMatch, .cm-searchMatch.cm-searchMatch": {

2
services/web/frontend/js/features/source-editor/themes/cm6/chaos.json
View file

@ -14,7 +14,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"borderLeft": "2px solid #FFFFFF" "borderLeft": "2px solid #FFFFFF"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#494836" "background": "#494836"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/chrome.json
View file

@ -15,7 +15,7 @@
"color": "black" "color": "black"
}, },
".cm-foldPlaceholder": {}, ".cm-foldPlaceholder": {},
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgb(181, 213, 255)" "background": "rgb(181, 213, 255)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/clouds.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#000000" "color": "#000000"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#BDD5FC" "background": "#BDD5FC"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/clouds_midnight.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#7DA5DC" "color": "#7DA5DC"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#000000" "background": "#000000"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/cobalt.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#FFFFFF" "color": "#FFFFFF"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(179, 101, 57, 0.75)" "background": "rgba(179, 101, 57, 0.75)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/crimson_editor.json
View file

@ -15,7 +15,7 @@
"color": "black" "color": "black"
}, },
".cm-foldPlaceholder": {}, ".cm-foldPlaceholder": {},
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgb(181, 213, 255)" "background": "rgb(181, 213, 255)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/dawn.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#000000" "color": "#000000"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(39, 95, 255, 0.30)" "background": "rgba(39, 95, 255, 0.30)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/dracula.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#f8f8f0" "color": "#f8f8f0"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#44475a" "background": "#44475a"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/dreamweaver.json
View file

@ -16,7 +16,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "black" "color": "black"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgb(181, 213, 255)" "background": "rgb(181, 213, 255)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/eclipse.json
View file

@ -17,7 +17,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "black" "color": "black"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgb(181, 213, 255)" "background": "rgb(181, 213, 255)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/github.json
View file

@ -16,7 +16,7 @@
".cm-activeLine": { ".cm-activeLine": {
"background": "rgb(245, 245, 245)" "background": "rgb(245, 245, 245)"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgb(181, 213, 255)" "background": "rgb(181, 213, 255)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/gob.json
View file

@ -15,7 +15,7 @@
"backgroundColor": "rgba(16, 240, 248, 0.70)", "backgroundColor": "rgba(16, 240, 248, 0.70)",
"opacity": "0.4" "opacity": "0.4"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(221, 240, 255, 0.20)" "background": "rgba(221, 240, 255, 0.20)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/gruvbox.json
View file

@ -11,7 +11,7 @@
"color": "#EBDAB4", "color": "#EBDAB4",
"backgroundColor": "#1D2021" "backgroundColor": "#1D2021"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(179, 101, 57, 0.75)" "background": "rgba(179, 101, 57, 0.75)"
}, },
".cm-activeLine": { ".cm-activeLine": {

2
services/web/frontend/js/features/source-editor/themes/cm6/idle_fingers.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#91FF00" "color": "#91FF00"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(90, 100, 126, 0.88)" "background": "rgba(90, 100, 126, 0.88)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/iplastic.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#333" "color": "#333"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#BAD6FD" "background": "#BAD6FD"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/katzenmilch.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"borderLeft": "2px solid #100011" "borderLeft": "2px solid #100011"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(100, 5, 208, 0.27)" "background": "rgba(100, 5, 208, 0.27)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/kr_theme.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#FF9900" "color": "#FF9900"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(170, 0, 255, 0.45)" "background": "rgba(170, 0, 255, 0.45)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/kuroir.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#202020" "color": "#202020"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(245, 170, 0, 0.57)" "background": "rgba(245, 170, 0, 0.57)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/merbivore.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#FFFFFF" "color": "#FFFFFF"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#454545" "background": "#454545"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/merbivore_soft.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#FFFFFF" "color": "#FFFFFF"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#494949" "background": "#494949"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/mono_industrial.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#FFFFFF" "color": "#FFFFFF"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(145, 153, 148, 0.40)" "background": "rgba(145, 153, 148, 0.40)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/monokai.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#F8F8F0" "color": "#F8F8F0"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#49483E" "background": "#49483E"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/nord_dark.json
View file

@ -15,7 +15,7 @@
".cm-activeLine": { ".cm-activeLine": {
"background": "#434c5ecc" "background": "#434c5ecc"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#434c5ecc" "background": "#434c5ecc"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

9
services/web/frontend/js/features/source-editor/themes/cm6/one_dark.json
View file

@ -13,12 +13,12 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#528bff" "color": "#528bff"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#3d4350" "background": "#3d4350"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {
"margin": "-1px 0 0 -1px", "margin": 0,
"border": "1px solid #747369" "outline": "1px solid #747369"
}, },
".cm-activeLine": { ".cm-activeLine": {
"background": "rgba(76, 87, 103, .19)" "background": "rgba(76, 87, 103, .19)"
@ -27,7 +27,8 @@
"backgroundColor": "rgba(76, 87, 103, .19)" "backgroundColor": "rgba(76, 87, 103, .19)"
}, },
".cm-selectionMatch.cm-selectionMatch, .cm-searchMatch.cm-searchMatch": { ".cm-selectionMatch.cm-selectionMatch, .cm-searchMatch.cm-searchMatch": {
"border": "1px solid #3d4350" "outline": "1px solid #3d4350",
"margin": 0
}, },
".cm-foldPlaceholder": { ".cm-foldPlaceholder": {
"backgroundColor": "#61afef", "backgroundColor": "#61afef",

2
services/web/frontend/js/features/source-editor/themes/cm6/overleaf.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "black" "color": "black"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgb(181, 213, 255)" "background": "rgb(181, 213, 255)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/pastel_on_dark.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#A7A7A7" "color": "#A7A7A7"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(221, 240, 255, 0.20)" "background": "rgba(221, 240, 255, 0.20)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/solarized_dark.json
View file

@ -16,7 +16,7 @@
".cm-activeLine": { ".cm-activeLine": {
"background": "rgba(255, 255, 255, 0.1)" "background": "rgba(255, 255, 255, 0.1)"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(255, 255, 255, 0.1)" "background": "rgba(255, 255, 255, 0.1)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/solarized_light.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#000000" "color": "#000000"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(7, 54, 67, 0.09)" "background": "rgba(7, 54, 67, 0.09)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/sqlserver.json
View file

@ -14,7 +14,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "black" "color": "black"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgb(181, 213, 255)" "background": "rgb(181, 213, 255)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/terminal.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#9F9F9F" "color": "#9F9F9F"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#424242" "background": "#424242"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/textmate.json
View file

@ -16,7 +16,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "black" "color": "black"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgb(181, 213, 255)" "background": "rgb(181, 213, 255)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/tomorrow.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#AEAFAD" "color": "#AEAFAD"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#D6D6D6" "background": "#D6D6D6"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/tomorrow_night.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#AEAFAD" "color": "#AEAFAD"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#373B41" "background": "#373B41"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/tomorrow_night_blue.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#FFFFFF" "color": "#FFFFFF"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#003F8E" "background": "#003F8E"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/tomorrow_night_bright.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#9F9F9F" "color": "#9F9F9F"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#424242" "background": "#424242"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/tomorrow_night_eighties.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#CCCCCC" "color": "#CCCCCC"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#515151" "background": "#515151"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

8
services/web/frontend/js/features/source-editor/themes/cm6/twilight.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#A7A7A7" "color": "#A7A7A7"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "rgba(221, 240, 255, 0.20)" "background": "rgba(221, 240, 255, 0.20)"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {
@ -57,9 +57,6 @@
".tok-function": { ".tok-function": {
"color": "#AC885B" "color": "#AC885B"
}, },
".tok-attributeValue": {
"color": "#7587A6"
},
".tok-string": { ".tok-string": {
"color": "#8F9D6A" "color": "#8F9D6A"
}, },
@ -69,6 +66,9 @@
".tok-comment": { ".tok-comment": {
"fontStyle": "italic", "fontStyle": "italic",
"color": "#5F5A60" "color": "#5F5A60"
},
".tok-attributeValue": {
"color": "#7587A6"
} }
}, },
"dark": true "dark": true

2
services/web/frontend/js/features/source-editor/themes/cm6/vibrant_ink.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#FFFFFF" "color": "#FFFFFF"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#6699CC" "background": "#6699CC"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/cm6/xcode.json
View file

@ -13,7 +13,7 @@
".cm-cursor, .cm-dropCursor": { ".cm-cursor, .cm-dropCursor": {
"color": "#000000" "color": "#000000"
}, },
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": { "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
"background": "#B5D5FF" "background": "#B5D5FF"
}, },
"&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": { "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {

2
services/web/frontend/js/features/source-editor/themes/convert.js
View file

@ -57,7 +57,7 @@ const themeMapping = new Map([
['.ace_cursor', '.cm-cursor, .cm-dropCursor'], ['.ace_cursor', '.cm-cursor, .cm-dropCursor'],
[ [
'.ace_marker-layer .ace_selection', '.ace_marker-layer .ace_selection',
'&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected', '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected',
], ],
[ [
'.ace_marker-layer .ace_selected-word', '.ace_marker-layer .ace_selected-word',

6
services/web/package.json
View file

@ -71,14 +71,14 @@
"@babel/preset-env": "^7.14.5", "@babel/preset-env": "^7.14.5",
"@babel/preset-react": "^7.14.5", "@babel/preset-react": "^7.14.5",
"@babel/preset-typescript": "^7.16.0", "@babel/preset-typescript": "^7.16.0",
"@codemirror/autocomplete": "^6.4.2", "@codemirror/autocomplete": "^6.5.1",
"@codemirror/commands": "^6.2.2", "@codemirror/commands": "^6.2.2",
"@codemirror/lang-markdown": "^6.1.0", "@codemirror/lang-markdown": "^6.1.0",
"@codemirror/language": "^6.6.0", "@codemirror/language": "^6.6.0",
"@codemirror/lint": "^6.2.0", "@codemirror/lint": "^6.2.1",
"@codemirror/search": "^6.3.0", "@codemirror/search": "^6.3.0",
"@codemirror/state": "^6.2.0", "@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.4", "@codemirror/view": "^6.9.5",
"@contentful/rich-text-html-renderer": "^16.0.2", "@contentful/rich-text-html-renderer": "^16.0.2",
"@contentful/rich-text-types": "^16.0.2", "@contentful/rich-text-types": "^16.0.2",
"@google-cloud/bigquery": "^6.0.1", "@google-cloud/bigquery": "^6.0.1",