Skip to content
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

Jump to bottom

Javalab: Use codemirror #39147

Merged
merged 12 commits into from
Feb 22, 2021
Merged

Javalab: Use codemirror #39147

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
69b1477
try out code mirror
molly-moen Feb 10, 2021
eed477b
fix merge conflict
molly-moen Feb 17, 2021
1526cdc
fix merge conflict
molly-moen Feb 17, 2021
c4e0b7d
remove ace editor
molly-moen Feb 17, 2021
d001304
update background color
molly-moen Feb 18, 2021
324ea99
sync editor changes to redux
molly-moen Feb 18, 2021
676477b
fix comment
molly-moen Feb 18, 2021
91bf286
allow tabs in editor
molly-moen Feb 18, 2021
db98084
Merge remote-tracking branch 'origin/staging' into java-ide-codemirror
molly-moen Feb 19, 2021
c991dd1
add comment
molly-moen Feb 19, 2021
fd71b31
Merge remote-tracking branch 'origin/staging' into java-ide-codemirror
molly-moen Feb 19, 2021
9965fe9
fix build issues and refactor setup
molly-moen Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions apps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@
},
"dependencies": {
"@code-dot-org/js-interpreter": "1.3.13",
"@codemirror/basic-setup": "^0.17.1",
"@codemirror/lang-java": "^0.17.1",
"@codemirror/theme-one-dark": "^0.17.5",
"@microsoft/immersive-reader-sdk": "^1.1.0",
"ace-builds": "^1.4.12",
"blockly": "4.20201217.0",
Expand Down
55 changes: 33 additions & 22 deletions apps/src/javalab/JavalabEditor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import React from 'react';
import $ from 'jquery';
import AceEditor from 'react-ace';
import {connect} from 'react-redux';
import {setEditorText} from './javalabRedux';
import PropTypes from 'prop-types';
import PaneHeader, {PaneSection} from '@cdo/apps/templates/PaneHeader';
import 'ace-builds/src-noconflict/mode-java';
import 'ace-builds/src-noconflict/theme-monokai';
import {EditorState, basicSetup} from '@codemirror/basic-setup';
import {java} from '@codemirror/lang-java';
import {oneDarkTheme, oneDarkHighlightStyle} from '@codemirror/theme-one-dark';
import {EditorView, keymap} from '@codemirror/view';
import {defaultTabBinding} from '@codemirror/commands';

const style = {
editor: {
width: '100%',
height: 600
height: 600,
backgroundColor: '#282c34'
}
};

Expand All @@ -23,32 +25,41 @@ class JavalabEditor extends React.Component {
setEditorText: PropTypes.func
};

onChange = newValue => {
this.props.setEditorText(newValue);
};

componentDidMount() {
let textInput = $('.ace_text-input');
if (textInput) {
let textInputElement = textInput.first();
textInputElement.attr('aria-label', 'java editor panel');
}
this.editor = new EditorView({
state: EditorState.create({
extensions: [
basicSetup,
java(),
keymap.of([defaultTabBinding]),
oneDarkTheme,
oneDarkHighlightStyle
]
}),
parent: this._codeMirror,
dispatch: this.dispatchEditorChange()
});
}

dispatchEditorChange = () => {
return tr => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is tr in this case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tr is a codemirror transaction I'll add a comment to make it more clear

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

// we are overwriting the default dispatch method for codemirror,
// so we need to manually call the update method.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commenting is very helpful :)

this.editor.update([tr]);
// if there are changes to the editor, update redux.
if (!tr.changes.empty && tr.newDoc) {
this.props.setEditorText(tr.newDoc.toString());
}
};
};

