Merge pull request #696 from Systems-Modeling/ST6RI-766

ST6RI-766 Update to JupyterLab version 4.x in the Jupyter deployment

Author: seidewitz

org.omg.sysml.jupyter.installer/install.bat

@@ -41,7 +41,7 @@ call java -version || goto :error
 
 echo --- Step 3: Installing Jupyter SysML kernel and dependencies ---
 call jupyter kernelspec remove sysml -f >nul 2>&1
-call conda install "jupyter-sysml-kernel=%SYSML_VERSION%" python=3.* jupyterlab=3.* graphviz=2.* nodejs="<17" -c conda-forge -y || goto:error
+call conda install "jupyter-sysml-kernel=%SYSML_VERSION%" python=3.* jupyterlab=4.* graphviz=2.* nodejs -c conda-forge -y || goto:error
 
 echo --- Step 4: Installing JupyterLab SysML extension ---
 call jupyter labextension uninstall @systems-modeling/jupyterlab-sysml

org.omg.sysml.jupyter.installer/install.sh

@@ -34,7 +34,7 @@ java -version
 
 echo "--- Step 3: Installing Jupyter SysML kernel and dependencies ---"
 jupyter kernelspec remove sysml -f > /dev/null 2>&1 || true
-conda install "jupyter-sysml-kernel=$SYSML_VERSION" python=3.* jupyterlab=3.* graphviz=2.* nodejs="<17" -c conda-forge -y
+conda install "jupyter-sysml-kernel=$SYSML_VERSION" python=3.* jupyterlab=4.* graphviz=2.* nodejs -c conda-forge -y
 
 echo "--- Step 4: Installing JupyterLab SysML extension ---"
 jupyter labextension uninstall @systems-modeling/jupyterlab-sysml > /dev/null 2>&1 || true

org.omg.sysml.jupyter.jupyterlab/.gitignore

@@ -5,4 +5,5 @@ build
 data
 log
 scrap
-.gradle
+.gradle
+yarn.lock

org.omg.sysml.jupyter.jupyterlab/package.json

@@ -5,32 +5,26 @@
   "repository": "github:Systems-Modeling/SysML-v2-Pilot-Implementation",
   "author": "SysML v2 Submission Team",
   "license": "LGPL-3.0-or-later",
