@malloydata/syntax-highlight 0.0.409 → 0.0.411

package/grammars/malloy/malloy.monarch.ts

@@ -13,7 +13,6 @@ export const monarch: Monaco.IMonarchLanguage = {
   tokenizer: {
     root: [{include: '@malloy_language'}],
     malloy_language: [
-      {include: '@sql_string'},
       {include: '@comments'},
       {include: '@strings'},
       {include: '@given'},
@@ -29,80 +28,6 @@ export const monarch: Monaco.IMonarchLanguage = {
       {include: '@timeframes'},
       {include: '@identifiers_unquoted'},
     ],
-    sql_string: [
-      [
-        /(\b[A-Za-z_][A-Za-z_0-9]*)(\s*\.\s*)((?:sql))(\s*\(\s*)(""")/,
-        [
-          'variable.other.malloy',
-          '',
-          'keyword.control.sql.malloy',
-          '',
-          {
-            next: '@sql_end_0',
-            nextEmbedded: 'sql',
-            token: 'punctuation.definition.string.begin.sql.malloy',
-          },
-        ],
-      ],
-      [
-        /(\b[A-Za-z_][A-Za-z_0-9]*)(\s*\.\s*)((?:sql))(\s*\(\s*)(")/,
-        [
-          'variable.other.malloy',
-          '',
-          'keyword.control.sql.malloy',
-          '',
-          {
-            next: '@sql_end_1',
-            nextEmbedded: 'sql',
-            token: 'punctuation.definition.string.begin.sql.malloy',
-          },
-        ],
-      ],
-      [
-        /(\b[A-Za-z_][A-Za-z_0-9]*)(\s*\.\s*)((?:sql))(\s*\(\s*)(')/,
-        [
-          'variable.other.malloy',
-          '',
-          'keyword.control.sql.malloy',
-          '',
-          {
-            next: '@sql_end_2',
-            nextEmbedded: 'sql',
-            token: 'punctuation.definition.string.begin.sql.malloy',
-          },
-        ],
-      ],
-    ],
-    sql_end_0: [
-      [
-        /"""/,
-        {
-          next: '@pop',
-          nextEmbedded: '@pop',
-          token: 'punctuation.definition.string.end.sql.malloy',
-        },
-      ],
-    ],
-    sql_end_1: [
-      [
-        /"/,
-        {
-          next: '@pop',
-          nextEmbedded: '@pop',
-          token: 'punctuation.definition.string.end.sql.malloy',
-        },
-      ],
-    ],
-    sql_end_2: [
-      [
-        /'/,
-        {
-          next: '@pop',
-          nextEmbedded: '@pop',
-          token: 'punctuation.definition.string.end.sql.malloy',
-        },
-      ],
-    ],
     comments: [
       [/\/\*/, {next: '@comment_block_end', token: 'comment.block'}],
       [/\/\//, {next: '@comment_line_double_slash_end', token: 'comment.line'}],
@@ -287,7 +212,7 @@ export const monarch: Monaco.IMonarchLanguage = {
         'constant.numeric.date',
       ],
     ],
-    identifiers_quoted: [[/`[^`]*`/, 'variable.other.quoted']],
+    identifiers_quoted: [[/`[^`]*`/, 'variable.other.quoted.malloy']],
     types: [
       [
         /\b(boolean|date|json|number|string|timestamp|timestamptz)\b/,

package/grammars/malloy/malloy.tmGrammar.json

@@ -93,34 +93,42 @@
       ]
     },
     "sql-string": {
-      "comment": "SQL-ness is the .sql() context, not the delimiter — any string argument to connection.sql(...) is SQL. ONE combined rule, not three per-quote siblings: vscode-textmate's begin scanner drops shorter begins that share a prefix with a longer one, so separate \"\"\"/\"/' rules leave only \"\"\" working. The opening quote is captured (group 5) and the end back-references it (\\5), so all three close correctly. #malloy-in-sql gives \"\"\" blocks their %{ } interpolation; it also (harmlessly) applies inside short SQL strings, where %{ } is not real interpolation but is vanishingly rare.",
+      "comment": "SQL-ness is the .sql() CONTEXT, not the delimiter — any string argument to connection.sql(...) is SQL (grammar: connectionId DOT SQL OPAREN (sqlString|shortString) CPAREN; connectionId is an `id`). Two NESTED rules so the string can sit on a different line from `.sql(` — a single begin regex cannot span the newline. The OUTER rule opens at `connection.sql(` and closes at the matching `)`; the INNER rule matches the string argument wherever it lands. connection matches an `id`: a Unicode identifier ([\\p{Alphabetic}_]… mirrors the lexer's ID_CHAR) or a backtick-quoted name. The inner quote absorbs an optional raw `s` prefix but captures only the quote, so the \\1 end back-reference closes all of '…', \"…\", s'…', s\"…\", and \"\"\"…\"\"\". #malloy-in-sql gives blocks their %{ } interpolation (harmless inside short/raw strings, where it is vanishingly rare).",
       "patterns": [
         {
-          "begin": "(\\b[A-Za-z_][A-Za-z_0-9]*)(\\s*\\.\\s*)((?i:sql))(\\s*\\(\\s*)(\"\"\"|\"|')",
-          "end": "\\5",
+          "begin": "(`[^`]*`|[\\p{Alphabetic}_][\\p{Alphabetic}_0-9]*)(\\s*\\.\\s*)((?i:sql))(\\s*\\(\\s*)",
+          "end": "\\)",
           "beginCaptures": {
             "1": {
               "name": "variable.other.malloy"
             },
             "3": {
               "name": "keyword.control.sql.malloy"
-            },
-            "5": {
-              "name": "punctuation.definition.string.begin.sql.malloy"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.sql.malloy"
             }
           },
           "name": "meta.embedded.block.sql.malloy",
           "patterns": [
             {
-              "include": "#malloy-in-sql"
-            },
-            {
-              "include": "source.sql"
+              "begin": "(?:[sS]\\s*)?(\"\"\"|\"|')",
+              "end": "\\1",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.string.begin.sql.malloy"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.end.sql.malloy"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#malloy-in-sql"
+                },
+                {
+                  "include": "source.sql"
+                }
+              ]
             }
           ]
         }
@@ -173,7 +181,7 @@
       "patterns": [
         {
           "match": "`[^`]*`",
-          "name": "variable.other.quoted"
+          "name": "variable.other.quoted.malloy"
         }
       ]
     },
@@ -245,7 +253,7 @@
       ]
     },
     "tags": {
-      "comment": "Malloy annotations are ROUTED (annotation-prefix.ts parsePrefix; docs.malloydata.dev/documentation/language/tags). The sigil is ##? then an optional block '|'; the route follows it (up to first whitespace) and decides how the content reads. Tag routes — empty (MOTLY) and the claimed sigils ! @ : — carry tag property-language → tag styling. The documentation route (\") and app-defined bracketed routes ( () <> [] {} ) carry prose/markdown/JSON → documentation styling. Routes apply identically to single-line (#/##) and block (#|/##|) forms. The doc-route fragment is repeated per rule because TextMate has no regex variables; (?!docroute) on the tag rules both implements the split and keeps the prefix-sharing begin scanner from dropping the shorter tag begins. v1: bare tag values share the tag-name scope; tag-route block bodies get tag-content treatment.",
+      "comment": "Malloy annotations are ROUTED (annotation-prefix.ts parsePrefix; docs.malloydata.dev/documentation/language/tags). The sigil is ##? then an optional block '|'; the route follows it (up to first whitespace) and decides how the content reads. Tag routes — empty (MOTLY) and the claimed sigils ! @ : — carry tag property-language → tag styling. The documentation route (\") and app-defined bracketed routes ( () <> [] {} ) carry prose/markdown/JSON → documentation styling. Routes apply identically to single-line (#/##) and block (#|/##|) forms. The doc-route fragment is repeated per rule because TextMate has no regex variables; (?!docroute) on the tag rules both implements the split and keeps the prefix-sharing begin scanner from dropping the shorter tag begins. Tag-route bodies (line and block alike) embed source.motly — the MOTLY tag-property language (@malloydata/motly-ts-parser) — so keys, values, references, @-literals, arrays, and nested blocks highlight as MOTLY.",
       "patterns": [
         {
           "begin": "^([ \\t]*)(##\\|(?:\"|\\([^\\s)]*\\)|<[^\\s>]*>|\\[[^\\s\\]]*\\]|\\{[^\\s}]*\\}))",
@@ -278,7 +286,7 @@
           "name": "meta.annotation.block.malloy",
           "patterns": [
             {
-              "include": "#tag-content"
+              "include": "source.motly"
             }
           ]
         },
@@ -313,7 +321,7 @@
           "name": "meta.annotation.block.malloy",
           "patterns": [
             {
-              "include": "#tag-content"
+              "include": "source.motly"
             }
           ]
         },
@@ -338,37 +346,11 @@
           "name": "meta.annotation.line.malloy",
           "patterns": [
             {
-              "include": "#tag-content"
-            }
-          ]
-        }
-      ],
-      "repository": {
-        "tag-content": {
-          "patterns": [
-            {
-              "match": "\"[^\"#]*\"",
-              "name": "string.quoted.double.malloy"
-            },
-            {
-              "match": "=",
-              "name": "keyword.operator.assignment.malloy"
-            },
-            {
-              "match": "-(?=[A-Za-z_])",
-              "name": "keyword.operator.negation.malloy"
-            },
-            {
-              "match": "[0-9][A-Za-z_0-9.]*",
-              "name": "constant.numeric.malloy"
-            },
-            {
-              "match": "[A-Za-z_][A-Za-z_0-9.]*",
-              "name": "entity.name.tag.malloy"
+              "include": "source.motly"
             }
           ]
         }
-      }
+      ]
     },
     "strings": {
       "comment": "Order matters: f-/s-/r- prefixed forms begin one char earlier than a bare quote so they win by start position; among same-start ties the triple forms are listed before the single/double forms. Filter (f...) and raw (s...) bodies are opaque in v1 — no inner patterns. The bare triple string has NO interpolation pattern, so %{ } inside it stays plain string text (interpolation is only legal inside .sql(), handled by #sql-string).",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/syntax-highlight",
-  "version": "0.0.409",
+  "version": "0.0.411",
   "description": "A package to simplify the process of developing, testing, and syncnig Malloy syntax highlighting grammars",
   "repository": {
     "type": "git",
@@ -27,6 +27,7 @@
   },
   "license": "MIT",
   "devDependencies": {
+    "@malloydata/motly-ts-parser": "^0.9.0",
     "@types/jasmine": "^4.3.5",
     "http-server": "^14.1.1",
     "jasmine-core": "^5.1.1",