render() {
return (
<div style={this.props.style}>
<PaneHeader hasFocus={true}>
<PaneSection>Editor</PaneSection>
</PaneHeader>
<AceEditor
mode="java"
theme="monokai"
onChange={this.onChange}
name="java-lab-editor"
editorProps={{$blockScrolling: true}}
style={style.editor}
/>
<div ref={el => (this._codeMirror = el)} style={style.editor} />
</div>
);
}
Expand Down
256 changes: 256 additions & 0 deletions apps/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,6 +1638,228 @@
remark-stringify "^6.0.0"
unified "^7.0.0"

"@codemirror/autocomplete@^0.17.0":
version "0.17.4"
resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.17.4.tgz#06e1ff689b07c7fb3a4a9de121e94282b49c86ee"
integrity sha512-fni2OJC1aStMeQaQQE9lMSJAntWoDeGucLMGbf8XZrTNxZR1IoWKLXBy9YoA0CQfJX/VNnJljNG7WRvwxHmBiQ==
dependencies:
"@codemirror/language" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/text" "^0.17.0"
"@codemirror/tooltip" "^0.17.0"
"@codemirror/view" "^0.17.0"
lezer-tree "^0.13.0"

"@codemirror/basic-setup@^0.17.1":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/basic-setup/-/basic-setup-0.17.1.tgz#3c8b507da7f2438098bf7618fa69ce0a9cbe0119"
integrity sha512-d17H3bcseOia/YxT4Zfqn455wBRfbs3aKFAg9+FoP11BeQLFAqxiDIXtbwtfFbNx4rUvtmHkzeaMUZHNEp5ZSQ==
dependencies:
"@codemirror/autocomplete" "^0.17.0"
"@codemirror/closebrackets" "^0.17.0"
"@codemirror/commands" "^0.17.0"
"@codemirror/comment" "^0.17.0"
"@codemirror/fold" "^0.17.0"
"@codemirror/gutter" "^0.17.0"
"@codemirror/highlight" "^0.17.0"
"@codemirror/history" "^0.17.0"
"@codemirror/language" "^0.17.0"
"@codemirror/lint" "^0.17.0"
"@codemirror/matchbrackets" "^0.17.0"
"@codemirror/rectangular-selection" "^0.17.0"
"@codemirror/search" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/closebrackets@^0.17.0":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@codemirror/closebrackets/-/closebrackets-0.17.2.tgz#f78c750c43da4655bf9026a937fd37324767193d"
integrity sha512-0ljN56AW9Iu3uATSZESPt2MuPXpZwB9PKCK0liO9Ei1MXba//SDkzDaYeoIjlVLTxUaGbVo77fsh7+rrY28hLg==
dependencies:
"@codemirror/language" "^0.17.0"
"@codemirror/rangeset" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/text" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/commands@^0.17.0":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.17.2.tgz#c51f1a4466c842b7876987954e006dd68ee02698"
integrity sha512-FT2wMrf6Jtrbmb0WqXaAO0B7BvjmzEmsJwZSS46UiC8S5/asXA7hjaFdB9hZUDxtuZ/bsVScvKUVoq7vzXxT7g==
dependencies:
"@codemirror/language" "^0.17.0"
"@codemirror/matchbrackets" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/text" "^0.17.0"
"@codemirror/view" "^0.17.0"
lezer-tree "^0.13.0"

