cleanup from_sql and sql: in textmade grammar

Author: mtoy-googly-moogly

packages/malloy-syntax-highlight/grammars/malloy/malloy.monarch.ts

@@ -47,18 +47,6 @@ export const monarch: Monaco.IMonarchLanguage = {
       {include: '@identifiers_unquoted'},
     ],
     sql_string: [
-      [
-        /\b(select)(\s*:\s*)(""")/,
-        [
-          'keyword.control.select',
-          '',
-          {
-            next: '@sql_end',
-            nextEmbedded: 'sql',
-            token: 'punctuation.sql.block.open',
-          },
-        ],
-      ],
       [
         /(\b[A-Za-z_][A-Za-z_0-9]*)(\s*\.\s*)(sql)(\s*\(\s*)(""")/,
         [
@@ -196,7 +184,6 @@ export const monarch: Monaco.IMonarchLanguage = {
     ],
     properties: [
       [/\baccept\b/, 'keyword.control.accept'],
-      [/\bsql\b/, 'keyword.control.sql'],
       [/\bselect\b/, 'keyword.control.select'],
       [/\bconnection\b/, 'keyword.control.connection'],
       [/\brun\b/, 'keyword.control.run'],
@@ -236,7 +223,7 @@ export const monarch: Monaco.IMonarchLanguage = {
         ['entity.name.function', '', 'entity.name.function.modifier'],
       ],
       [
-        /\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|TABLE|FROM|FROM_SQL|UNGROUPED)(\s*\()/,
+        /\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|UNGROUPED)(\s*\()/,
         ['entity.name.function', ''],
       ],
       [/\b([a-zA-Z_][a-zA-Z_0-9]*)(\s*\()/, ['entity.name.function', '']],

packages/malloy-syntax-highlight/grammars/malloy/malloy.tmGrammar.json

@@ -39,22 +39,6 @@
     },
     "sql-string": {
       "patterns": [
-        {
-          "begin": "\\b(select)(\\s*:\\s*)(\"\"\")",
-          "end": "\"\"\"",
-          "beginCaptures": {
-            "1": { "name": "keyword.control.select" },
-            "3": { "name": "punctuation.sql-block.open" }
-          },
-          "endCaptures": {
-            "0": { "name": "punctuation.sql-block.close" }
-          },
-          "name": "source.sql",
-          "patterns": [
-            { "include": "#malloy-in-sql" },
-            { "include": "source.sql" }
-          ]
-        },
         {
           "begin": "(\\b[A-Za-z_][A-Za-z_0-9]*)(\\s*\\.\\s*)(sql)(\\s*\\(\\s*)(\"\"\")",
           "end": "\"\"\"",
@@ -84,7 +68,7 @@
           }
         },
         {
-          "match": "(?i)\\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|TABLE|FROM|FROM_SQL|UNGROUPED)(\\s*\\()",
+          "match": "(?i)\\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|UNGROUPED)(\\s*\\()",
           "captures": {
             "1": { "name": "entity.name.function" }
           }
@@ -350,11 +334,7 @@
           "match": "(?i)\\baccept\\b",
           "name": "keyword.control.accept"
         },
-        {
-          "match": "(?i)\\bsql\\b",
-          "name": "keyword.control.sql"
-        },
-        {
+       {
           "match": "(?i)\\bselect\\b",
           "name": "keyword.control.select"
         },