@jupyterlab/codemirror 4.0.0-alpha.10 → 4.0.0-alpha.13

package/lib/editortheme.js

@@ -0,0 +1,167 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+import { defaultHighlightStyle, HighlightStyle, syntaxHighlighting } from '@codemirror/language';
+import { EditorView } from '@codemirror/view';
+import { tags as t } from '@lezer/highlight';
+export const jupyterEditorTheme = EditorView.theme({
+    /**
+     * 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.
+     */
+    '&': {
+        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 &, .jp-Notebook &': {
+        background: 'transparent'
+    },
+    '.cm-content': {
+        caretColor: 'var(--jp-editor-cursor-color)'
+    },
+    '.cm-cursor, .cm-dropCursor': {
+        borderLeft: 'var(--jp-code-cursor-width0) solid var(--jp-editor-cursor-color)'
+    },
+    '.cm-selectionBackground, .cm-content ::selection': {
+        backgroundColor: 'var(--jp-editor-selected-background)'
+    },
+    '&.cm-focused .cm-selectionBackground': {
+        backgroundColor: 'var(--jp-editor-selected-focused-background)'
+    },
+    '.cm-gutters': {
+        borderRight: '1px solid var(--jp-border-color2)',
+        backgroundColor: 'var(--jp-layout-color2)'
+    },
+    '.cm-gutter, .cm-activeLine': {
+        backgroundColor: 'var(--jp-layout-color2)'
+    },
+    '.cm-searchMatch': {
+        backgroundColor: 'var(--jp-search-unselected-match-background-color)',
+        color: 'var(--jp-search-unselected-match-color)'
+    },
+    '.cm-searchMatch.cm-searchMatch-selected': {
+        backgroundColor: 'var(--jp-search-selected-match-background-color) !important',
+        color: 'var(--jp-search-selected-match-color) !important'
+    }
+});
+// The list of available tags for syntax highlighting is available at
+// https://lezer.codemirror.net/docs/ref/#highlight.tags
+export const jupyterHighlightStyle = HighlightStyle.define([
+    // Order matters - a rule will override the previous ones; important for example for in headings styles.
+    { tag: t.meta, color: 'var(--jp-mirror-editor-meta-color)' },
+    { tag: t.heading, color: 'var(--jp-mirror-editor-header-color)' },
+    {
+        tag: [t.heading1, t.heading2, t.heading3, t.heading4],
+        color: 'var(--jp-mirror-editor-header-color)',
+        fontWeight: 'bold'
+    },
+    {
+        tag: t.keyword,
+        color: 'var(--jp-mirror-editor-keyword-color)',
+        fontWeight: 'bold'
+    },
+    { tag: t.atom, color: 'var(--jp-mirror-editor-atom-color)' },
+    { tag: t.number, color: 'var(--jp-mirror-editor-number-color)' },
+    {
+        tag: [t.definition(t.name), t.function(t.definition(t.variableName))],
+        color: 'var(--jp-mirror-editor-def-color)'
+    },
+    { tag: t.variableName, color: 'var(--jp-mirror-editor-variable-color)' },
+    {
+        tag: [t.special(t.variableName), t.self],
+        color: 'var(--jp-mirror-editor-variable-2-color)'
+    },
+    { tag: t.punctuation, color: 'var(--jp-mirror-editor-punctuation-color)' },
+    { tag: t.propertyName, color: 'var(--jp-mirror-editor-property-color)' },
+    {
+        tag: t.operator,
+        color: 'var(--jp-mirror-editor-operator-color)',
+        fontWeight: 'bold'
+    },
+    {
+        tag: t.comment,
+        color: 'var(--jp-mirror-editor-comment-color)',
+        fontStyle: 'italic'
+    },
+    { tag: t.string, color: 'var(--jp-mirror-editor-string-color)' },
+    {
+        tag: [t.labelName, t.monospace, t.special(t.string)],
+        color: 'var(--jp-mirror-editor-string-2-color)'
+    },
+    { tag: t.bracket, color: 'var(--jp-mirror-editor-bracket-color)' },
+    { tag: t.tagName, color: 'var(--jp-mirror-editor-tag-color)' },
+    { tag: t.attributeName, color: 'var(--jp-mirror-editor-attribute-color)' },
+    { tag: t.quote, color: 'var(--jp-mirror-editor-quote-color)' },
+    {
+        tag: t.link,
+        color: 'var(--jp-mirror-editor-link-color)',
+        textDecoration: 'underline'
+    },
+    { tag: [t.separator, t.derefOperator, t.paren], color: '' },
+    { tag: t.strong, fontWeight: 'bold' },
+    { tag: t.emphasis, fontStyle: 'italic' },
+    { tag: t.strikethrough, textDecoration: 'line-through' }
+]);
+/**
+ * JupyterLab CodeMirror 6 theme
+ */
+export const jupyterTheme = [
+    jupyterEditorTheme,
+    syntaxHighlighting(jupyterHighlightStyle)
+];
+/**
+ * A namespace to handle CodeMirror 6 theme
+ *
+ * @alpha
+ */
+export var Theme;
+(function (Theme) {
+    /**
+     * CodeMirror 6 themes
+     */
+    const themeMap = new Map([
+        [
+            'codemirror',
+            [EditorView.baseTheme({}), syntaxHighlighting(defaultHighlightStyle)]
+        ],
+        ['jupyter', jupyterTheme]
+    ]);
+    /**
+     * Get the default CodeMirror 6 theme for JupyterLab
+     *
+     * @alpha
+     * @returns Default theme
+     */
+    function defaultTheme() {
+        return themeMap.get('jupyter');
+    }
+    Theme.defaultTheme = defaultTheme;
+    /**
+     * Register a new theme.
+     *
+     * @alpha
+     * @param name Theme name
+     * @param theme Codemirror 6 theme extension
+     */
+    function registerTheme(name, theme) {
+        themeMap.set(name, theme);
+    }
+    Theme.registerTheme = registerTheme;
+    /**
+     * Get a theme.
+     *
+     * #### Notes
+     * It falls back to the default theme
+     *
+     * @alpha
+     * @param name Theme name
+     * @returns Theme extension
+     */
+    function getTheme(name) {
+        let ext = themeMap.get(name);
+        return ext !== null && ext !== void 0 ? ext : this.defaultTheme();
+    }
+    Theme.getTheme = getTheme;
+})(Theme || (Theme = {}));
+//# sourceMappingURL=editortheme.js.map