"@codemirror/comment@^0.17.0":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/comment/-/comment-0.17.1.tgz#ef3104d411ade2fcf548327f96f00a82533fee89"
integrity sha512-dRYCRMU8NEe4mbL00AU4Zr8DYqYC5kL2bg28wBSURKYYKtTv3c7KsvdwU/Ggj8pDFcW0TIaKt1DfSKH6RDfaQw==
dependencies:
"@codemirror/state" "^0.17.0"
"@codemirror/text" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/fold@^0.17.0":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/fold/-/fold-0.17.1.tgz#7ff1e6a2d185acbd833339610e9b12504e76b6c0"
integrity sha512-G0j7AyZtcDQy/Vh7MQgIZIYcTJX6BuSa8NcxE82sDtpEDdogavBkjZxEE/lRZyZnHDmmaVgVSp53fzOo9TS6Hw==
dependencies:
"@codemirror/gutter" "^0.17.0"
"@codemirror/language" "^0.17.0"
"@codemirror/rangeset" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/gutter@^0.17.0":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@codemirror/gutter/-/gutter-0.17.2.tgz#75c433090d05786614c0c7d14d2efae42c301151"
integrity sha512-kyfuNVg3B+yS9U3aNMK/AQ0NyOswOep8lrbldBL4BWXZ8mFzSifT3WNK887WYrEIhqeLjq5qjcsJgFyGrFR0Lg==
dependencies:
"@codemirror/rangeset" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/highlight@^0.17.0":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@codemirror/highlight/-/highlight-0.17.2.tgz#14825083581ed4bd8a4a06cd92a2062d5af923c8"
integrity sha512-KmSOCHjPv7yO9NAtQnqCNwjLHVwFh9InMwul0+JSsor1qLfBR1ljlmqLr7KUe9WWRnM7oD/eSuwF5uNpGtuaNw==
dependencies:
"@codemirror/language" "^0.17.0"
"@codemirror/rangeset" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"
lezer-tree "^0.13.0"
style-mod "^3.2.0"

"@codemirror/history@^0.17.0":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@codemirror/history/-/history-0.17.2.tgz#d94273af95f7dbd8a0c41c370984e4bbf55d54e8"
integrity sha512-ML/FA6VJMMwsQrx7HFXaOAg/LqrLxUktE5pu230UOn0u5bxIPxbX0lLGs34994s9HPruqbCqIikSc+IfjLkFcA==
dependencies:
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/lang-java@^0.17.1":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/lang-java/-/lang-java-0.17.1.tgz#9b36f7f0d8ecbd25178ceaacb0d48ca8cc67397a"
integrity sha512-goPlFALyN58WMt6Tiq3g5VQ8kg1bYqSGUHqwW7nHoqcWf7SSrhHJ4tIUIOIThI8SOh4zFasFEM2QbE+vxFhCGA==
dependencies:
"@codemirror/highlight" "^0.17.0"
"@codemirror/language" "^0.17.0"
lezer-java "^0.13.0"

"@codemirror/language@^0.17.0":
version "0.17.4"
resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-0.17.4.tgz#c5755385cb0c2765e8d959e40491ea9a9a30d703"
integrity sha512-PAYrnmc1GaUcWjnxydbrhrMUYl/biIv4/fCJdInwHdox7f3WOdOhYwST/B803xVBzlse8spJo2M1+syMxJPM5w==
dependencies:
"@codemirror/state" "^0.17.0"
"@codemirror/text" "^0.17.0"
"@codemirror/view" "^0.17.0"
lezer "^0.13.0"
lezer-tree "^0.13.0"

"@codemirror/lint@^0.17.0":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.17.1.tgz#970dbfdb52cef35ff0210d22230dbff1c7dab7a4"
integrity sha512-Jzhf3g+hIr8frQaLsRSYJgM3BFVt7qQ59J0l/oqkjx8LsqYn0zbCM6zHnKMC0lOUdZXf7O8D24jTmVJb/8n4YQ==
dependencies:
"@codemirror/panel" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/tooltip" "^0.17.0"
"@codemirror/view" "^0.17.0"
crelt "^1.0.5"

"@codemirror/matchbrackets@^0.17.0":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@codemirror/matchbrackets/-/matchbrackets-0.17.2.tgz#9dd72046d7bf09550612b2553c41317ed22577b1"
integrity sha512-E4TP7lNXk7VtmvvKYH59yNx0lf5ubv7iv0Ok0uWCjxm+RIPnXiOdRoNI7rxITJcgNROOyKnuKsd6AAnmuXxDEQ==
dependencies:
"@codemirror/language" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"
lezer-tree "^0.13.0"

