Skip to content

[codemirror6] Fix color picker to work in Javascript #4006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khanniie wants to merge 1 commit into
base: develop-codemirror-v6
Choose a base branch
from
+56 −79
Open

[codemirror6] Fix color picker to work in Javascript #4006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions client/modules/IDE/components/Editor/stateUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import {
indentLess
} from '@codemirror/commands';
import { lintGutter } from '@codemirror/lint';
import { color as colorPicker } from '@uiw/codemirror-extensions-color';
import {
expandAbbreviation,
abbreviationTracker
Expand All @@ -52,6 +51,7 @@ import { JSHINT } from 'jshint';
import { HTMLHint } from 'htmlhint';
import { CSSLint } from 'csslint';
import { emmetConfig } from '@emmetio/codemirror6-plugin';
import { color as colorPicker } from '@connieye/codemirror-color-picker';

import p5JavaScript from './p5JavaScript';
import { tidyCodeWithPrettier } from './tidier';
Expand Down Expand Up @@ -336,13 +336,19 @@ export function createNewFileState(filename, document, settings) {
// Misc extensions
indentOnInput(),
bracketMatching(),
colorPicker,
errorDecorationStateField,

// Setup the event listeners on the CodeMirror instance.
EditorView.updateListener.of(onViewUpdate)
];

// Only enable the color picker for Javascript and CSS, which
// have both been tested.
const fileMode = getFileMode(filename);
if (fileMode === 'javascript' || fileMode === 'css') {
extensions.push(colorPicker);
}

const fileLanguage = getFileLanguage(filename);
const fileLinter = getFileLinter(filename, onUpdateLinting);
const fileEmmetConfig = getFileEmmetConfig(filename);
Expand Down
121 changes: 46 additions & 75 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@
"@codemirror/lint": "^6.8.5",
"@codemirror/search": "^6.5.11",
"@codemirror/state": "^6.5.2",
"@codemirror/view": "^6.36.5",
"@codemirror/view": "^6.40.0",
"@connieye/codemirror-color-picker": "^1.0.3",
"@emmetio/codemirror-plugin": "^1.2.4",
"@emmetio/codemirror6-plugin": "^0.4.0",
"@gatsbyjs/webpack-hot-middleware": "^2.25.3",
Expand All @@ -240,7 +241,6 @@
"@redux-devtools/log-monitor": "^4.0.2",
"@reduxjs/toolkit": "^1.9.3",
"@types/express": "^5.0.3",
"@uiw/codemirror-extensions-color": "^4.23.12",
"acorn": "^8.14.1",
"acorn-walk": "^8.3.4",
"async": "^3.2.3",
Expand Down
Loading