package/lib/editortheme.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editortheme.js","sourceRoot":"","sources":["../src/editortheme.ts"],"names":[],"mappings":"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"}

package/lib/factory.js

@@ -1,5 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
+import { indentLess } from '@codemirror/commands';
+import { searchKeymap } from '@codemirror/search';
 import { nullTranslator } from '@jupyterlab/translation';
 import { CodeMirrorEditor } from './editor';
 /**
@@ -25,26 +27,27 @@ export class CodeMirrorEditorFactory {
             return new CodeMirrorEditor(Object.assign(Object.assign({}, options), { config: Object.assign(Object.assign({}, this.documentCodeMirrorConfig), (options.config || {})), translator: this.translator }));
         };
         this.translator = translator || nullTranslator;
-        this.inlineCodeMirrorConfig = Object.assign(Object.assign(Object.assign({}, CodeMirrorEditor.defaultConfig), { extraKeys: {
-                'Cmd-Right': 'goLineRight',
-                End: 'goLineRight',
-                'Cmd-Left': 'goLineLeft',
-                Tab: 'indentMoreOrinsertTab',
-                'Shift-Tab': 'indentLess',
-                'Cmd-/': cm => cm.toggleComment({ indent: true }),
-                'Ctrl-/': cm => cm.toggleComment({ indent: true }),
-                'Ctrl-G': 'find',
-                'Cmd-G': 'find'
-            } }), defaults);
-        this.documentCodeMirrorConfig = Object.assign(Object.assign(Object.assign({}, CodeMirrorEditor.defaultConfig), { extraKeys: {
-                Tab: 'indentMoreOrinsertTab',
-                'Shift-Tab': 'indentLess',
-                'Cmd-/': cm => cm.toggleComment({ indent: true }),
-                'Ctrl-/': cm => cm.toggleComment({ indent: true }),
-                'Shift-Enter': () => {
-                    /* no-op */
+        this.inlineCodeMirrorConfig = Object.assign(Object.assign(Object.assign({}, CodeMirrorEditor.defaultConfig), { extraKeys: [
+                {
+                    key: 'Tab',
+                    run: CodeMirrorEditor.indentMoreOrInsertTab,
+                    shift: indentLess
+                },
+                ...searchKeymap
+            ] }), defaults);
+        this.documentCodeMirrorConfig = Object.assign(Object.assign(Object.assign({}, CodeMirrorEditor.defaultConfig), { extraKeys: [
+                {
+                    key: 'Tab',
+                    run: CodeMirrorEditor.indentMoreOrInsertTab,
+                    shift: indentLess
+                },
+                {
+                    key: 'Shift-Enter',
+                    run: (target) => {
+                        return true;
+                    }
                 }
-            }, lineNumbers: true, scrollPastEnd: true }), defaults);
+            ], lineNumbers: true, scrollPastEnd: true }), defaults);
     }
 }
 //# sourceMappingURL=factory.js.map

