Merge pull request #307 from Systems-Modeling/ST6RI-487

seidewitz · web-flow · commit 9cd8d3648dda · 2021-12-11T12:55:49.000-05:00
ST6RI-487 Xtext grammar converter can't handle "use case" keyword
diff --git a/org.omg.sysml.jupyter.jupyterlab/src/main/mode.ts b/org.omg.sysml.jupyter.jupyterlab/src/main/mode.ts
@@ -39,16 +39,17 @@ export function defineSysMLv2Mode(): void {
             name: 'clike',
             keywords: [
                 "about", "abstract", "accept", "action", "actor", "alias", "all", "allocate", "allocation", "analysis",
-                "and", "as", "assert", "assume", "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", "feature",
-                "filter", "first", "flow", "for", "fork", "frame", "from", "hastype", "if", "implies", "import", "in",
-                "include", "individual", "inout", "interface", "istype", "item", "join", "language", "merge", "message",
-                "metadata", "nonunique", "not", "objective", "occurrence", "of", "or", "ordered", "out", "package",
-                "parallel", "part", "perform", "port", "private", "protected", "public", "readonly", "redefines", "ref",
-                "render", "rendering", "rep", "require", "requirement", "return", "satisfy", "send", "snapshot",
-                "specializes", "stakeholder", "state", "subject", "subsets", "succession", "then", "timeslice", "to",
-                "transition", "use", "variant", "variation", "verification", "verify", "via", "view", "viewpoint", "xor"
+                "and", "as", "assert", "assign", "assume", "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", "feature", "filter", "first", "flow", "for", "fork", "frame", "from", "hastype", "if",
+                "implies", "import", "in", "include", "individual", "inout", "interface", "istype", "item", "join",
+                "language", "merge", "message", "metadata", "nonunique", "not", "objective", "occurrence", "of", "or",
+                "ordered", "out", "package", "parallel", "part", "perform", "port", "private", "protected", "public",
+                "readonly", "redefines", "ref", "render", "rendering", "rep", "require", "requirement", "return",
+                "satisfy", "send", "snapshot", "specializes", "stakeholder", "state", "subject", "subsets",
+                "succession", "then", "timeslice", "to", "transition", "use", "variant", "variation", "verification",
+                "verify", "via", "view", "viewpoint", "xor"
             ].reduce(f_wordify, {}),
             defKeywords: [
                 "action", "allocation", "analysis", "attribute", "binding", "calc", "case", "comment", "concern",
diff --git a/org.omg.sysml.jupyter.kernel/src/main/resources/kernel/kernel.js b/org.omg.sysml.jupyter.kernel/src/main/resources/kernel/kernel.js
@@ -51,16 +51,17 @@ var enableMode = function (CodeMirror) {
             name: "clike",
             keywords: words([
                 "about", "abstract", "accept", "action", "actor", "alias", "all", "allocate", "allocation", "analysis",
-                "and", "as", "assert", "assume", "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", "feature",
-                "filter", "first", "flow", "for", "fork", "frame", "from", "hastype", "if", "implies", "import", "in",
-                "include", "individual", "inout", "interface", "istype", "item", "join", "language", "merge", "message",
-                "metadata", "nonunique", "not", "objective", "occurrence", "of", "or", "ordered", "out", "package",
-                "parallel", "part", "perform", "port", "private", "protected", "public", "readonly", "redefines", "ref",
-                "render", "rendering", "rep", "require", "requirement", "return", "satisfy", "send", "snapshot",
-                "specializes", "stakeholder", "state", "subject", "subsets", "succession", "then", "timeslice", "to",
-                "transition", "use", "variant", "variation", "verification", "verify", "via", "view", "viewpoint", "xor"
+                "and", "as", "assert", "assign", "assume", "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", "feature", "filter", "first", "flow", "for", "fork", "frame", "from", "hastype", "if",
+                "implies", "import", "in", "include", "individual", "inout", "interface", "istype", "item", "join",
+                "language", "merge", "message", "metadata", "nonunique", "not", "objective", "occurrence", "of", "or",
+                "ordered", "out", "package", "parallel", "part", "perform", "port", "private", "protected", "public",
+                "readonly", "redefines", "ref", "render", "rendering", "rep", "require", "requirement", "return",
+                "satisfy", "send", "snapshot", "specializes", "stakeholder", "state", "subject", "subsets",
+                "succession", "then", "timeslice", "to", "transition", "use", "variant", "variation", "verification",
+                "verify", "via", "view", "viewpoint", "xor"
             ]),
             defKeywords: words([
                 "action", "allocation", "analysis", "attribute", "binding", "calc", "case", "comment", "concern",
diff --git a/tool-support/syntax-highlighting/jetbrains/KerML.xml b/tool-support/syntax-highlighting/jetbrains/KerML.xml
@@ -12,7 +12,7 @@
       <option name="HAS_STRING_ESCAPES" value="true" />
     </options>
     <keywords keywords="about;abstract;alias;all;and;as;assoc;behavior;binding;bool;by;class;classifier;comment;composite;conjugate;conjugates;conjugation;connector;datatype;default;derived;disjoining;disjoint;doc;element;else;end;expr;false;feature;featured;featuring;filter;first;flow;for;from;function;hastype;if;implies;import;in;inout;interaction;inv;is;istype;language;member;metadata;multiplicity;namespace;nonunique;not;null;of;or;ordered;out;package;portion;predicate;private;protected;public;readonly;redefines;redefinition;relationship;rep;specialization;specializes;step;struct;subclassifier;subset;subsets;subtype;succession;then;to;true;type;typed;typing;xor" ignore_case="false" />
-    <keywords2 keywords="!;!=;%;&amp;;&amp;&amp;;*;**;+;-;-&gt;;..;/;:;::;:&gt;;:&gt;&gt;;&lt;;&lt;=;=;==;=&gt;;&gt;;&gt;=;?;??;@;^;^^;|;||;~" />
+    <keywords2 keywords="!;!=;%;&amp;;&amp;&amp;;*;**;+;-;-&gt;;..;/;:;::;:=;:&gt;;:&gt;&gt;;&lt;;&lt;=;=;==;=&gt;;&gt;;&gt;=;?;??;@;^;^^;|;||;~" />
   </highlighting>
   <extensionMap>
     <mapping ext="kerml" />
diff --git a/tool-support/syntax-highlighting/jetbrains/SysML.xml b/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;alias;all;allocate;allocation;analysis;and;as;assert;assume;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;feature;filter;first;flow;for;fork;frame;from;hastype;if;implies;import;in;include;individual;inout;interface;istype;item;join;language;merge;message;metadata;nonunique;not;null;objective;occurrence;of;or;ordered;out;package;parallel;part;perform;port;private;protected;public;readonly;redefines;ref;render;rendering;rep;require;requirement;return;satisfy;send;snapshot;specializes;stakeholder;state;subject;subsets;succession;then;timeslice;to;transition;true;use;variant;variation;verification;verify;via;view;viewpoint;xor" ignore_case="false" />
-    <keywords2 keywords="!;!=;%;&amp;;&amp;&amp;;*;**;+;-;-&gt;;..;/;:;::;:&gt;;:&gt;&gt;;&lt;;&lt;=;=;==;=&gt;;&gt;;&gt;=;?;??;@;^;^^;|;||;~" />
+    <keywords keywords="about;abstract;accept;action;actor;alias;all;allocate;allocation;analysis;and;as;assert;assign;assume;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;feature;filter;first;flow;for;fork;frame;from;hastype;if;implies;import;in;include;individual;inout;interface;istype;item;join;language;merge;message;metadata;nonunique;not;null;objective;occurrence;of;or;ordered;out;package;parallel;part;perform;port;private;protected;public;readonly;redefines;ref;render;rendering;rep;require;requirement;return;satisfy;send;snapshot;specializes;stakeholder;state;subject;subsets;succession;then;timeslice;to;transition;true;use;variant;variation;verification;verify;via;view;viewpoint;xor" ignore_case="false" />
+    <keywords2 keywords="!;!=;%;&amp;;&amp;&amp;;*;**;+;-;-&gt;;..;/;:;::;:=;:&gt;;:&gt;&gt;;&lt;;&lt;=;=;==;=&gt;;&gt;;&gt;=;?;??;@;^;^^;|;||;~" />
   </highlighting>
   <extensionMap>
     <mapping ext="sysml" />
diff --git a/tool-support/syntax-highlighting/jupyter/kernel.js b/tool-support/syntax-highlighting/jupyter/kernel.js
@@ -51,16 +51,17 @@ var enableMode = function (CodeMirror) {
             name: "clike",
             keywords: words([
                 "about", "abstract", "accept", "action", "actor", "alias", "all", "allocate", "allocation", "analysis",
-                "and", "as", "assert", "assume", "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", "feature",
-                "filter", "first", "flow", "for", "fork", "frame", "from", "hastype", "if", "implies", "import", "in",
-                "include", "individual", "inout", "interface", "istype", "item", "join", "language", "merge", "message",
-                "metadata", "nonunique", "not", "objective", "occurrence", "of", "or", "ordered", "out", "package",
-                "parallel", "part", "perform", "port", "private", "protected", "public", "readonly", "redefines", "ref",
-                "render", "rendering", "rep", "require", "requirement", "return", "satisfy", "send", "snapshot",
-                "specializes", "stakeholder", "state", "subject", "subsets", "succession", "then", "timeslice", "to",
-                "transition", "use", "variant", "variation", "verification", "verify", "via", "view", "viewpoint", "xor"
+                "and", "as", "assert", "assign", "assume", "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", "feature", "filter", "first", "flow", "for", "fork", "frame", "from", "hastype", "if",
+                "implies", "import", "in", "include", "individual", "inout", "interface", "istype", "item", "join",
+                "language", "merge", "message", "metadata", "nonunique", "not", "objective", "occurrence", "of", "or",
+                "ordered", "out", "package", "parallel", "part", "perform", "port", "private", "protected", "public",
+                "readonly", "redefines", "ref", "render", "rendering", "rep", "require", "requirement", "return",
+                "satisfy", "send", "snapshot", "specializes", "stakeholder", "state", "subject", "subsets",
+                "succession", "then", "timeslice", "to", "transition", "use", "variant", "variation", "verification",
+                "verify", "via", "view", "viewpoint", "xor"
             ]),
             defKeywords: words([
                 "action", "allocation", "analysis", "attribute", "binding", "calc", "case", "comment", "concern",
diff --git a/tool-support/syntax-highlighting/jupyter/mode.ts b/tool-support/syntax-highlighting/jupyter/mode.ts
@@ -39,16 +39,17 @@ export function defineSysMLv2Mode(): void {
             name: 'clike',
             keywords: [
                 "about", "abstract", "accept", "action", "actor", "alias", "all", "allocate", "allocation", "analysis",
-                "and", "as", "assert", "assume", "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", "feature",
-                "filter", "first", "flow", "for", "fork", "frame", "from", "hastype", "if", "implies", "import", "in",
-                "include", "individual", "inout", "interface", "istype", "item", "join", "language", "merge", "message",
-                "metadata", "nonunique", "not", "objective", "occurrence", "of", "or", "ordered", "out", "package",
-                "parallel", "part", "perform", "port", "private", "protected", "public", "readonly", "redefines", "ref",
-                "render", "rendering", "rep", "require", "requirement", "return", "satisfy", "send", "snapshot",
-                "specializes", "stakeholder", "state", "subject", "subsets", "succession", "then", "timeslice", "to",
-                "transition", "use", "variant", "variation", "verification", "verify", "via", "view", "viewpoint", "xor"
+                "and", "as", "assert", "assign", "assume", "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", "feature", "filter", "first", "flow", "for", "fork", "frame", "from", "hastype", "if",
+                "implies", "import", "in", "include", "individual", "inout", "interface", "istype", "item", "join",
+                "language", "merge", "message", "metadata", "nonunique", "not", "objective", "occurrence", "of", "or",
+                "ordered", "out", "package", "parallel", "part", "perform", "port", "private", "protected", "public",
+                "readonly", "redefines", "ref", "render", "rendering", "rep", "require", "requirement", "return",
+                "satisfy", "send", "snapshot", "specializes", "stakeholder", "state", "subject", "subsets",
+                "succession", "then", "timeslice", "to", "transition", "use", "variant", "variation", "verification",
+                "verify", "via", "view", "viewpoint", "xor"
             ].reduce(f_wordify, {}),
             defKeywords: [
                 "action", "allocation", "analysis", "attribute", "binding", "calc", "case", "comment", "concern",
diff --git a/tool-support/syntax-highlighting/vscode/kerml/syntaxes/kerml.tmLanguage.json b/tool-support/syntax-highlighting/vscode/kerml/syntaxes/kerml.tmLanguage.json
@@ -22,7 +22,7 @@
         { "match": "(%|&|&&|\\?|\\?\\?|\\^|\\^\\^|\\||\\|\\|)", "name": "keyword.operator.logical.kerml" },
         { "match": "(!|!=|\\<|\\<=|=|==|\\>|\\>=)", "name": "keyword.operator.comparison.kerml" },
         { "match": "(\\*|\\*\\*|\\+|\\-|/)", "name": "keyword.operator.arithmetic.kerml" },
-        { "match": "(\\-\\>|\\.\\.|:|::|:\\>|:\\>\\>|=\\>|@|~)", "name": "keyword.operator.other.kerml" }
+        { "match": "(\\-\\>|\\.\\.|:|::|:=|:\\>|:\\>\\>|=\\>|@|~)", "name": "keyword.operator.other.kerml" }
       ]
     },
     "strings": {
diff --git a/tool-support/syntax-highlighting/vscode/sysml/syntaxes/sysml.tmLanguage.json b/tool-support/syntax-highlighting/vscode/sysml/syntaxes/sysml.tmLanguage.json
@@ -18,11 +18,11 @@
   "repository": {
     "keywords": {
       "patterns": [
-        { "match": "\\b(about|abstract|accept|action|actor|alias|all|allocate|allocation|analysis|and|as|assert|assume|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|feature|filter|first|flow|for|fork|frame|from|hastype|if|implies|import|in|include|individual|inout|interface|istype|item|join|language|merge|message|metadata|nonunique|not|null|objective|occurrence|of|or|ordered|out|package|parallel|part|perform|port|private|protected|public|readonly|redefines|ref|render|rendering|rep|require|requirement|return|satisfy|send|snapshot|specializes|stakeholder|state|subject|subsets|succession|then|timeslice|to|transition|true|use|variant|variation|verification|verify|via|view|viewpoint|xor)\\b", "name": "keyword.other.sysml" },
+        { "match": "\\b(about|abstract|accept|action|actor|alias|all|allocate|allocation|analysis|and|as|assert|assign|assume|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|feature|filter|first|flow|for|fork|frame|from|hastype|if|implies|import|in|include|individual|inout|interface|istype|item|join|language|merge|message|metadata|nonunique|not|null|objective|occurrence|of|or|ordered|out|package|parallel|part|perform|port|private|protected|public|readonly|redefines|ref|render|rendering|rep|require|requirement|return|satisfy|send|snapshot|specializes|stakeholder|state|subject|subsets|succession|then|timeslice|to|transition|true|use|variant|variation|verification|verify|via|view|viewpoint|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" }
+        { "match": "(\\-\\>|\\.\\.|:|::|:=|:\\>|:\\>\\>|=\\>|@|~)", "name": "keyword.operator.other.sysml" }
       ]
     },
     "strings": {
diff --git a/tool-support/syntax-highlighting/xtext_grammar_converter.py b/tool-support/syntax-highlighting/xtext_grammar_converter.py
@@ -255,8 +255,8 @@ def parse_xtext_grammar(self, xtext_source_paths: List[str]):
                 logging.info(f"{var:{max_name_len}s} = {keywords_dict[var]}")
                 if var.endswith("DefKeyword"):
                     def_keyword_var = keywords_dict[var][0].split()[0]
-                    def_keyword_value = [x for x in keywords_dict[def_keyword_var] if x.isalpha()][0]
-                    def_keywords_set.add(def_keyword_value)
+                    def_keyword_value = [x for x in keywords_dict[def_keyword_var] if x.replace(" ","").isalpha()][0]
+                    def_keywords_set.add(def_keyword_value.split()[-1])
 
         # Remove interpunction terminals that should not be highlighted
         operators_set.remove(".")
@@ -353,7 +353,7 @@ def export_jupyter_syntax_highlighting_files(
         def_keywords_set.update(additional_def_keywords)
         self.def_keywords = sorted(def_keywords_set)
         for def_keyword in self.def_keywords:
-            if def_keyword not in keywords_minus_atoms:
+            if any([x not in keywords_minus_atoms for x in def_keyword.split()]):
                 logging.error(f"def keyword '{def_keyword}' "
                               f"is not in the list of keywords obtained from the xtext grammar")
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`{ "match": "(%\|&\|&&\|\\?\|\\?\\?\|\\^\|\\^\\^\|\\\|\|\\\|\\\|)", "name": "keyword.operator.logical.kerml" },`
`23`	`23`	`{ "match": "(!\|!=\|\\<\|\\<=\|=\|==\|\\>\|\\>=)", "name": "keyword.operator.comparison.kerml" },`
`24`	`24`	`{ "match": "(\\\|\\\\*\|\\+\|\\-\|/)", "name": "keyword.operator.arithmetic.kerml" },`
`25`		`- { "match": "(\\-\\>\|\\.\\.\|:\|::\|:\\>\|:\\>\\>\|=\\>\|@\|~)", "name": "keyword.operator.other.kerml" }`
	`25`	`+ { "match": "(\\-\\>\|\\.\\.\|:\|::\|:=\|:\\>\|:\\>\\>\|=\\>\|@\|~)", "name": "keyword.operator.other.kerml" }`
`26`	`26`	`]`
`27`	`27`	`},`
`28`	`28`	`"strings": {`