Merge branch 'ST6RI-800'

Author: seidewitz

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

@@ -48,9 +48,9 @@ export function defineSysMLv2Mode(): void {
                 "occurrence", "of", "or", "ordered", "out", "package", "parallel", "part", "perform", "port", "private",
                 "protected", "public", "readonly", "redefines", "ref", "references", "render", "rendering", "rep",
                 "require", "requirement", "return", "satisfy", "send", "snapshot", "specializes", "stakeholder",
-                "standard", "state", "subject", "subsets", "succession", "then", "timeslice", "to", "transition",
-                "until", "use", "variant", "variation", "verification", "verify", "via", "view", "viewpoint", "when",
-                "while", "xor"
+                "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",

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

@@ -60,9 +60,9 @@ var enableMode = function (CodeMirror) {
                 "occurrence", "of", "or", "ordered", "out", "package", "parallel", "part", "perform", "port", "private",
                 "protected", "public", "readonly", "redefines", "ref", "references", "render", "rendering", "rep",
                 "require", "requirement", "return", "satisfy", "send", "snapshot", "specializes", "stakeholder",
-                "standard", "state", "subject", "subsets", "succession", "then", "timeslice", "to", "transition",
-                "until", "use", "variant", "variation", "verification", "verify", "via", "view", "viewpoint", "when",
-                "while", "xor"
+                "standard", "state", "subject", "subsets", "succession", "terminate", "then", "timeslice", "to",
+                "transition", "until", "use", "variant", "variation", "verification", "verify", "via", "view",
+                "viewpoint", "when", "while", "xor"
             ]),
             defKeywords: words([
                 "action", "allocation", "analysis", "attribute", "binding", "calc", "case", "comment", "concern",

org.omg.sysml/src/org/omg/sysml/generation/MOF2SysMLText.xtend

@@ -52,17 +52,18 @@ class MOF2SysMLText extends MOF2KerMLText {
 	override String getReservedWords() {
 		// Note: Every word must be preceded and followed by a space.
 	   " about abstract accept action actor after alias all allocate allocation 
-		 analysis and as assign assert assoc assume at attribute bind binding block 
-		 by calc case comment concern connect connection constraint 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 loop merge 
-		 message metadata nonunique not objective occurrence of or ordered out 
-		 package parallel part perform port private protected public readonly 
-		 redefines ref references render rendering rep require requirement return 
-		 satisfy send snapshot specializes stakeholder state subject subsets 
-		 succession then timeslice to transition until use variant variation 
-		 verification verify via view viewpoint when while xor "
+		 analysis and as assign assert assume at attribute bind binding by 
+		 calc case comment concern connect connection constraint 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 nonunique not objective 
+		 occurrence of or ordered out package parallel part perform port private 
+		 protected public readonly 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 "
 	}
 
 	static def void main(String[] args) {

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

@@ -11,7 +11,7 @@
       <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;constraint;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;readonly;redefines;ref;references;render;rendering;rep;require;requirement;return;satisfy;send;snapshot;specializes;stakeholder;standard;state;subject;subsets;succession;then;timeslice;to;transition;true;until;use;variant;variation;verification;verify;via;view;viewpoint;when;while;xor" ignore_case="false" />
+    <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;constraint;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;readonly;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;=;?;??;@;@@;^;|;~" />
   </highlighting>
   <extensionMap>

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

@@ -60,9 +60,9 @@ var enableMode = function (CodeMirror) {
                 "occurrence", "of", "or", "ordered", "out", "package", "parallel", "part", "perform", "port", "private",
                 "protected", "public", "readonly", "redefines", "ref", "references", "render", "rendering", "rep",
                 "require", "requirement", "return", "satisfy", "send", "snapshot", "specializes", "stakeholder",
-                "standard", "state", "subject", "subsets", "succession", "then", "timeslice", "to", "transition",
-                "until", "use", "variant", "variation", "verification", "verify", "via", "view", "viewpoint", "when",
-                "while", "xor"
+                "standard", "state", "subject", "subsets", "succession", "terminate", "then", "timeslice", "to",
+                "transition", "until", "use", "variant", "variation", "verification", "verify", "via", "view",
+                "viewpoint", "when", "while", "xor"
             ]),
             defKeywords: words([
                 "action", "allocation", "analysis", "attribute", "binding", "calc", "case", "comment", "concern",

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

@@ -48,9 +48,9 @@ export function defineSysMLv2Mode(): void {
                 "occurrence", "of", "or", "ordered", "out", "package", "parallel", "part", "perform", "port", "private",
                 "protected", "public", "readonly", "redefines", "ref", "references", "render", "rendering", "rep",
                 "require", "requirement", "return", "satisfy", "send", "snapshot", "specializes", "stakeholder",
-                "standard", "state", "subject", "subsets", "succession", "then", "timeslice", "to", "transition",
-                "until", "use", "variant", "variation", "verification", "verify", "via", "view", "viewpoint", "when",
-                "while", "xor"
+                "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",

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

@@ -18,7 +18,7 @@
   "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|constraint|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|readonly|redefines|ref|references|render|rendering|rep|require|requirement|return|satisfy|send|snapshot|specializes|stakeholder|standard|state|subject|subsets|succession|then|timeslice|to|transition|true|until|use|variant|variation|verification|verify|via|view|viewpoint|when|while|xor)\\b", "name": "keyword.other.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|constraint|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|readonly|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" },

tool-support/syntax-highlighting/xtext_grammar_converter.py

@@ -464,7 +464,7 @@ def convert_xml_special(s: str) -> str:
     converter.export_jupyter_syntax_highlighting_files(
         working_folder="./jupyter",
         jupyter_lab_target_folder="../../org.omg.sysml.jupyter.jupyterlab/src/main",
-        jupyter_kernel_target_folder="../../org.omg.sysml.jupyter.kernel/src/main/resources/kernel")
+        jupyter_kernel_target_folder="../../org.omg.sysml.jupyter.kernel/src/main/resources/sysml")
 
     end_timestamp = datetime.datetime.now()
     elapsed_time = end_timestamp - start_timestamp