Makes the thing work

Author: ncordon

packages/vscode-extension/syntaxes/cypher.adoc.json

@@ -3,30 +3,44 @@
   "injectionSelector": "L:text.asciidoc -meta.embedded.block",
   "patterns": [
     {
-      "begin": "\\[(source),\\s*(cypher)\\]",
-      "name": "markup.fenced_code.block.markdown",
-      "end": "(-{4})",
+      "name": "markup.code.cypher.asciidoc",
+      "begin": "^\\[(source)(,|#)\\s*(?i:(cypher))([^\\]]+)*\\]\\s*$",
       "beginCaptures": {
         "1": {
-          "name": "entity.name.function.asciidoc"
-        },
-        "2": {
-          "name": "markup.meta.attribute-list.asciidoc"
+          "name": "markup.meta.attribute-list.asciidoc entity.name.function.asciidoc"
         },
         "3": {
-          "name": "markup.raw.asciidoc"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.markdown"
+          "name": "markup.meta.attribute-list.asciidoc markup.heading.asciidoc"
+        },
+        "4": {
+          "name": "markup.meta.attribute-list.asciidoc markup.heading.asciidoc"
         }
       },
       "patterns": [
         {
-          "include": "source.cypher"
+          "comment": "listing block",
+          "begin": "^(-{4,})\\s*$",
+          "contentName": "source.block.cypher",
+          "patterns": [
+            {
+              "include": "source.cypher"
+            }
+          ],
+          "end": "^(\\1)$"
+        },
+        {
+          "comment": "open block",
+          "begin": "^(-{2})\\s*$",
+          "contentName": "source.embedded.cypher",
+          "patterns": [
+            {
+              "include": "source.cypher"
+            }
+          ],
+          "end": "^(\\1)$"
         }
-      ]
+      ],
+      "end": "((?<=--|\\.\\.\\.\\.)$|^\\s*$)"
     }
   ]
 }

packages/vscode-extension/tests/fixtures/textmate/simple-match.adoc

@@ -0,0 +1,38 @@
+[source,java]
+----
+import org.neo4j.cypherdsl.parser.CypherParser;
+
+public class Demo {
+	public static void main(String...a) {
+		var node = CypherParser.parseNode("(m:Movie)");
+	}
+}
+----
+Some random text
+
+
+[source,cypher]
+----
+/* This is a
+multiline comment
+*/
+MATCH (u1:CommerceUser{user_id:$seller_id}),
+      (u2:CommerceUser{user_id:$customer_id}),
+    p = allShortestPaths((u1)-[:PURCHASE*..10]->(u2))
+WHERE u1 <> u2
+WITH
+    // This is a single line comment
+    reduce(output = [], n IN relationships(p) | output + n.create_time.epochMillis ) as relsDate,
+    reduce(output = [], n IN nodes(p) | output + n ) as nodes,
+    "double quoted string" as a,
+    'single quoted string' as b
+RETURN relsDate, nodes
+LIMIT $limit
+----
+
+Some other text
+
+[source,cypher,indent=0,tabsize=4]
+----
+MATCH (n) RETURN n
+----