Merge pull request #15 from accordproject/jonathan/extend_vscode_for_map

feat(map): extends for Map Type
accordproject · Sep 6, 2023 · ad48b80 · ad48b80
2 parents 7318fed + ad7faf7
commit ad48b80
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -56,6 +56,7 @@ The extention adds code snippets for the following elements of the Concerto lang
 | Transaction | transaction |
 | Concept     |   concept   |
 | Enum        |    enum     |
+| Map         |    map      |
 | Scalar      |    scalar   |
 | Event       |    event    |
 | Namespace   |   namespace |

diff --git a/client/snippets/concerto.json b/client/snippets/concerto.json
@@ -41,6 +41,11 @@
 	  "body": ["enum ${1:enumName} {", "\to ${2:ITEM}$0", "}"],
 	  "description": "Concerto enumerations define lists of static values"
 	},
+	"Map": {
+	  "prefix": "map",
+	  "body": ["map ${1:mapName} {", "\to ${2:ITEM}$0", "}"],
+	  "description": "Concerto maps define a set of key-value pairs"
+	},
 	"Namespace": {
 	  "prefix": "namespace",
 	  "body": ["namespace ${1:[email protected]} "],

diff --git a/client/syntaxes/concerto.tmLanguage.json b/client/syntaxes/concerto.tmLanguage.json
@@ -53,7 +53,7 @@
 		},
 		"concerto-declaration": {
 			"name": "keyword.control.flow.concerto",
-			"match": "\\b(asset|transaction|participant|enum|concept|event|scalar)\\b",
+			"match": "\\b(asset|transaction|participant|enum|map|concept|event|scalar)\\b",
 			"patterns": []
 		},
 		"concerto-abstract-type": {
@@ -463,6 +463,9 @@
 				{
 					"include": "#enum-declaration"
 				},
+				{
+					"include": "#map-declaration"
+				},
 				{
 					"include": "#namespace-declaration"
 				},
@@ -504,7 +507,7 @@
 					"name": "entity.name.type.js"
 				}
 			},
-			"end": "(?=[};]|\\bvar\\b|\\blet\\b|\\bconst\\b|\\btype\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\bnamespace\\b|\\bmodule\\b|\\bimport\\b|\\benum\\b|\\bdeclare\\b|\\bexport\\b|\\babstract\\b|\\basync\\b)",
+			"end": "(?=[};]|\\bvar\\b|\\blet\\b|\\bconst\\b|\\btype\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\bnamespace\\b|\\bmodule\\b|\\bimport\\b|\\benum\\b|\\bmap\\b|\\bdeclare\\b|\\bexport\\b|\\babstract\\b|\\basync\\b)",
 			"patterns": [{
 					"include": "#comment"
 				},
@@ -598,6 +601,80 @@
 				}
 			]
 		},
+		"map-declaration": {
+			"name": "meta.map.declaration.js",
+			"begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(map)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.export.js"
+				},
+				"2": {
+					"name": "storage.modifier.js"
+				},
+				"3": {
+					"name": "storage.type.map.js"
+				},
+				"4": {
+					"name": "entity.name.type.map.js"
+				}
+			},
+			"end": "(?<=\\})",
+			"patterns": [{
+					"include": "#comment"
+				},
+				{
+					"begin": "\\{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.js"
+						}
+					},
+					"end": "\\}",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.block.js"
+						}
+					},
+					"patterns": [{
+							"include": "#comment"
+						},
+						{
+							"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
+							"beginCaptures": {
+								"0": {
+									"name": "variable.other.maptype.js"
+								}
+							},
+							"end": "(?=,|\\}|$)",
+							"patterns": [{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")))",
+							"end": "(?=,|\\}|$)",
+							"patterns": [{
+									"include": "#string"
+								},
+								{
+									"include": "#comment"
+								},
+								{
+									"include": "#variable-initializer"
+								}
+							]
+						},
+						{
+							"include": "#punctuation-comma"
+						}
+					]
+				}
+			]
+		},
 		"namespace-declaration": {
 			"name": "meta.namespace.declaration.js",
 			"begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?\\b(namespace|module)\\s+",
@@ -752,7 +829,7 @@
 							"name": "keyword.control.default.js"
 						}
 					},
-					"end": "(?=;|\\bexport\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|\\bimport\\b|\\benum\\b|\\bnamespace\\b|\\bmodule\\b|\\btype\\b|\\babstract\\b|\\bdeclare\\b|\\basync\\b|$)",
+					"end": "(?=;|\\bexport\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|\\bimport\\b|\\benum\\b|\\bmap\\b|\\bnamespace\\b|\\bmodule\\b|\\btype\\b|\\babstract\\b|\\bdeclare\\b|\\basync\\b|$)",
 					"patterns": [{
 						"include": "#expression"
 					}]
@@ -765,7 +842,7 @@
 							"name": "keyword.control.export.js"
 						}
 					},
-					"end": "(?=;|\\bexport\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|\\bimport\\b|\\benum\\b|\\bnamespace\\b|\\bmodule\\b|\\btype\\b|\\babstract\\b|\\bdeclare\\b|\\basync\\b|$)",
+					"end": "(?=;|\\bexport\\b|\\bfunction\\b|\\bclass\\b|\\binterface\\b|\\blet\\b|\\bvar\\b|\\bconst\\b|\\bimport\\b|\\benum\\b|\\bmap\\b|\\bnamespace\\b|\\bmodule\\b|\\btype\\b|\\babstract\\b|\\bdeclare\\b|\\basync\\b|$)",
 					"patterns": [{
 						"include": "#import-export-declaration"
 					}]

diff --git a/test-data/hr/hr.cto b/test-data/hr/hr.cto
@@ -9,6 +9,11 @@ enum State {
     o CA
 }
 
+map Rolodex {
+  o String
+  o String
+}
+
 concept Address {
     o String street
     o String city
@@ -20,6 +25,7 @@ concept Address {
 concept Company {
     o String name
     o Address headquarters
+    o Rolodex rolodex
 }
 
 enum Department {