Skip to content

Commit

Permalink
[599] Handle ref keyword in direct edit
Browse files Browse the repository at this point in the history
Bug: eclipse-syson#599
Signed-off-by: Gwendal Daniel <gwendal.daniel@obeosoft.com>
  • Loading branch information
gdaniel committed Jul 25, 2024
1 parent cad5b7d commit 05d345b
Show file tree
Hide file tree
Showing 14 changed files with 1,321 additions and 1,196 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ The changes are:
- https://github.com/eclipse-syson/syson/issues/571[#571] [interconnection-view] Add ActionUsage node in Interconnection View
- https://github.com/eclipse-syson/syson/issues/581[#581] [interconnection-view] Add documentation and action flow compartment in ActionUsage
- https://github.com/eclipse-syson/syson/issues/590[#590] [diagrams] Add label support for referential Usages
- https://github.com/eclipse-syson/syson/issues/599[#599] [diagrams] Add support for ref keyword in direct edit

=== New features

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public class LabelConstants {

public static final String REDEFINITION = ":>>";

public static final String REF = "ref";

public static final String SPACE = " ";

public static final String SUBCLASSIFICATION = ":>";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
token literal names:
null
'ref '
'['
'..'
']'
Expand Down Expand Up @@ -131,6 +132,7 @@ null
null
null
null
null
WS
Boolean
Integer
Expand Down Expand Up @@ -236,6 +238,7 @@ ANY

rule names:
expression
referenceExpression
multiplicityExpression
multiplicityExpressionMember
featureExpressions
Expand All @@ -253,4 +256,4 @@ name


atn:
[4, 1, 115, 132, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 1, 0, 3, 0, 32, 8, 0, 1, 0, 3, 0, 35, 8, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 44, 8, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 3, 3, 53, 8, 3, 1, 3, 3, 3, 56, 8, 3, 1, 3, 3, 3, 59, 8, 3, 1, 3, 3, 3, 62, 8, 3, 1, 3, 1, 3, 3, 3, 66, 8, 3, 1, 3, 3, 3, 69, 8, 3, 3, 3, 71, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 8, 3, 8, 86, 8, 8, 1, 8, 3, 8, 89, 8, 8, 1, 8, 3, 8, 92, 8, 8, 1, 9, 1, 9, 1, 9, 5, 9, 97, 8, 9, 10, 9, 12, 9, 100, 9, 9, 1, 10, 1, 10, 3, 10, 104, 8, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 5, 12, 114, 8, 12, 10, 12, 12, 12, 117, 9, 12, 1, 13, 1, 13, 1, 13, 5, 13, 122, 8, 13, 10, 13, 12, 13, 125, 9, 13, 1, 14, 4, 14, 128, 8, 14, 11, 14, 12, 14, 129, 1, 14, 0, 0, 15, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 0, 3, 2, 0, 4, 4, 16, 16, 1, 0, 15, 18, 3, 0, 1, 1, 5, 8, 13, 13, 136, 0, 31, 1, 0, 0, 0, 2, 39, 1, 0, 0, 0, 4, 48, 1, 0, 0, 0, 6, 70, 1, 0, 0, 0, 8, 72, 1, 0, 0, 0, 10, 75, 1, 0, 0, 0, 12, 78, 1, 0, 0, 0, 14, 81, 1, 0, 0, 0, 16, 85, 1, 0, 0, 0, 18, 93, 1, 0, 0, 0, 20, 101, 1, 0, 0, 0, 22, 105, 1, 0, 0, 0, 24, 109, 1, 0, 0, 0, 26, 118, 1, 0, 0, 0, 28, 127, 1, 0, 0, 0, 30, 32, 3, 28, 14, 0, 31, 30, 1, 0, 0, 0, 31, 32, 1, 0, 0, 0, 32, 34, 1, 0, 0, 0, 33, 35, 3, 2, 1, 0, 34, 33, 1, 0, 0, 0, 34, 35, 1, 0, 0, 0, 35, 36, 1, 0, 0, 0, 36, 37, 3, 6, 3, 0, 37, 38, 5, 0, 0, 1, 38, 1, 1, 0, 0, 0, 39, 43, 5, 1, 0, 0, 40, 41, 3, 4, 2, 0, 41, 42, 5, 2, 0, 0, 42, 44, 1, 0, 0, 0, 43, 40, 1, 0, 0, 0, 43, 44, 1, 0, 0, 0, 44, 45, 1, 0, 0, 0, 45, 46, 3, 4, 2, 0, 46, 47, 5, 3, 0, 0, 47, 3, 1, 0, 0, 0, 48, 49, 7, 0, 0, 0, 49, 5, 1, 0, 0, 0, 50, 53, 3, 8, 4, 0, 51, 53, 3, 10, 5, 0, 52, 50, 1, 0, 0, 0, 52, 51, 1, 0, 0, 0, 52, 53, 1, 0, 0, 0, 53, 55, 1, 0, 0, 0, 54, 56, 3, 12, 6, 0, 55, 54, 1, 0, 0, 0, 55, 56, 1, 0, 0, 0, 56, 58, 1, 0, 0, 0, 57, 59, 3, 14, 7, 0, 58, 57, 1, 0, 0, 0, 58, 59, 1, 0, 0, 0, 59, 71, 1, 0, 0, 0, 60, 62, 3, 12, 6, 0, 61, 60, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 65, 1, 0, 0, 0, 63, 66, 3, 8, 4, 0, 64, 66, 3, 10, 5, 0, 65, 63, 1, 0, 0, 0, 65, 64, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 68, 1, 0, 0, 0, 67, 69, 3, 14, 7, 0, 68, 67, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0, 69, 71, 1, 0, 0, 0, 70, 52, 1, 0, 0, 0, 70, 61, 1, 0, 0, 0, 71, 7, 1, 0, 0, 0, 72, 73, 5, 5, 0, 0, 73, 74, 3, 26, 13, 0, 74, 9, 1, 0, 0, 0, 75, 76, 5, 6, 0, 0, 76, 77, 3, 26, 13, 0, 77, 11, 1, 0, 0, 0, 78, 79, 5, 7, 0, 0, 79, 80, 3, 26, 13, 0, 80, 13, 1, 0, 0, 0, 81, 82, 5, 8, 0, 0, 82, 83, 7, 1, 0, 0, 83, 15, 1, 0, 0, 0, 84, 86, 3, 18, 9, 0, 85, 84, 1, 0, 0, 0, 85, 86, 1, 0, 0, 0, 86, 88, 1, 0, 0, 0, 87, 89, 3, 22, 11, 0, 88, 87, 1, 0, 0, 0, 88, 89, 1, 0, 0, 0, 89, 91, 1, 0, 0, 0, 90, 92, 3, 24, 12, 0, 91, 90, 1, 0, 0, 0, 91, 92, 1, 0, 0, 0, 92, 17, 1, 0, 0, 0, 93, 98, 3, 20, 10, 0, 94, 95, 5, 9, 0, 0, 95, 97, 3, 20, 10, 0, 96, 94, 1, 0, 0, 0, 97, 100, 1, 0, 0, 0, 98, 96, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 19, 1, 0, 0, 0, 100, 98, 1, 0, 0, 0, 101, 103, 3, 28, 14, 0, 102, 104, 3, 12, 6, 0, 103, 102, 1, 0, 0, 0, 103, 104, 1, 0, 0, 0, 104, 21, 1, 0, 0, 0, 105, 106, 5, 1, 0, 0, 106, 107, 3, 14, 7, 0, 107, 108, 5, 3, 0, 0, 108, 23, 1, 0, 0, 0, 109, 110, 5, 10, 0, 0, 110, 115, 3, 26, 13, 0, 111, 112, 5, 11, 0, 0, 112, 114, 3, 26, 13, 0, 113, 111, 1, 0, 0, 0, 114, 117, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 115, 116, 1, 0, 0, 0, 116, 25, 1, 0, 0, 0, 117, 115, 1, 0, 0, 0, 118, 123, 3, 28, 14, 0, 119, 120, 5, 12, 0, 0, 120, 122, 3, 28, 14, 0, 121, 119, 1, 0, 0, 0, 122, 125, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 27, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 126, 128, 8, 2, 0, 0, 127, 126, 1, 0, 0, 0, 128, 129, 1, 0, 0, 0, 129, 127, 1, 0, 0, 0, 129, 130, 1, 0, 0, 0, 130, 29, 1, 0, 0, 0, 18, 31, 34, 43, 52, 55, 58, 61, 65, 68, 70, 85, 88, 91, 98, 103, 115, 123, 129]
[4, 1, 116, 139, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 1, 0, 3, 0, 34, 8, 0, 1, 0, 3, 0, 37, 8, 0, 1, 0, 3, 0, 40, 8, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 51, 8, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 3, 4, 60, 8, 4, 1, 4, 3, 4, 63, 8, 4, 1, 4, 3, 4, 66, 8, 4, 1, 4, 3, 4, 69, 8, 4, 1, 4, 1, 4, 3, 4, 73, 8, 4, 1, 4, 3, 4, 76, 8, 4, 3, 4, 78, 8, 4, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 9, 3, 9, 93, 8, 9, 1, 9, 3, 9, 96, 8, 9, 1, 9, 3, 9, 99, 8, 9, 1, 10, 1, 10, 1, 10, 5, 10, 104, 8, 10, 10, 10, 12, 10, 107, 9, 10, 1, 11, 1, 11, 3, 11, 111, 8, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 5, 13, 121, 8, 13, 10, 13, 12, 13, 124, 9, 13, 1, 14, 1, 14, 1, 14, 5, 14, 129, 8, 14, 10, 14, 12, 14, 132, 9, 14, 1, 15, 4, 15, 135, 8, 15, 11, 15, 12, 15, 136, 1, 15, 0, 0, 16, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 0, 3, 2, 0, 5, 5, 17, 17, 1, 0, 16, 19, 3, 0, 1, 2, 6, 9, 14, 14, 143, 0, 33, 1, 0, 0, 0, 2, 44, 1, 0, 0, 0, 4, 46, 1, 0, 0, 0, 6, 55, 1, 0, 0, 0, 8, 77, 1, 0, 0, 0, 10, 79, 1, 0, 0, 0, 12, 82, 1, 0, 0, 0, 14, 85, 1, 0, 0, 0, 16, 88, 1, 0, 0, 0, 18, 92, 1, 0, 0, 0, 20, 100, 1, 0, 0, 0, 22, 108, 1, 0, 0, 0, 24, 112, 1, 0, 0, 0, 26, 116, 1, 0, 0, 0, 28, 125, 1, 0, 0, 0, 30, 134, 1, 0, 0, 0, 32, 34, 3, 2, 1, 0, 33, 32, 1, 0, 0, 0, 33, 34, 1, 0, 0, 0, 34, 36, 1, 0, 0, 0, 35, 37, 3, 30, 15, 0, 36, 35, 1, 0, 0, 0, 36, 37, 1, 0, 0, 0, 37, 39, 1, 0, 0, 0, 38, 40, 3, 4, 2, 0, 39, 38, 1, 0, 0, 0, 39, 40, 1, 0, 0, 0, 40, 41, 1, 0, 0, 0, 41, 42, 3, 8, 4, 0, 42, 43, 5, 0, 0, 1, 43, 1, 1, 0, 0, 0, 44, 45, 5, 1, 0, 0, 45, 3, 1, 0, 0, 0, 46, 50, 5, 2, 0, 0, 47, 48, 3, 6, 3, 0, 48, 49, 5, 3, 0, 0, 49, 51, 1, 0, 0, 0, 50, 47, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 53, 3, 6, 3, 0, 53, 54, 5, 4, 0, 0, 54, 5, 1, 0, 0, 0, 55, 56, 7, 0, 0, 0, 56, 7, 1, 0, 0, 0, 57, 60, 3, 10, 5, 0, 58, 60, 3, 12, 6, 0, 59, 57, 1, 0, 0, 0, 59, 58, 1, 0, 0, 0, 59, 60, 1, 0, 0, 0, 60, 62, 1, 0, 0, 0, 61, 63, 3, 14, 7, 0, 62, 61, 1, 0, 0, 0, 62, 63, 1, 0, 0, 0, 63, 65, 1, 0, 0, 0, 64, 66, 3, 16, 8, 0, 65, 64, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 78, 1, 0, 0, 0, 67, 69, 3, 14, 7, 0, 68, 67, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0, 69, 72, 1, 0, 0, 0, 70, 73, 3, 10, 5, 0, 71, 73, 3, 12, 6, 0, 72, 70, 1, 0, 0, 0, 72, 71, 1, 0, 0, 0, 72, 73, 1, 0, 0, 0, 73, 75, 1, 0, 0, 0, 74, 76, 3, 16, 8, 0, 75, 74, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 78, 1, 0, 0, 0, 77, 59, 1, 0, 0, 0, 77, 68, 1, 0, 0, 0, 78, 9, 1, 0, 0, 0, 79, 80, 5, 6, 0, 0, 80, 81, 3, 28, 14, 0, 81, 11, 1, 0, 0, 0, 82, 83, 5, 7, 0, 0, 83, 84, 3, 28, 14, 0, 84, 13, 1, 0, 0, 0, 85, 86, 5, 8, 0, 0, 86, 87, 3, 28, 14, 0, 87, 15, 1, 0, 0, 0, 88, 89, 5, 9, 0, 0, 89, 90, 7, 1, 0, 0, 90, 17, 1, 0, 0, 0, 91, 93, 3, 20, 10, 0, 92, 91, 1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 95, 1, 0, 0, 0, 94, 96, 3, 24, 12, 0, 95, 94, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 98, 1, 0, 0, 0, 97, 99, 3, 26, 13, 0, 98, 97, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 19, 1, 0, 0, 0, 100, 105, 3, 22, 11, 0, 101, 102, 5, 10, 0, 0, 102, 104, 3, 22, 11, 0, 103, 101, 1, 0, 0, 0, 104, 107, 1, 0, 0, 0, 105, 103, 1, 0, 0, 0, 105, 106, 1, 0, 0, 0, 106, 21, 1, 0, 0, 0, 107, 105, 1, 0, 0, 0, 108, 110, 3, 30, 15, 0, 109, 111, 3, 14, 7, 0, 110, 109, 1, 0, 0, 0, 110, 111, 1, 0, 0, 0, 111, 23, 1, 0, 0, 0, 112, 113, 5, 2, 0, 0, 113, 114, 3, 16, 8, 0, 114, 115, 5, 4, 0, 0, 115, 25, 1, 0, 0, 0, 116, 117, 5, 11, 0, 0, 117, 122, 3, 28, 14, 0, 118, 119, 5, 12, 0, 0, 119, 121, 3, 28, 14, 0, 120, 118, 1, 0, 0, 0, 121, 124, 1, 0, 0, 0, 122, 120, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 27, 1, 0, 0, 0, 124, 122, 1, 0, 0, 0, 125, 130, 3, 30, 15, 0, 126, 127, 5, 13, 0, 0, 127, 129, 3, 30, 15, 0, 128, 126, 1, 0, 0, 0, 129, 132, 1, 0, 0, 0, 130, 128, 1, 0, 0, 0, 130, 131, 1, 0, 0, 0, 131, 29, 1, 0, 0, 0, 132, 130, 1, 0, 0, 0, 133, 135, 8, 2, 0, 0, 134, 133, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 134, 1, 0, 0, 0, 136, 137, 1, 0, 0, 0, 137, 31, 1, 0, 0, 0, 19, 33, 36, 39, 50, 59, 62, 65, 68, 72, 75, 77, 92, 95, 98, 105, 110, 122, 130, 136]
Loading

0 comments on commit 05d345b

Please sign in to comment.