"@codemirror/panel@^0.17.0":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/panel/-/panel-0.17.1.tgz#9dfd3b464c537caebec43fffbd8a283b0210d4c1"
integrity sha512-2it2Sk02eF4WFwPVoRLhr9lPGq9lwwwHZFyb4olqI6tOyTPwk6leZ4ntabYrhvjRc7gD6S6vM14KhOtjm4hjqg==
dependencies:
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/rangeset@^0.17.0":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/rangeset/-/rangeset-0.17.1.tgz#41066bcf4b70b2c7595cb1363780688cc3f1235b"
integrity sha512-Qv8a8C5CZiUdXGvxniWdULJzXDiz5uSP5ddHFEmekGa9nNVCgdr05nH7R+h3NgJ2P40UEEOPykqXZyy8EHGggw==
dependencies:
"@codemirror/state" "^0.17.0"

"@codemirror/rectangular-selection@^0.17.0":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/rectangular-selection/-/rectangular-selection-0.17.1.tgz#c30a99664a8a5d525087f953815b6779a645fce3"
integrity sha512-mM6LjEiwcnj/NArVMTfMATuO35FDF9B1xCrqMlXTB/KxCXwFcGO/r8AccBV+ehR2Y+k7zlvfNvEVNi1SjP1Hfg==
dependencies:
"@codemirror/state" "^0.17.0"
"@codemirror/text" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/search@^0.17.0":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-0.17.1.tgz#eb6ae529093b09f92b1d62c4d0ad8d09c4e218f7"
integrity sha512-wY0KP9my/0uKQk9AU39EqmkY6zMVv2Erej5b1rRBksM78JZXzjNUl4gyhtx1/0om84IZ1ocmW8MRElkAY6r1rw==
dependencies:
"@codemirror/panel" "^0.17.0"
"@codemirror/rangeset" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/text" "^0.17.0"
"@codemirror/view" "^0.17.0"
crelt "^1.0.5"

"@codemirror/state@^0.17.0":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-0.17.1.tgz#ef8db9af29a4485572d380237df5bb0b4d50e7d5"
integrity sha512-ELgxzackFVC+wBWpGJGFN6OJ+uIdHrgj4BEh6qooju7U5Mdd1bM594QPGzNMRu3uXjfGj7ANHTATRPc0nnQRfA==
dependencies:
"@codemirror/text" "^0.17.0"

"@codemirror/text@^0.17.0":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@codemirror/text/-/text-0.17.2.tgz#7076feeaed16556b52d9b028429296ce10eb1280"
integrity sha512-KL+cM+uJPW5skyuTRoW43lOaSQq3YDNEPx5z0V/9Wsz9R9dK4kVP5NIRMUFgl9MUCQ9UxIotvgPDpz65j9wjuA==

"@codemirror/theme-one-dark@^0.17.5":
version "0.17.5"
resolved "https://registry.yarnpkg.com/@codemirror/theme-one-dark/-/theme-one-dark-0.17.5.tgz#ddb980847f79ad49c99b8c12570ecf360393bac3"
integrity sha512-zqA5SVRq9/oBZViYx4W2OiJkwf0GCWhfIkXGRbNImlNlml+mmnM/EFyx8rVan53rwl2MiMyH6gUJEihNKS/INg==
dependencies:
"@codemirror/highlight" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/tooltip@^0.17.0":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@codemirror/tooltip/-/tooltip-0.17.2.tgz#1dcf43626fedb2f2fd4261b5ad555e7670c1f23d"
integrity sha512-Ux2lKYzTUCiAluu3PJj78e58eGQeCRaFWpzn8pg4KQIFxSVyZoCv5VWcIp/1i4bLGyrUWDWwP0CAxGq759AwaQ==
dependencies:
"@codemirror/state" "^0.17.0"
"@codemirror/view" "^0.17.0"

