Restored update to Jupyter highlighting for user-defined keywords.

Author: seidewitz

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

@@ -77,6 +77,21 @@ export function defineSysMLv2Mode(): void {
                     if(stream.match('/*', false)) stream.next();
                     return false;
                 },
+                "#": function(stream: CodeMirror.StringStream) {
+                 	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 {
+                			stream.eatWhile(/\w/);
+                		}
+                	} while (stream.match('::', true))
+                    return 'keyword';
+                },
             },
         });
     });

org.omg.sysml.jupyter.kernel/src/main/resources/kernel/kernel.js

@@ -89,7 +89,22 @@ var enableMode = function (CodeMirror) {
                         stream.next();
                     }
                     return false;
-                }
+                },
+                "#": function(stream: CodeMirror.StringStream) {
+                 	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 {
+                			stream.eatWhile(/\w/);
+                		}
+                	} while (stream.match('::', true))
+                    return 'keyword';
+                },
             }
         });
     });

tool-support/syntax-highlighting/jupyter/kernel.js

@@ -89,7 +89,22 @@ var enableMode = function (CodeMirror) {
                         stream.next();
                     }
                     return false;
-                }
+                },
+                "#": function(stream: CodeMirror.StringStream) {
+                 	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 {
+                			stream.eatWhile(/\w/);
+                		}
+                	} while (stream.match('::', true))
+                    return 'keyword';
+                },
             }
         });
     });

tool-support/syntax-highlighting/jupyter/kernel_template.js

@@ -75,7 +75,22 @@ var enableMode = function (CodeMirror) {
                         stream.next();
                     }
                     return false;
-                }
+                },
+                "#": function(stream: CodeMirror.StringStream) {
+                 	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 {
+                			stream.eatWhile(/\w/);
+                		}
+                	} while (stream.match('::', true))
+                    return 'keyword';
+                },
             }
         });
     });

tool-support/syntax-highlighting/jupyter/mode.ts

@@ -77,6 +77,21 @@ export function defineSysMLv2Mode(): void {
                     if(stream.match('/*', false)) stream.next();
                     return false;
                 },
+                "#": function(stream: CodeMirror.StringStream) {
+                 	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 {
+                			stream.eatWhile(/\w/);
+                		}
+                	} while (stream.match('::', true))
+                    return 'keyword';
+                },
             },
         });
     });

tool-support/syntax-highlighting/jupyter/mode_template.ts

@@ -63,6 +63,21 @@ export function defineSysMLv2Mode(): void {
                     if(stream.match('/*', false)) stream.next();
                     return false;
                 },
+                "#": function(stream: CodeMirror.StringStream) {
+                 	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 {
+                			stream.eatWhile(/\w/);
+                		}
+                	} while (stream.match('::', true))
+                    return 'keyword';
+                },
             },
         });
     });