package/lib/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAG3D,OAAO,EAAe,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C;;GAEG;AACH,MAAM,OAAO,uBAAuB;IAClC;;OAEG;IACH,YACE,WAA8C,EAAE,EAChD,UAAwB;QAmC1B;;WAEG;QACH,oBAAe,GAAG,CAAC,OAA4B,EAAoB,EAAE;YACnE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;YACrC,OAAO,IAAI,gBAAgB,iCACtB,OAAO,KACV,MAAM,kCAAO,IAAI,CAAC,sBAAsB,GAAK,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,GACnE,UAAU,EAAE,IAAI,CAAC,UAAU,IAC3B,CAAC;QACL,CAAC,CAAC;QAEF;;WAEG;QACH,sBAAiB,GAAG,CAAC,OAA4B,EAAoB,EAAE;YACrE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;YACvC,OAAO,IAAI,gBAAgB,iCACtB,OAAO,KACV,MAAM,kCAAO,IAAI,CAAC,wBAAwB,GAAK,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,GACrE,UAAU,EAAE,IAAI,CAAC,UAAU,IAC3B,CAAC;QACL,CAAC,CAAC;QAvDA,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,cAAc,CAAC;QAC/C,IAAI,CAAC,sBAAsB,iDACtB,gBAAgB,CAAC,aAAa,KACjC,SAAS,EAAE;gBACT,WAAW,EAAE,aAAa;gBAC1B,GAAG,EAAE,aAAa;gBAClB,UAAU,EAAE,YAAY;gBACxB,GAAG,EAAE,uBAAuB;gBAC5B,WAAW,EAAE,YAAY;gBACzB,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBACjD,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBAClD,QAAQ,EAAE,MAAM;gBAChB,OAAO,EAAE,MAAM;aAChB,KACE,QAAQ,CACZ,CAAC;QACF,IAAI,CAAC,wBAAwB,iDACxB,gBAAgB,CAAC,aAAa,KACjC,SAAS,EAAE;gBACT,GAAG,EAAE,uBAAuB;gBAC5B,WAAW,EAAE,YAAY;gBACzB,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBACjD,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBAClD,aAAa,EAAE,GAAG,EAAE;oBAClB,WAAW;gBACb,CAAC;aACF,EACD,WAAW,EAAE,IAAI,EACjB,aAAa,EAAE,IAAI,KAChB,QAAQ,CACZ,CAAC;IACJ,CAAC;CA6BF"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAe,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C;;GAEG;AACH,MAAM,OAAO,uBAAuB;IAClC;;OAEG;IACH,YACE,WAA8C,EAAE,EAChD,UAAwB;QAoC1B;;WAEG;QACH,oBAAe,GAAG,CAAC,OAA4B,EAAoB,EAAE;YACnE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;YACrC,OAAO,IAAI,gBAAgB,iCACtB,OAAO,KACV,MAAM,kCAAO,IAAI,CAAC,sBAAsB,GAAK,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,GACnE,UAAU,EAAE,IAAI,CAAC,UAAU,IAC3B,CAAC;QACL,CAAC,CAAC;QAEF;;WAEG;QACH,sBAAiB,GAAG,CAAC,OAA4B,EAAoB,EAAE;YACrE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;YACvC,OAAO,IAAI,gBAAgB,iCACtB,OAAO,KACV,MAAM,kCAAO,IAAI,CAAC,wBAAwB,GAAK,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,GACrE,UAAU,EAAE,IAAI,CAAC,UAAU,IAC3B,CAAC;QACL,CAAC,CAAC;QAxDA,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,cAAc,CAAC;QAC/C,IAAI,CAAC,sBAAsB,iDACtB,gBAAgB,CAAC,aAAa,KACjC,SAAS,EAAE;gBACT;oBACE,GAAG,EAAE,KAAK;oBACV,GAAG,EAAE,gBAAgB,CAAC,qBAAqB;oBAC3C,KAAK,EAAE,UAAU;iBAClB;gBACD,GAAG,YAAY;aAChB,KACE,QAAQ,CACZ,CAAC;QACF,IAAI,CAAC,wBAAwB,iDACxB,gBAAgB,CAAC,aAAa,KACjC,SAAS,EAAE;gBACT;oBACE,GAAG,EAAE,KAAK;oBACV,GAAG,EAAE,gBAAgB,CAAC,qBAAqB;oBAC3C,KAAK,EAAE,UAAU;iBAClB;gBACD;oBACE,GAAG,EAAE,aAAa;oBAClB,GAAG,EAAE,CAAC,MAAkB,EAAE,EAAE;wBAC1B,OAAO,IAAI,CAAC;oBACd,CAAC;iBACF;aACF,EACD,WAAW,EAAE,IAAI,EACjB,aAAa,EAAE,IAAI,KAChB,QAAQ,CACZ,CAAC;IACJ,CAAC;CA6BF"}