"@codemirror/view@^0.17.0":
version "0.17.7"
resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-0.17.7.tgz#d2913f119e3c9eba669d54704e219ddd9ab942e8"
integrity sha512-OK+eNbcNXdlam7epFG5p5caH+3OoOlcRHy5S954VDUjOlUEMFUtwWjHa9WqaKEGvFwIgsG3AQQVstRQtyexRuQ==
dependencies:
"@codemirror/rangeset" "^0.17.0"
"@codemirror/state" "^0.17.0"
"@codemirror/text" "^0.17.0"
style-mod "^3.2.0"
w3c-keyname "^2.2.4"

"@emotion/cache@^0.8.8":
version "0.8.8"
resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-0.8.8.tgz#2c3bd1aa5fdb88f1cc2325176a3f3201739e726c"
Expand Down Expand Up @@ -5184,6 +5406,11 @@ create-react-class@^15.6.2:
loose-envify "^1.3.1"
object-assign "^4.1.1"

crelt@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz#57c0d52af8c859e354bace1883eb2e1eb182bb94"
integrity sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==

cross-fetch@2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.2.tgz#a47ff4f7fc712daba8f6a695a11c948440d45723"
Expand Down Expand Up @@ -9698,6 +9925,25 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"

lezer-java@^0.13.0:
version "0.13.2"
resolved "https://registry.yarnpkg.com/lezer-java/-/lezer-java-0.13.2.tgz#5144b85cb37f86a12f30ec582b1e8266228df17d"
integrity sha512-+BMv172xMTK5zZK0O3BM8SbQ0NK7Z99O5/QWnwt46j6fTGr79HO4n/nuxzzCmq0mQFcweqV2x3QG/L/6zRb7dQ==
dependencies:
lezer "^0.13.0"

lezer-tree@^0.13.0:
version "0.13.0"
resolved "https://registry.yarnpkg.com/lezer-tree/-/lezer-tree-0.13.0.tgz#199757338a30e4c5ee8d9a767546d7ce8935bfbe"
integrity sha512-YqGD22WxQmT6np2JEX5Z+zhdBSfPEcQ8B6ct+39oLzSAHecUPUd/maN5PKNtnUZbSzd81mEx1ZqzMDA1eRSRcg==

lezer@^0.13.0:
version "0.13.1"
resolved "https://registry.yarnpkg.com/lezer/-/lezer-0.13.1.tgz#95c8a4e9ad96bae567dff477bdf93b5f1d66f87d"
integrity sha512-aDX9OHYWQFt3s7C0IEil//Lckxbr02dCRyxB/uTxVuZjBsNHnUJ8Y83OgDi+uNFwRsexhdoMF0/PSvmky/Fg/g==
dependencies:
lezer-tree "^0.13.0"

lie@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.0.tgz#65e0139eaef9ae791a1f5c8c53692c8d3b4718f4"
Expand Down Expand Up @@ -15303,6 +15549,11 @@ style-loader@^0.23.1:
loader-utils "^1.1.0"
schema-utils "^1.0.0"

style-mod@^3.2.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-3.2.1.tgz#daaa4ad2a8b2880b4c07b29c061d49b5db6cab15"
integrity sha512-cQerrMLHjR/fxC4DWC2dRrXc11hvsM7lJ2vtuMOHWU5IG7Deu5RfTbttjbY4xiRAWs3gFIZZFf694jzNPW1Ehw==

style-to-object@^0.2.1:
version "0.2.2"
resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.2.2.tgz#3ea3b276bd3fa9da1195fcdcdd03bc52aa2aae01"
Expand Down Expand Up @@ -16356,6 +16607,11 @@ w3c-hr-time@^1.0.1:
dependencies:
browser-process-hrtime "^1.0.0"

w3c-keyname@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz#4ade6916f6290224cdbd1db8ac49eab03d0eef6b"
integrity sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw==

w3c-xmlserializer@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794"
Expand Down