@jupyterlab/codemirror 4.0.0-alpha.9 → 4.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/codemirror",
-  "version": "4.0.0-alpha.9",
+  "version": "4.0.0-beta.1",
   "description": "JupyterLab - CodeMirror Editor Provider",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -20,16 +20,15 @@
     "lib": "lib/"
   },
   "files": [
-    "lib/*.d.ts",
-    "lib/*.js.map",
-    "lib/*.js",
+    "lib/**/*.{d.ts,js,js.map}",
     "style/*.css",
     "typings/codemirror/*.d.ts",
-    "style/index.js"
+    "style/index.js",
+    "src/**/*.{ts,tsx}"
   ],
   "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 +38,52 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/apputils": "^4.0.0-alpha.9",
-    "@jupyterlab/codeeditor": "^4.0.0-alpha.9",
-    "@jupyterlab/coreutils": "^6.0.0-alpha.9",
-    "@jupyterlab/nbformat": "^4.0.0-alpha.9",
-    "@jupyterlab/observables": "^5.0.0-alpha.9",
-    "@jupyterlab/shared-models": "^4.0.0-alpha.9",
-    "@jupyterlab/statusbar": "^4.0.0-alpha.9",
-    "@jupyterlab/translation": "^4.0.0-alpha.9",
-    "@jupyterlab/ui-components": "^4.0.0-alpha.24",
-    "@lumino/algorithm": "^1.9.1",
-    "@lumino/commands": "^1.20.0",
-    "@lumino/coreutils": "^1.12.0",
-    "@lumino/disposable": "^1.10.1",
-    "@lumino/polling": "^1.10.0",
-    "@lumino/signaling": "^1.10.1",
-    "@lumino/widgets": "^1.31.1",
-    "codemirror": "~5.61.0",
-    "react": "^17.0.1",
-    "y-codemirror": "^3.0.1"
+    "@codemirror/autocomplete": "^6.4.0",
+    "@codemirror/commands": "^6.1.0",
+    "@codemirror/lang-cpp": "^6.0.0",
+    "@codemirror/lang-css": "^6.0.0",
+    "@codemirror/lang-html": "^6.4.0",
+    "@codemirror/lang-java": "^6.0.0",
+    "@codemirror/lang-javascript": "^6.1.0",
+    "@codemirror/lang-json": "^6.0.0",
+    "@codemirror/lang-markdown": "^6.0.0",
+    "@codemirror/lang-php": "^6.0.0",
+    "@codemirror/lang-python": "^6.1.0",
+    "@codemirror/lang-rust": "^6.0.0",
+    "@codemirror/lang-sql": "^6.3.0",
+    "@codemirror/lang-wast": "^6.0.0",
+    "@codemirror/lang-xml": "^6.0.0",
+    "@codemirror/language": "^6.4.0",
+    "@codemirror/legacy-modes": "^6.3.0",
+    "@codemirror/search": "^6.2.0",
+    "@codemirror/state": "^6.2.0",
+    "@codemirror/view": "^6.7.0",
+    "@jupyter/ydoc": "^1.0.0",
+    "@jupyterlab/codeeditor": "^4.0.0-beta.1",
+    "@jupyterlab/coreutils": "^6.0.0-beta.1",
+    "@jupyterlab/documentsearch": "^4.0.0-beta.1",
+    "@jupyterlab/nbformat": "^4.0.0-beta.1",
+    "@jupyterlab/translation": "^4.0.0-beta.1",
+    "@lezer/common": "^1.0.0",
+    "@lezer/generator": "^1.0.0",
+    "@lezer/highlight": "^1.0.0",
+    "@lumino/coreutils": "^2.0.0",
+    "@lumino/disposable": "^2.0.0",
+    "@lumino/signaling": "^2.0.0",
+    "yjs": "^13.5.40"
   },
   "devDependencies": {
-    "@jupyterlab/testutils": "^4.0.0-alpha.9",
-    "@types/codemirror": "^0.0.109",
-    "@types/jest": "^26.0.10",
-    "jest": "^26.4.2",
+    "@jupyterlab/testing": "^4.0.0-beta.1",
+    "@lezer/generator": "^1.0.0",
+    "@lezer/lr": "^1.0.0",
+    "@types/jest": "^29.2.0",
+    "jest": "^29.2.0",
     "rimraf": "~3.0.0",
-    "ts-jest": "^26.3.0",
-    "typedoc": "~0.22.10",
-    "typescript": "~4.6.3"
+    "typedoc": "~0.23.25",
+    "typescript": "~5.0.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "jupyterlab": {
-    "extraStyles": {
-      "codemirror": [
-        "lib/codemirror.css",
-        "addon/dialog/dialog.css",
-        "addon/fold/foldgutter.css"
-      ]
-    }
-  },
   "styleModule": "style/index.js"
 }