package/lib/index.d.ts

@@ -5,11 +5,11 @@
 import { IEditorServices } from '@jupyterlab/codeeditor';
 export * from './editor';
 export * from './factory';
+export * from './searchprovider';
 export * from './mimetype';
 export * from './mode';
-export * from './searchprovider';
 export * from './syntaxstatus';
-export * from './tokens';
+export * from './editortheme';
 /**
  * The default editor services.
  */

package/lib/index.js

@@ -8,11 +8,11 @@ import { CodeMirrorEditorFactory } from './factory';
 import { CodeMirrorMimeTypeService } from './mimetype';
 export * from './editor';
 export * from './factory';
+export * from './searchprovider';
 export * from './mimetype';
 export * from './mode';
-export * from './searchprovider';
 export * from './syntaxstatus';
-export * from './tokens';
+export * from './editortheme';
 /**
  * The default editor services.
  */

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAC3D;;;GAGG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEvD,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AAEzB;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAoB;IAC7C,cAAc,EAAE,IAAI,uBAAuB,EAAE;IAC7C,eAAe,EAAE,IAAI,yBAAyB,EAAE;CACjD,CAAC;AAEF;;;;;;;;;;GAUG"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAC3D;;;GAGG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEvD,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC;AACvB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAE9B;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAoB;IAC7C,cAAc,EAAE,IAAI,uBAAuB,EAAE;IAC7C,eAAe,EAAE,IAAI,yBAAyB,EAAE;CACjD,CAAC;AAEF;;;;;;;;;;GAUG"}

package/lib/mimetype.js

