Merge pull request #643 from Systems-Modeling/ST6RI-839

ST6RI-839 "new" keyword is not highlighted in Jupyter

Author: seidewitz

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

@@ -44,7 +44,7 @@ export function defineSysMLv2Mode(): void {
                 "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",
+                "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",

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

@@ -56,7 +56,7 @@ var enableMode = function (CodeMirror) {
                 "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",
+                "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",

tool-support/syntax-highlighting/jetbrains/KerML.xml

@@ -11,8 +11,8 @@
       <option name="HAS_PARENS" value="true" />
       <option name="HAS_STRING_ESCAPES" value="true" />
     </options>
-    <keywords keywords="about;abstract;alias;all;and;as;assoc;behavior;binding;bool;by;chains;class;classifier;comment;composite;conjugate;conjugates;conjugation;connector;const;crosses;datatype;default;dependency;derived;differences;disjoining;disjoint;doc;else;end;expr;false;feature;featured;featuring;filter;first;flow;for;from;function;hastype;if;implies;import;in;inout;interaction;intersects;inv;inverse;inverting;istype;language;library;locale;member;meta;metaclass;metadata;multiplicity;namespace;nonunique;not;null;of;or;ordered;out;package;portion;predicate;private;protected;public;redefines;redefinition;references;rep;return;specialization;specializes;standard;step;struct;subclassifier;subset;subsets;subtype;succession;then;to;true;type;typed;typing;unions;var;xor" ignore_case="false" />
-    <keywords2 keywords="!=;!==;#;%;&amp;;*;**;+;-;-&gt;;..;.?;/;:;::;::&gt;;:=;:&gt;;:&gt;&gt;;&lt;;&lt;=;=;==;===;=&gt;;&gt;;&gt;=;?;??;@;@@;^;|;~" />
+    <keywords keywords="about;abstract;alias;all;and;as;assoc;behavior;binding;bool;by;chains;class;classifier;comment;composite;conjugate;conjugates;conjugation;connector;const;crosses;datatype;default;dependency;derived;differences;disjoining;disjoint;doc;else;end;expr;false;feature;featured;featuring;filter;first;flow;for;from;function;hastype;if;implies;import;in;inout;interaction;intersects;inv;inverse;inverting;istype;language;library;locale;member;meta;metaclass;metadata;multiplicity;namespace;new;nonunique;not;null;of;or;ordered;out;package;portion;predicate;private;protected;public;redefines;redefinition;references;rep;return;specialization;specializes;standard;step;struct;subclassifier;subset;subsets;subtype;succession;then;to;true;type;typed;typing;unions;var;xor" ignore_case="false" />
+    <keywords2 keywords="!=;!==;#;$;%;&amp;;*;**;+;-;-&gt;;..;.?;/;:;::;::&gt;;:=;:&gt;;:&gt;&gt;;&lt;;&lt;=;=;==;===;=&gt;;&gt;;&gt;=;?;??;@;@@;^;|;~" />
   </highlighting>
   <extensionMap>
     <mapping ext="kerml" />

tool-support/syntax-highlighting/jetbrains/SysML.xml

@@ -11,8 +11,8 @@
       <option name="HAS_PARENS" value="true" />
       <option name="HAS_STRING_ESCAPES" value="true" />
     </options>
-    <keywords 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;false;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;nonunique;not;null;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;true;until;use;variant;variation;verification;verify;via;view;viewpoint;when;while;xor" ignore_case="false" />
-    <keywords2 keywords="!=;!==;#;%;&amp;;*;**;+;-;-&gt;;..;.?;/;:;::;::&gt;;:=;:&gt;;:&gt;&gt;;&lt;;&lt;=;=;==;===;=&gt;;&gt;;&gt;=;?;??;@;@@;^;|;~" />
+    <keywords 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;false;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;null;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;true;until;use;variant;variation;verification;verify;via;view;viewpoint;when;while;xor" ignore_case="false" />
+    <keywords2 keywords="!=;!==;#;$;%;&amp;;*;**;+;-;-&gt;;..;.?;/;:;::;::&gt;;:=;:&gt;;:&gt;&gt;;&lt;;&lt;=;=;==;===;=&gt;;&gt;;&gt;=;?;??;@;@@;^;|;~" />
   </highlighting>
   <extensionMap>
     <mapping ext="sysml" />

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

@@ -56,7 +56,7 @@ var enableMode = function (CodeMirror) {
                 "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",
+                "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",

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

@@ -44,7 +44,7 @@ export function defineSysMLv2Mode(): void {
                 "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",
+                "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",

tool-support/syntax-highlighting/vscode/kerml/syntaxes/kerml.tmLanguage.json

@@ -18,8 +18,8 @@
   "repository": {
     "keywords": {
       "patterns": [
-        { "match": "\\b(about|abstract|alias|all|and|as|assoc|behavior|binding|bool|by|chains|class|classifier|comment|composite|conjugate|conjugates|conjugation|connector|const|crosses|datatype|default|dependency|derived|differences|disjoining|disjoint|doc|else|end|expr|false|feature|featured|featuring|filter|first|flow|for|from|function|hastype|if|implies|import|in|inout|interaction|intersects|inv|inverse|inverting|istype|language|library|locale|member|meta|metaclass|metadata|multiplicity|namespace|nonunique|not|null|of|or|ordered|out|package|portion|predicate|private|protected|public|redefines|redefinition|references|rep|return|specialization|specializes|standard|step|struct|subclassifier|subset|subsets|subtype|succession|then|to|true|type|typed|typing|unions|var|xor)\\b", "name": "keyword.other.kerml" },
-        { "match": "(#|%|&|\\?|\\?\\?|@@|\\^|\\|)", "name": "keyword.operator.logical.kerml" },
+        { "match": "\\b(about|abstract|alias|all|and|as|assoc|behavior|binding|bool|by|chains|class|classifier|comment|composite|conjugate|conjugates|conjugation|connector|const|crosses|datatype|default|dependency|derived|differences|disjoining|disjoint|doc|else|end|expr|false|feature|featured|featuring|filter|first|flow|for|from|function|hastype|if|implies|import|in|inout|interaction|intersects|inv|inverse|inverting|istype|language|library|locale|member|meta|metaclass|metadata|multiplicity|namespace|new|nonunique|not|null|of|or|ordered|out|package|portion|predicate|private|protected|public|redefines|redefinition|references|rep|return|specialization|specializes|standard|step|struct|subclassifier|subset|subsets|subtype|succession|then|to|true|type|typed|typing|unions|var|xor)\\b", "name": "keyword.other.kerml" },
+        { "match": "(#|\\$|%|&|\\?|\\?\\?|@@|\\^|\\|)", "name": "keyword.operator.logical.kerml" },
         { "match": "(!=|!==|\\<|\\<=|=|==|===|\\>|\\>=)", "name": "keyword.operator.comparison.kerml" },
         { "match": "(\\*|\\*\\*|\\+|\\-|/)", "name": "keyword.operator.arithmetic.kerml" },
         { "match": "(\\-\\>|\\.\\.|\\.\\?|:|::|::\\>|:=|:\\>|:\\>\\>|=\\>|@|~)", "name": "keyword.operator.other.kerml" }

tool-support/syntax-highlighting/vscode/sysml/syntaxes/sysml.tmLanguage.json

@@ -18,8 +18,8 @@
   "repository": {
     "keywords": {
       "patterns": [
-        { "match": "\\b(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|false|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|nonunique|not|null|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|true|until|use|variant|variation|verification|verify|via|view|viewpoint|when|while|xor)\\b", "name": "keyword.other.sysml" },
-        { "match": "(#|%|&|\\?|\\?\\?|@@|\\^|\\|)", "name": "keyword.operator.logical.sysml" },
+        { "match": "\\b(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|false|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|null|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|true|until|use|variant|variation|verification|verify|via|view|viewpoint|when|while|xor)\\b", "name": "keyword.other.sysml" },
+        { "match": "(#|\\$|%|&|\\?|\\?\\?|@@|\\^|\\|)", "name": "keyword.operator.logical.sysml" },
         { "match": "(!=|!==|\\<|\\<=|=|==|===|\\>|\\>=)", "name": "keyword.operator.comparison.sysml" },
         { "match": "(\\*|\\*\\*|\\+|\\-|/)", "name": "keyword.operator.arithmetic.sysml" },
         { "match": "(\\-\\>|\\.\\.|\\.\\?|:|::|::\\>|:=|:\\>|:\\>\\>|=\\>|@|~)", "name": "keyword.operator.other.sysml" }