@jupyterlab/codemirror 4.0.0-alpha.1 → 4.0.0-alpha.12

package/lib/syntaxstatus.js

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
 import { interactiveItem, showPopup, TextItem } from '@jupyterlab/statusbar';
 import { nullTranslator } from '@jupyterlab/translation';
 import { VDomModel, VDomRenderer } from '@jupyterlab/ui-components';
@@ -39,7 +43,7 @@ export class EditorSyntaxStatus extends VDomRenderer {
                 return aName.localeCompare(bName);
             })
                 .forEach(spec => {
-                if (spec.mode.indexOf('brainf') === 0) {
+                if (spec.name.toLowerCase().indexOf('brainf') === 0) {
                     return;
                 }
                 const args = {
@@ -88,9 +92,10 @@ export class EditorSyntaxStatus extends VDomRenderer {
              * If the editor mode changes, update the model.
              */
             this._onMIMETypeChange = (mode, change) => {
+                var _a;
                 const oldMode = this._mode;
                 const spec = Mode.findByMIME(change.newValue);
-                this._mode = spec.name || spec.mode;
+                this._mode = (_a = spec === null || spec === void 0 ? void 0 : spec.name) !== null && _a !== void 0 ? _a : 'text/plain';
                 this._triggerChange(oldMode, this._mode);
             };
             this._mode = '';
@@ -110,6 +115,7 @@ export class EditorSyntaxStatus extends VDomRenderer {
             return this._editor;
         }
         set editor(editor) {
+            var _a;
             const oldEditor = this._editor;
             if (oldEditor !== null) {
                 oldEditor.model.mimeTypeChanged.disconnect(this._onMIMETypeChange);
@@ -121,7 +127,7 @@ export class EditorSyntaxStatus extends VDomRenderer {
             }
             else {
                 const spec = Mode.findByMIME(this._editor.model.mimeType);
-                this._mode = spec.name || spec.mode;
+                this._mode = (_a = spec === null || spec === void 0 ? void 0 : spec.name) !== null && _a !== void 0 ? _a : 'text/plain';
                 this._editor.model.mimeTypeChanged.connect(this._onMIMETypeChange);
             }
             this._triggerChange(oldMode, this._mode);

package/lib/syntaxstatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"syntaxstatus.js","sourceRoot":"","sources":["../src/syntaxstatus.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"syntaxstatus.js","sourceRoot":"","sources":["../src/syntaxstatus.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EACL,eAAe,EAEf,SAAS,EACT,QAAQ,EACT,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAe,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC;AAwBzB;;;;;;GAMG;AACH,SAAS,qBAAqB,CAC5B,KAAmC;IAEnC,OAAO,oBAAC,QAAQ,IAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,WAAW,GAAI,CAAC;AACtE,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,YAAsC;IAC5E;;OAEG;IACH,YAAY,IAAiC;QAC3C,KAAK,CAAC,IAAI,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC;QAwBxC;;WAEG;QACK,iBAAY,GAAG,GAAG,EAAE;YAC1B,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,wBAAwB,CAAC;YACzC,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;aACvB;YACD,IAAI,CAAC,WAAW,EAAE;iBACf,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;gBAC3B,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACpC,CAAC,CAAC;iBACD,OAAO,CAAC,IAAI,CAAC,EAAE;gBACd,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBACnD,OAAO;iBACR;gBAED,MAAM,IAAI,GAAe;oBACvB,YAAY,EAAE,IAAI;oBAClB,IAAI,EAAE,IAAI,CAAC,IAAK;iBACjB,CAAC;gBAEF,QAAQ,CAAC,OAAO,CAAC;oBACf,OAAO;oBACP,IAAI;iBACL,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;gBACtB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;QACL,CAAC,CAAC;QAIM,WAAM,GAAiB,IAAI,CAAC;QA9DlC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,cAAc,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEjD,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,wCAAwC,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CACL,oBAAC,qBAAqB,IACpB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EACrB,WAAW,EAAE,IAAI,CAAC,YAAY,GAC9B,CACH,CAAC;IACJ,CAAC;CA0CF;AAED;;GAEG;AACH,WAAiB,kBAAkB;IACjC;;OAEG;IACH,MAAa,KAAM,SAAQ,SAAS;QAApC;;YAkCE;;eAEG;YACK,sBAAiB,GAAG,CAC1B,IAAuB,EACvB,MAA4B,EAC5B,EAAE;;gBACF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC9C,IAAI,CAAC,KAAK,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,YAAY,CAAC;gBAExC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC,CAAC;YAWM,UAAK,GAAW,EAAE,CAAC;YACnB,YAAO,GAA8B,IAAI,CAAC;QACpD,CAAC;QA1DC;;;WAGG;QACH,IAAI,IAAI;YACN,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED;;WAEG;QACH,IAAI,MAAM;YACR,OAAO,IAAI,CAAC,OAAO,CAAC;QACtB,CAAC;QACD,IAAI,MAAM,CAAC,MAAiC;;YAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;YAC/B,IAAI,SAAS,KAAK,IAAI,EAAE;gBACtB,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aACpE;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;YACtB,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE;gBACzB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;aACjB;iBAAM;gBACL,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC1D,IAAI,CAAC,KAAK,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,mCAAI,YAAY,CAAC;gBAExC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aACpE;YAED,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAgBD;;WAEG;QACK,cAAc,CAAC,QAAgB,EAAE,QAAgB;YACvD,IAAI,QAAQ,KAAK,QAAQ,EAAE;gBACzB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;aAChC;QACH,CAAC;KAIF;IA3DY,wBAAK,QA2DjB,CAAA;AAgBH,CAAC,EA/EgB,kBAAkB,KAAlB,kBAAkB,QA+ElC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/codemirror",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.12",
   "description": "JupyterLab - CodeMirror Editor Provider",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -29,7 +29,7 @@
   ],
   "scripts": {
     "build": "tsc -b",
-    "build:test": "tsc --build tsconfig.test.json",
+    "build:test": "lezer-generator test/foo.grammar -o test/foo.js && tsc --build tsconfig.test.json",
     "clean": "rimraf lib && rimraf tsconfig.tsbuildinfo",
     "docs": "typedoc src",
     "test": "jest",
@@ -39,47 +39,64 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/apputils": "^4.0.0-alpha.1",
-    "@jupyterlab/codeeditor": "^4.0.0-alpha.1",
-    "@jupyterlab/coreutils": "^6.0.0-alpha.1",
-    "@jupyterlab/nbformat": "^4.0.0-alpha.1",
-    "@jupyterlab/observables": "^5.0.0-alpha.1",
-    "@jupyterlab/shared-models": "^4.0.0-alpha.1",
-    "@jupyterlab/statusbar": "^4.0.0-alpha.1",
-    "@jupyterlab/translation": "^4.0.0-alpha.1",
-    "@jupyterlab/ui-components": "^4.0.0-alpha.16",
+    "@codemirror/autocomplete": "^6.0.0",
+    "@codemirror/commands": "^6.0.0",
+    "@codemirror/lang-cpp": "^6.0.0",
+    "@codemirror/lang-css": "^6.0.0",
+    "@codemirror/lang-html": "^6.0.0",
+    "@codemirror/lang-java": "^6.0.0",
+    "@codemirror/lang-javascript": "^6.0.0",
+    "@codemirror/lang-json": "^6.0.0",
+    "@codemirror/lang-markdown": "^6.0.0",
+    "@codemirror/lang-php": "^6.0.0",
+    "@codemirror/lang-python": "^6.0.0",
+    "@codemirror/lang-rust": "^6.0.0",
+    "@codemirror/lang-sql": "^6.0.0",
+    "@codemirror/lang-wast": "^6.0.0",
+    "@codemirror/lang-xml": "^6.0.0",
+    "@codemirror/language": "^6.0.0",
+    "@codemirror/legacy-modes": "^6.0.0",
+    "@codemirror/search": "^6.0.0",
+    "@codemirror/state": "^6.0.0",
+    "@codemirror/view": "^6.0.0",
+    "@jupyterlab/apputils": "^4.0.0-alpha.12",
+    "@jupyterlab/codeeditor": "^4.0.0-alpha.12",
+    "@jupyterlab/coreutils": "^6.0.0-alpha.12",
+    "@jupyterlab/documentsearch": "^4.0.0-alpha.12",
+    "@jupyterlab/nbformat": "^4.0.0-alpha.12",
+    "@jupyterlab/observables": "^5.0.0-alpha.12",
+    "@jupyterlab/shared-models": "^4.0.0-alpha.12",
+    "@jupyterlab/statusbar": "^4.0.0-alpha.12",
+    "@jupyterlab/translation": "^4.0.0-alpha.12",
+    "@jupyterlab/ui-components": "^4.0.0-alpha.27",
+    "@lezer/common": "^1.0.0",
+    "@lezer/highlight": "^1.0.0",
     "@lumino/algorithm": "^1.9.1",
-    "@lumino/commands": "^1.19.0",
-    "@lumino/coreutils": "^1.11.1",
+    "@lumino/commands": "^1.20.0",
+    "@lumino/coreutils": "^1.12.0",
     "@lumino/disposable": "^1.10.1",
-    "@lumino/polling": "^1.9.1",
+    "@lumino/polling": "^1.10.0",
     "@lumino/signaling": "^1.10.1",
-    "@lumino/widgets": "^1.30.0",
-    "codemirror": "~5.61.0",
+    "@lumino/widgets": "^1.33.0",
     "react": "^17.0.1",
-    "y-codemirror": "^3.0.1"
+    "style-mod": "^4.0.0",
+    "y-codemirror.next": "~0.3.2",
+    "y-protocols": "^1.0.5",
+    "yjs": "^13.5.34"
   },
   "devDependencies": {
-    "@jupyterlab/testutils": "^4.0.0-alpha.1",
-    "@types/codemirror": "^0.0.109",
+    "@jupyterlab/testutils": "^4.0.0-alpha.12",
+    "@lezer/generator": "^1.0.0",
+    "@lezer/lr": "^1.0.0",
     "@types/jest": "^26.0.10",
     "jest": "^26.4.2",
     "rimraf": "~3.0.0",
     "ts-jest": "^26.3.0",
-    "typedoc": "~0.21.2",
-    "typescript": "~4.1.3"
+    "typedoc": "~0.22.10",
+    "typescript": "~4.7.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "jupyterlab": {
-    "extraStyles": {
-      "codemirror": [
-        "lib/codemirror.css",
-        "addon/dialog/dialog.css",
-        "addon/fold/foldgutter.css"
-      ]
-    }
-  },
   "styleModule": "style/index.js"
 }

package/style/base.css

@@ -3,46 +3,33 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-.CodeMirror {
+.cm-editor {
   line-height: var(--jp-code-line-height);
   font-size: var(--jp-code-font-size);
   font-family: var(--jp-code-font-family);
   border: 0;
   border-radius: 0;
   height: auto;
+
   /* Changed to auto to autogrow */
 }
 
-.CodeMirror pre {
+.cm-editor pre {
   padding: 0 var(--jp-code-padding);
 }
 
-.jp-CodeMirrorEditor[data-type='inline'] .CodeMirror-dialog {
+.jp-CodeMirrorEditor[data-type='inline'] .cm-dialog {
   background-color: var(--jp-layout-color0);
   color: var(--jp-content-font-color1);
 }
 
-/* This causes https://github.com/jupyter/jupyterlab/issues/522 */
-/* May not cause it not because we changed it! */
-.CodeMirror-lines {
-  padding: var(--jp-code-padding) 0;
-}
-
-.CodeMirror-linenumber {
-  padding: 0 8px;
-}
-
 .jp-CodeMirrorEditor {
   cursor: text;
 }
 
-.jp-CodeMirrorEditor[data-type='inline'] .CodeMirror-cursor {
-  border-left: var(--jp-code-cursor-width0) solid var(--jp-editor-cursor-color);
-}
-
 /* When zoomed out 67% and 33% on a screen of 1440 width x 900 height */
 @media screen and (min-width: 2138px) and (max-width: 4319px) {
-  .jp-CodeMirrorEditor[data-type='inline'] .CodeMirror-cursor {
+  .jp-CodeMirrorEditor[data-type='inline'] .cm-cursor {
     border-left: var(--jp-code-cursor-width1) solid
       var(--jp-editor-cursor-color);
   }
@@ -50,21 +37,16 @@
 
 /* When zoomed out less than 33% */
 @media screen and (min-width: 4320px) {
-  .jp-CodeMirrorEditor[data-type='inline'] .CodeMirror-cursor {
+  .jp-CodeMirrorEditor[data-type='inline'] .cm-cursor {
     border-left: var(--jp-code-cursor-width2) solid
       var(--jp-editor-cursor-color);
   }
 }
 
-.CodeMirror.jp-mod-readOnly .CodeMirror-cursor {
+.cm-editor.jp-mod-readOnly .cm-cursor {
   display: none;
 }
 
-.CodeMirror-gutters {
-  border-right: 1px solid var(--jp-border-color2);
-  background-color: var(--jp-layout-color0);
-}
-
 .jp-CollaboratorCursor {
   border-left: 5px solid transparent;
   border-right: 5px solid transparent;
@@ -75,16 +57,15 @@
   margin-right: -5px;
 }
 
-.CodeMirror-selectedtext.cm-searching {
-  background-color: var(--jp-search-selected-match-background-color) !important;
-  color: var(--jp-search-selected-match-color) !important;
+.cm-searching,
+.cm-searching span {
+  background-color: var(--jp-search-unselected-match-background-color);
+  color: var(--jp-search-unselected-match-color);
 }
 
-.cm-searching {
-  background-color: var(
-    --jp-search-unselected-match-background-color
-  ) !important;
-  color: var(--jp-search-unselected-match-color) !important;
+.cm-searching span::selection {
+  background-color: var(--jp-search-selected-match-background-color) !important;
+  color: var(--jp-search-selected-match-color) !important;
 }
 
 .cm-trailingspace {
@@ -93,14 +74,6 @@
   background-repeat: repeat-x;
 }
 
-.CodeMirror-focused .CodeMirror-selected {
-  background-color: var(--jp-editor-selected-focused-background);
-}
-
-.CodeMirror-selected {
-  background-color: var(--jp-editor-selected-background);
-}
-
 .jp-CollaboratorCursor-hover {
   position: absolute;
   z-index: 1;
@@ -120,119 +93,6 @@
   border-left: 1px dashed var(--jp-border-color2);
 }
 
-/**
- * Here is our jupyter theme for CodeMirror syntax highlighting
- * This is used in our marked.js syntax highlighting and CodeMirror itself
- * The string "jupyter" is set in ../codemirror/widget.DEFAULT_CODEMIRROR_THEME
- * This came from the classic notebook, which came form highlight.js/GitHub
- */
-
-/**
- * CodeMirror themes are handling the background/color in this way. This works
- * fine for CodeMirror editors outside the notebook, but the notebook styles
- * these things differently.
- */
-.CodeMirror.cm-s-jupyter {
-  background: var(--jp-layout-color0);
-  color: var(--jp-content-font-color1);
-}
-
-/* In the notebook, we want this styling to be handled by its container */
-.jp-CodeConsole .CodeMirror.cm-s-jupyter,
-.jp-Notebook .CodeMirror.cm-s-jupyter {
-  background: transparent;
-}
-
-.cm-s-jupyter .CodeMirror-cursor {
-  border-left: var(--jp-code-cursor-width0) solid var(--jp-editor-cursor-color);
-}
-.cm-s-jupyter span.cm-keyword {
-  color: var(--jp-mirror-editor-keyword-color);
-  font-weight: bold;
-}
-.cm-s-jupyter span.cm-atom {
-  color: var(--jp-mirror-editor-atom-color);
-}
-.cm-s-jupyter span.cm-number {
-  color: var(--jp-mirror-editor-number-color);
-}
-.cm-s-jupyter span.cm-def {
-  color: var(--jp-mirror-editor-def-color);
-}
-.cm-s-jupyter span.cm-variable {
-  color: var(--jp-mirror-editor-variable-color);
-}
-.cm-s-jupyter span.cm-variable-2 {
-  color: var(--jp-mirror-editor-variable-2-color);
-}
-.cm-s-jupyter span.cm-variable-3 {
-  color: var(--jp-mirror-editor-variable-3-color);
-}
-.cm-s-jupyter span.cm-punctuation {
-  color: var(--jp-mirror-editor-punctuation-color);
-}
-.cm-s-jupyter span.cm-property {
-  color: var(--jp-mirror-editor-property-color);
-}
-.cm-s-jupyter span.cm-operator {
-  color: var(--jp-mirror-editor-operator-color);
-  font-weight: bold;
-}
-.cm-s-jupyter span.cm-comment {
-  color: var(--jp-mirror-editor-comment-color);
-  font-style: italic;
-}
-.cm-s-jupyter span.cm-string {
-  color: var(--jp-mirror-editor-string-color);
-}
-.cm-s-jupyter span.cm-string-2 {
-  color: var(--jp-mirror-editor-string-2-color);
-}
-.cm-s-jupyter span.cm-meta {
-  color: var(--jp-mirror-editor-meta-color);
-}
-.cm-s-jupyter span.cm-qualifier {
-  color: var(--jp-mirror-editor-qualifier-color);
-}
-.cm-s-jupyter span.cm-builtin {
-  color: var(--jp-mirror-editor-builtin-color);
-}
-.cm-s-jupyter span.cm-bracket {
-  color: var(--jp-mirror-editor-bracket-color);
-}
-.cm-s-jupyter span.cm-tag {
-  color: var(--jp-mirror-editor-tag-color);
-}
-.cm-s-jupyter span.cm-attribute {
-  color: var(--jp-mirror-editor-attribute-color);
-}
-.cm-s-jupyter span.cm-header {
-  color: var(--jp-mirror-editor-header-color);
-}
-.cm-s-jupyter span.cm-quote {
-  color: var(--jp-mirror-editor-quote-color);
-}
-.cm-s-jupyter span.cm-link {
-  color: var(--jp-mirror-editor-link-color);
-}
-.cm-s-jupyter span.cm-error {
-  color: var(--jp-mirror-editor-error-color);
-}
-.cm-s-jupyter span.cm-hr {
-  color: #999;
-}
-
-.cm-s-jupyter span.cm-tab {
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
-  background-position: right;
-  background-repeat: no-repeat;
-}
-
-.cm-s-jupyter .CodeMirror-activeline-background,
-.cm-s-jupyter .CodeMirror-gutter {
-  background-color: var(--jp-layout-color2);
-}
-
 /* Styles for shared cursors (remote cursor locations and selected ranges) */
 .jp-CodeMirrorEditor .remote-caret {
   position: relative;

package/style/index.css

@@ -6,11 +6,9 @@
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@lumino/widgets/style/index.css');
 @import url('~@jupyterlab/ui-components/style/index.css');
+@import url('~@jupyterlab/statusbar/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/codeeditor/style/index.css');
-@import url('~@jupyterlab/statusbar/style/index.css');
-@import url('~codemirror/lib/codemirror.css');
-@import url('~codemirror/addon/dialog/dialog.css');
-@import url('~codemirror/addon/fold/foldgutter.css');
+@import url('~@jupyterlab/documentsearch/style/index.css');
 
 @import url('./base.css');

package/style/index.js

@@ -6,11 +6,9 @@
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 import '@lumino/widgets/style/index.js';
 import '@jupyterlab/ui-components/style/index.js';
+import '@jupyterlab/statusbar/style/index.js';
 import '@jupyterlab/apputils/style/index.js';
 import '@jupyterlab/codeeditor/style/index.js';
-import '@jupyterlab/statusbar/style/index.js';
-import 'codemirror/lib/codemirror.css';
-import 'codemirror/addon/dialog/dialog.css';
-import 'codemirror/addon/fold/foldgutter.css';
+import '@jupyterlab/documentsearch/style/index.js';
 
 import './base.css';

package/lib/tokens.d.ts

@@ -1,18 +0,0 @@
-import { Token } from '@lumino/coreutils';
-import CodeMirror from 'codemirror';
-/**
- * The CodeMirror token.
- */
-export declare const ICodeMirror: Token<ICodeMirror>;
-/** The CodeMirror interface. */
-export interface ICodeMirror {
-    /**
-     * A singleton CodeMirror module, rexported.
-     */
-    CodeMirror: typeof CodeMirror;
-    /**
-     * A function to allow extensions to ensure that
-     * the vim keymap has been imported
-     */
-    ensureVimKeymap: () => Promise<void>;
-}

package/lib/tokens.js

@@ -1,9 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-import { Token } from '@lumino/coreutils';
-/* tslint:disable */
-/**
- * The CodeMirror token.
- */
-export const ICodeMirror = new Token('@jupyterlab/codemirror:ICodeMirror');
-//# sourceMappingURL=tokens.js.map

package/lib/tokens.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,oBAAoB;AACpB;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,KAAK,CAClC,oCAAoC,CACrC,CAAC"}