@@ -1,5 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
+import { IEditorMimeTypeService } from '@jupyterlab/codeeditor';
 import { PathExt } from '@jupyterlab/coreutils';
 import { Mode } from './mode';
 /**
@@ -14,11 +15,14 @@ export class CodeMirrorMimeTypeService {
      */
     getMimeTypeByLanguage(info) {
         const ext = info.file_extension || '';
-        return Mode.findBest(info.codemirror_mode || {
+        const mode = Mode.findBest(info.codemirror_mode || {
             mimetype: info.mimetype,
             name: info.name,
             ext: [ext.split('.').slice(-1)[0]]
-        }).mime;
+        });
+        return mode
+            ? mode.mime
+            : IEditorMimeTypeService.defaultMimeType;
     }
     /**
      * Returns a mime type for the given file path.
@@ -35,7 +39,9 @@ export class CodeMirrorMimeTypeService {
             return 'text/x-ipythongfm';
         }
         const mode = Mode.findByFileName(path) || Mode.findBest('');
-        return mode.mime;
+        return mode
+            ? mode.mime
+            : IEditorMimeTypeService.defaultMimeType;
     }
 }
 //# sourceMappingURL=mimetype.js.map

package/lib/mimetype.js.map

@@ -1 +1 @@
-{"version":3,"file":"mimetype.js","sourceRoot":"","sources":["../src/mimetype.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B;;GAEG;AACH,MAAM,OAAO,yBAAyB;IACpC;;;;;OAKG;IACH,qBAAqB,CAAC,IAAoC;QACxD,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC,QAAQ,CACjB,IAAI,CAAC,eAAuB,IAAI;YAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACnC,CACF,CAAC,IAAc,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,IAAY;QAChC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,GAAG,KAAK,MAAM,EAAE;YAClB,OAAO,eAAe,CAAC;SACxB;aAAM,IAAI,GAAG,KAAK,KAAK,EAAE;YACxB,OAAO,mBAAmB,CAAC;SAC5B;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,IAAc,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"mimetype.js","sourceRoot":"","sources":["../src/mimetype.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B;;GAEG;AACH,MAAM,OAAO,yBAAyB;IACpC;;;;;OAKG;IACH,qBAAqB,CAAC,IAAoC;QACxD,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CACvB,IAAI,CAAC,eAAuB,IAAI;YAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACnC,CACF,CAAC;QACF,OAAO,IAAI;YACT,CAAC,CAAE,IAAI,CAAC,IAAe;YACvB,CAAC,CAAC,sBAAsB,CAAC,eAAe,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,IAAY;QAChC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,GAAG,KAAK,MAAM,EAAE;YAClB,OAAO,eAAe,CAAC;SACxB;aAAM,IAAI,GAAG,KAAK,KAAK,EAAE;YACxB,OAAO,mBAAmB,CAAC;SAC5B;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC5D,OAAO,IAAI;YACT,CAAC,CAAE,IAAI,CAAC,IAAe;YACvB,CAAC,CAAC,sBAAsB,CAAC,eAAe,CAAC;IAC7C,CAAC;CACF"}

package/lib/mode.d.ts

@@ -1,82 +1,88 @@
-import { JSONValue } from '@lumino/coreutils';
-import 'codemirror/addon/runmode/runmode';
-import 'codemirror/mode/clike/clike';
-import 'codemirror/mode/css/css';
-import 'codemirror/mode/javascript/javascript';
-import 'codemirror/mode/jsx/jsx';
-import 'codemirror/mode/julia/julia';
-import 'codemirror/mode/markdown/markdown';
-import 'codemirror/mode/meta';
-import 'codemirror/mode/r/r';
-import 'codemirror/mode/shell/shell';
-import 'codemirror/mode/sql/sql';
-import './codemirror-ipython';
-import './codemirror-ipythongfm';
-/**
- * The namespace for CodeMirror Mode functionality.
- */
+import { LanguageSupport, StreamParser } from '@codemirror/language';
 export declare namespace Mode {
     /**
-     * The interface of a codemirror modeInfo spec.
+     * The interface of a codemirror language spec.
      */
     interface ISpec {
-        ext?: string[];
-        name?: string;
-        mode: string;
-        mime: string;
-    }
-    /**
-     * The interface of a codemirror mode spec.
-     */
-    interface IMode {
         name: string;
-        [key: string]: JSONValue;
-    }
-    /**
-     * The interface for a codemirror spec resolver.
-     */
-    interface ISpecLoader {
-        /**
-         * A function which returns whether it was successfully loaded
-         */
-        (spec: ISpec): Promise<boolean>;
+        alias?: readonly string[];
+        mime: string | readonly string[];
+        load?: () => Promise<LanguageSupport>;
+        extensions?: readonly string[];
+        filename?: RegExp;
+        support?: LanguageSupport;
     }
+    function legacy(parser: StreamParser<unknown>): LanguageSupport;
     /**
      * Get the raw list of available modes specs.
+     *
+     * @alpha
+     * @returns The available modes
      */
     function getModeInfo(): ISpec[];
     /**
-     * Running a CodeMirror mode outside of an editor.
+     * Find a codemirror mode by MIME.
+     *
+     * @alpha
+     * @param mime Mime type to look for
+     * @returns The mode or null
      */
-    function run(code: string, mode: string | ISpec, el: HTMLElement): void;
+    function findByMIME(mime: string | readonly string[]): ISpec | null;
     /**
-     * Ensure a codemirror mode is available by name or Codemirror spec.
+     * Find a codemirror mode by name.
      *
-     * @param mode - The mode to ensure.  If it is a string, uses [findBest]
-     *   to get the appropriate spec.
+     * @alpha
+     * @param name The mode name
+     * @returns The mode or null
+     */
+    function findByName(name: string): ISpec | null;
+    /**
+     * Find a codemirror mode by extension.
      *
-     * @returns A promise that resolves when the mode is available.
+     * @alpha
+     * @param ext The extension name
+     * @returns The mode or null
      */
-    function ensure(mode: string | ISpec): Promise<ISpec | null>;
-    function addSpecLoader(loader: ISpecLoader, rank: number): void;
+    function findByExtension(ext: string | readonly string[]): ISpec | null;
     /**
-     * Find a codemirror mode by name or CodeMirror spec.
+     * Find a codemirror mode by filename.
+     *
+     * @param name File name
+     * @returns The mode or null
      */
-    function findBest(mode: string | ISpec): ISpec;
+    function findByFileName(name: string): ISpec | null;
     /**
-     * Find a codemirror mode by MIME.
+     * Find a codemirror mode by name or CodeMirror spec.
+     *
+     * @alpha
+     * @param mode The CodeMirror mode
+     * @param fallback Whether to fallback to default mimetype spec or not
+     * @returns The mode or null
      */
-    function findByMIME(mime: string): ISpec;
+    function findBest(mode: string | ISpec, fallback?: boolean): ISpec | null;
     /**
-     * Find a codemirror mode by name.
+     * Ensure a codemirror mode is available by name or Codemirror spec.
+     *
+     * @param mode - The mode to ensure.  If it is a string, uses [findBest]
+     *   to get the appropriate spec.
+     *
+     * @returns A promise that resolves when the mode is available.
      */
-    function findByName(name: string): ISpec;
+    function ensure(mode: string | ISpec): Promise<ISpec | null>;
     /**
-     * Find a codemirror mode by filename.
+     * Register a new mode for CodeMirror
+     *
+     * @alpha
+     * @param mode Mode to register
      */
-    function findByFileName(name: string): ISpec;
+    function registerModeInfo(mode: ISpec): void;
     /**
-     * Find a codemirror mode by extension.
+     * Parse and style a string.
+     *
+     * @alpha
+     * @param code Code to highlight
+     * @param mode Code mode
+     * @param el HTML element into which the highlighted code will be inserted
      */
-    function findByExtension(ext: string | string[]): ISpec | null;
+    function run(code: string, mode: ISpec, el: HTMLElement): void;
 }