package/src/codemirror-ipythongfm.ts

@@ -0,0 +1,109 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+// TODO: add support for LaTeX
+// This should be coded as an extension for https://github.com/lezer-parser/markdown
+// see https://github.com/lezer-parser/markdown/blob/main/src/extension.ts for examples
+// Then this extension can be passed to the markdown function above:
+//
+// load: () => {
+//   return import('@codemirror/lang-markdown').then(m => m.markdown({extensions: latex}));
+// }
+
+/*import CodeMirror from 'codemirror';
+import 'codemirror/addon/mode/multiplex';
+import 'codemirror/mode/gfm/gfm';
+import 'codemirror/mode/stex/stex';
+*/
+/**
+ * Define an IPython GFM (GitHub Flavored Markdown) mode.
+ *
+ * Is just a slightly altered GFM Mode with support for LaTeX.
+ * LaTeX support was supported by Codemirror GFM as of
+ *   https://github.com/codemirror/CodeMirror/pull/567
+ *  But was later removed in
+ *   https://github.com/codemirror/CodeMirror/commit/d9c9f1b1ffe984aee41307f3e927f80d1f23590c
+ */
+/*CodeMirror.defineMode(
+  'ipythongfm',
+  (config: CodeMirror.EditorConfiguration, modeOptions?: any) => {
+    const gfmMode = CodeMirror.getMode(config, {
+      name: 'gfm',
+      // Override list3 with an under-used token, rather than `keyword`
+      tokenTypeOverrides: { list3: 'string-2' }
+    });
+    const texMode = CodeMirror.getMode(config, {
+      name: 'stex',
+      inMathMode: true
+    });
+
+    return CodeMirror.multiplexingMode(
+      gfmMode,
+      // force parsing inline code and code blocks with gfmMode to prevent
+      // parsing them as tex see:
+      // https://github.com/jupyterlab/jupyterlab/issues/6774
+      {
+        open: '<code>',
+        close: '</code>',
+        mode: gfmMode,
+        parseDelimiters: true
+      },
+      {
+        open: '<pre>',
+        close: '</pre>',
+        mode: gfmMode,
+        parseDelimiters: true
+      },
+      {
+        open: '```',
+        close: '```',
+        mode: gfmMode,
+        parseDelimiters: true
+      },
+      {
+        open: '`',
+        close: '`',
+        mode: gfmMode,
+        parseDelimiters: true
+      },
+      // only if we did not match a code element or block,
+      // then try do parse using the tex mode
+      {
+        open: '$$',
+        close: '$$',
+        mode: texMode,
+        delimStyle: 'delimit'
+      },
+      {
+        // `$math mode$` is only matched if both opening
+        // and closing $ are in the same line
+        open: /\$(?=.*\$)/,
+        close: '$',
+        mode: texMode,
+        delimStyle: 'delimit'
+      },
+      {
+        open: '\\(',
+        close: '\\)',
+        mode: texMode,
+        delimStyle: 'delimit'
+      },
+      {
+        open: '\\[',
+        close: '\\]',
+        mode: texMode,
+        delimStyle: 'delimit'
+      }
+      // .. more multiplexed styles can follow here
+    );
+  },
+  'gfm'
+);
+
+CodeMirror.defineMIME('text/x-ipythongfm', 'ipythongfm');
+CodeMirror.modeInfo.push({
+  ext: [],
+  mime: 'text/x-ipythongfm',
+  mode: 'ipythongfm',
+  name: 'ipythongfm'
+});*/

package/src/commands.ts

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+
+import { indentMore, insertTab } from '@codemirror/commands';
+import { EditorState, Transaction } from '@codemirror/state';
+
+/**
+ * CodeMirror commands namespace
+ */
+export namespace StateCommands {
+  /**
+   * Indent or insert a tab as appropriate.
+   */
+  export function indentMoreOrInsertTab(target: {
+    state: EditorState;
+    dispatch: (transaction: Transaction) => void;
+  }): boolean {
+    const arg = { state: target.state, dispatch: target.dispatch };
+    const from = target.state.selection.main.from;
+    const to = target.state.selection.main.to;
+    if (from != to) {
+      return indentMore(arg);
+    }
+    const line = target.state.doc.lineAt(from);
+    const before = target.state.doc.slice(line.from, from).toString();
+    if (/^\s*$/.test(before)) {
+      return indentMore(arg);
+    } else {
+      return insertTab(arg);
+    }
+  }
+}