+  "main": "build/plugin.js",
   "keywords": [
     "jupyter",
     "jupyterlab",
     "jupyterlab-extension"
   ],
   "dependencies": {
-    "@jupyterlab/application": "3.x"
+    "@jupyterlab/application": "4.x"
   },
   "devDependencies": {
-    "@types/codemirror": "^0.0.98",
+    "@codemirror/legacy-modes": "^6.3.2",
+    "@jupyterlab/codemirror": ">=4.0",
     "@types/json-schema": "*",
-    "typescript": "<4.4.0"
-  },
-  "resolutions": {
-    "@lumino/coreutils": "^1.11.0",
-    "@lumino/widgets": "^1.37.2",
-    "lib0": "0.2.108"
-  },
-  "peerDependencies": {
-    "codemirror": "^5.58.1"
+    "typescript": "~5.8.3"
   },
   "files": [
     "build/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}"
   ],
   "jupyterlab": {
-    "extension": "build/plugin.js"
+    "extension": true
   },
   "scripts": {
     "build": "tsc",

org.omg.sysml.jupyter.jupyterlab/src/main/fold.ts

@@ -0,0 +1,120 @@
+/*
+ * SysML 2 Pilot Implementation
+ * Copyright (c) 2020-2025 Mgnite Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ */
+
+import { IEditorExtensionFactory } from "@jupyterlab/codemirror";
+import { EditorState, Extension } from '@codemirror/state';
+import { foldService, syntaxTree, language } from '@codemirror/language';
+import { SyntaxNode } from '@lezer/common';
+
+function isInStringCommentOrVariable(state: EditorState, pos: number): boolean {
+    const tree = syntaxTree(state);
+    let node: SyntaxNode | null = tree.resolveInner(pos, 1);
+    
+    while (node) {
+        const nodeType = node.type.name;
+        // Check if we're in a string, comment, or other non-code context
+        // Note that 'variableName' correesponds to a quoted name
+        if (nodeType === 'String' || 
+            nodeType === 'Comment' || 
+            nodeType === 'BlockComment' ||
+            nodeType === 'LineComment' ||
+            nodeType === 'variableName' ||
+            nodeType.toLowerCase().includes('string') ||
+            nodeType.toLowerCase().includes('comment')) {
+            return true;
+        }
+        node = node.parent;
+    }
+    return false;
+}
+
+function findMatchingCloseBrace(state: EditorState, openPos: number): number | null {
+    const docLength = state.doc.length;
+    let nest = 1;
+    let pos = openPos + 1;
+    
+    while (pos < docLength && nest > 0) {
+        const char = state.sliceDoc(pos, pos + 1);
+        // Skip if we're in a string, comment, or variable
+        if (!isInStringCommentOrVariable(state, pos)) {
+            if (char === '{') {
+                nest++;
+            } else if (char === '}') {
+                nest--;
+                if (nest === 0) {
+                    return pos;
+                }
+            }
+        }
+        pos++;
+    }
+    
+    return null;
+}
+
+function computeFoldRange(state: EditorState, lineStart: number, lineEnd: number) {
+    // Check the language first
+    const lang = state.facet(language);
+    if (!lang || lang.name !== 'sysml') return null;
+
+    const lineText = state.sliceDoc(lineStart, lineEnd);
+    
+    for (let i = 0; i < lineText.length; i++) {
+        const char = lineText[i];
+        if (char === '{') {
+            const absolutePos = lineStart + i;
+            
+            // Check if this brace is in a string, comment, or variable
+            if (isInStringCommentOrVariable(state, absolutePos)) {
+                continue;
+            }
+            
+            // Find the matching closing brace
+            const closePos = findMatchingCloseBrace(state, absolutePos);
+            if (closePos === null) {
+                return null;
+            }
+            
+            // Check if the fold spans multiple lines
+            const openLine = state.doc.lineAt(absolutePos);
+            const closeLine = state.doc.lineAt(closePos);
+            
+            if (openLine.number === closeLine.number) {
+                /* Do not fold the same line */
+                return null;
+            }
+            
+            return { from: absolutePos, to: closePos };
+        }
+    }
+    
+    return null;
+}
+
+export function sysmlFoldServiceSelection(options: IEditorExtensionFactory.IOptions): Extension {
+    const mimeType = options.model.mimeType;
+    if (mimeType === 'text/x-sysml'
+        // In the newly created notebook, the first cell is initialized as 'text/plain'
+        // We check the language in the foldService as well to avoid misapplication.
+        || mimeType === 'text/plain') {
+        return [ foldService.of(computeFoldRange) ];
+    } else {
+        return [];
+    }
+}

org.omg.sysml.jupyter.jupyterlab/src/main/mode.ts

@@ -23,90 +23,68 @@
  *   $GIT_REPO_DIR/tool-support/syntax-highlighting/jupyter/mode_template.ts
  */
 
-// tslint:disable-next-line
-import 'codemirror/addon/mode/simple';
-
-import * as CodeMirror from 'codemirror';
-
-const SI_MODE = 'sysml';
-const P_MIME = 'text/x-sysml'
+import {StringStream} from "@codemirror/language"
+import { clike } from '@codemirror/legacy-modes/mode/clike';
 
 const f_wordify = (h: any, s: string) => ({...h, [s]: true});
-
-export function defineSysMLv2Mode(): void {
-    CodeMirror.defineMode(SI_MODE, (gc_mode, gc_parser) => {
-        return CodeMirror.getMode(gc_mode, {
-            name: 'clike',
-            keywords: [
-                "about", "abstract", "accept", "action", "actor", "after", "alias", "all", "allocate", "allocation",
-                "analysis", "and", "as", "assert", "assign", "assume", "at", "attribute", "bind", "binding", "by",
-                "calc", "case", "comment", "concern", "connect", "connection", "constant", "constraint", "crosses",
-                "decide", "def", "default", "defined", "dependency", "derived", "do", "doc", "else", "end", "entry",
-                "enum", "event", "exhibit", "exit", "expose", "filter", "first", "flow", "for", "fork", "frame", "from",
-                "hastype", "if", "implies", "import", "in", "include", "individual", "inout", "interface", "istype",
-                "item", "join", "language", "library", "locale", "loop", "merge", "message", "meta", "metadata", "new",
-                "nonunique", "not", "objective", "occurrence", "of", "or", "ordered", "out", "package", "parallel",
-                "part", "perform", "port", "private", "protected", "public", "redefines", "ref", "references", "render",
-                "rendering", "rep", "require", "requirement", "return", "satisfy", "send", "snapshot", "specializes",
-                "stakeholder", "standard", "state", "subject", "subsets", "succession", "terminate", "then",
-                "timeslice", "to", "transition", "until", "use", "variant", "variation", "verification", "verify",
-                "via", "view", "viewpoint", "when", "while", "xor"
-            ].reduce(f_wordify, {}),
-            defKeywords: [
-                "action", "allocation", "analysis", "attribute", "binding", "calc", "case", "comment", "concern",
-                "connection", "constraint", "def", "doc", "enum", "flow", "interface", "item", "metadata", "objective",
-                "occurrence", "package", "part", "port", "ref", "rendering", "rep", "requirement", "snapshot", "state",
-                "subject", "succession", "timeslice", "transition", "verification", "view", "viewpoint"
-            ].reduce(f_wordify, {}),
-            typeFirstDefinitions: true,
-            atoms: ['true', 'false', 'null'].reduce(f_wordify),
-            number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
-            modeProps: {
-                fold: ['brace'],
+export const sysmlparser = clike({
+        name: 'sysml',
+        keywords: [
+            "about", "abstract", "accept", "action", "actor", "after", "alias", "all", "allocate", "allocation",
+            "analysis", "and", "as", "assert", "assign", "assume", "at", "attribute", "bind", "binding", "by",
+            "calc", "case", "comment", "concern", "connect", "connection", "constant", "constraint", "crosses",
+            "decide", "def", "default", "defined", "dependency", "derived", "do", "doc", "else", "end", "entry",
+            "enum", "event", "exhibit", "exit", "expose", "filter", "first", "flow", "for", "fork", "frame", "from",
+            "hastype", "if", "implies", "import", "in", "include", "individual", "inout", "interface", "istype",
+            "item", "join", "language", "library", "locale", "loop", "merge", "message", "meta", "metadata", "new",
+            "nonunique", "not", "objective", "occurrence", "of", "or", "ordered", "out", "package", "parallel",
+            "part", "perform", "port", "private", "protected", "public", "redefines", "ref", "references", "render",
+            "rendering", "rep", "require", "requirement", "return", "satisfy", "send", "snapshot", "specializes",
+            "stakeholder", "standard", "state", "subject", "subsets", "succession", "terminate", "then",
+            "timeslice", "to", "transition", "until", "use", "variant", "variation", "verification", "verify",
+            "via", "view", "viewpoint", "when", "while", "xor"
+        ].reduce(f_wordify, {}),
+        types: [
+            "action", "allocation", "analysis", "attribute", "binding", "calc", "case", "comment", "concern",
+            "connection", "constraint", "def", "doc", "enum", "flow", "interface", "item", "metadata", "objective",
+            "occurrence", "package", "part", "port", "ref", "rendering", "rep", "requirement", "snapshot", "state",
+            "subject", "succession", "timeslice", "transition", "verification", "view", "viewpoint"
+        ].reduce(f_wordify, {}),
+        atoms: ['true', 'false', 'null'].reduce(f_wordify, {}),
+        number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i, 
+        hooks: {
+            "'": function(stream: StringStream) {
+                let b_escaped = false;
+                let s_next;
+                while(s_next = stream.next()) {
+                    if(s_next === "'" && !b_escaped) break;
+                    b_escaped = !b_escaped && s_next === '\\';
+                }
+                return 'variable';
             },
-            hooks: {
-                "'": function(stream: CodeMirror.StringStream) {
-                    let b_escaped = false;
-                    let s_next;
-                    while(s_next = stream.next()) {
-                        if(s_next === "'" && !b_escaped) break;
-                        b_escaped = !b_escaped && s_next === '\\';
+            '/': function(stream: StringStream) {
+                if(stream.match('/*', false)) stream.next();
+                return false;
+            },
+            "#": function(stream: StringStream) {
+                let b_first = true;
+                do {
+                    if (stream.match("'", true)) { 
+                        let b_escaped = false;
+                        let s_next;
+                        while(s_next = stream.next()) {
+                            if(s_next === "'" && !b_escaped) break;
+                            b_escaped = !b_escaped && s_next === '\\';
+                        }
+                    } else if (stream.match(/\w/, true)) {
+                        stream.eatWhile(/\w/);
+                    } else if (b_first) {
+                        return 'operator';
                     }
-                    return 'variable';
-                },
-                '/': function(stream: CodeMirror.StringStream) {
-                    if(stream.match('/*', false)) stream.next();
-                    return false;
-                },
-                "#": function(stream: CodeMirror.StringStream) {
-                	let b_first = true;
-                 	do {
-                 		if (stream.match("'", true)) { 
-                    		let b_escaped = false;
-                    		let s_next;
-                    		while(s_next = stream.next()) {
-                        		if(s_next === "'" && !b_escaped) break;
-                        		b_escaped = !b_escaped && s_next === '\\';
-                    		}
-                		} else if (stream.match(/\w/, true)) {
-                			stream.eatWhile(/\w/);
-                		} else if (b_first) {
-                			return 'operator';
-                		}
-                		b_first = false;
-                	} while (stream.match('::', true))
-                    return 'keyword';
-                },
+                    b_first = false;
+                } while (stream.match('::', true))
+                return 'keyword';
             },
-        });
-    });
-
-    CodeMirror.defineMIME(P_MIME, SI_MODE);
-
-    (CodeMirror as any).modeInfo.push({
-        ext: ['sysml'],
-        mime: P_MIME,
-        mode: SI_MODE,
-        name: 'sysml',
-    });
-}
+        },
+    }
+);