monaco-yql-languages 1.21.1 → 2.0.0

package/build/monaco.contribution.d.ts

@@ -1,13 +1,11 @@
 import './clickhouse/clickhouse.contribution';
 import './s-expressions/s-expressions.contribution';
+import './s-expressions/YQLs.tmLanguage.json';
+import './s-expressions/YQLs.monarch.json';
 import './themes/themes.contribution';
 import './yql/yql.contribution';
+import './yql/YQL.monarch.json';
+import './yql/YQLansi.monarch.json';
 import './yql/yql_ansi.contribution';
-import './yql/yql.keywords';
 import './yql/YQL.tmLanguage.json';
-import './yql_unstable/yql.contribution';
-import './yql_unstable/YQL.monarch.json';
-import './yql_unstable/YQLansi.monarch.json';
-import './yql_unstable/yql_ansi.contribution';
-import './s-expressions_unstable/s-expressions.contribution';
-import './s-expressions_unstable/YQLs.monarch.json';
+import './yql/YQL.ansi.tmLanguage.json';

package/build/monaco.contribution.js

@@ -1,13 +1,11 @@
 import './clickhouse/clickhouse.contribution';
 import './s-expressions/s-expressions.contribution';
+import './s-expressions/YQLs.tmLanguage.json';
+import './s-expressions/YQLs.monarch.json';
 import './themes/themes.contribution';
 import './yql/yql.contribution';
+import './yql/YQL.monarch.json';
+import './yql/YQLansi.monarch.json';
 import './yql/yql_ansi.contribution';
-import './yql/yql.keywords';
 import './yql/YQL.tmLanguage.json';
-import './yql_unstable/yql.contribution';
-import './yql_unstable/YQL.monarch.json';
-import './yql_unstable/YQLansi.monarch.json';
-import './yql_unstable/yql_ansi.contribution';
-import './s-expressions_unstable/s-expressions.contribution';
-import './s-expressions_unstable/YQLs.monarch.json';
+import './yql/YQL.ansi.tmLanguage.json';

package/build/{s-expressions_unstable → s-expressions}/YQLs.monarch.json

@@ -35,7 +35,7 @@
         "beforable": [],
         "stringLiteral\"": [
             [
-                "#py",
+                "\\#py",
                 {
                     "nextEmbedded": "python",
                     "goBack": 3,
@@ -52,15 +52,6 @@
                     "token": "string.js"
                 }
             ],
-            [
-                "{",
-                {
-                    "nextEmbedded": "javascript",
-                    "goBack": 1,
-                    "next": "@embedded",
-                    "token": "string.js"
-                }
-            ],
             ["\\\\.", "string.escape"],
             ["[^\\\"]", "string"],
             ["\\\"", "string", "@pop"],
@@ -68,7 +59,7 @@
         ],
         "stringLiteral@@": [
             [
-                "#py",
+                "\\#py",
                 {
                     "nextEmbedded": "python",
                     "goBack": 3,
@@ -85,15 +76,6 @@
                     "token": "string.js"
                 }
             ],
-            [
-                "{",
-                {
-                    "nextEmbedded": "javascript",
-                    "goBack": 1,
-                    "next": "@embedded",
-                    "token": "string.js"
-                }
-            ],
             ["\\@\\@\\@\\@", "string.escape"],
             ["[^\\@\\@]", "string"],
             ["\\@\\@", "string", "@pop"],

package/build/s-expressions/YQLs.tmLanguage.json

@@ -0,0 +1,170 @@
+{
+    "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+    "fileTypes": ["yqls"],
+    "name": "yqls",
+    "patterns": [
+        {
+            "include": "#comment0"
+        },
+        {
+            "include": "#keyword1"
+        },
+        {
+            "include": "#bind-parameter-identifier2"
+        },
+        {
+            "include": "#quoted-identifier3"
+        },
+        {
+            "include": "#type-identifier4"
+        },
+        {
+            "include": "#function-identifier5"
+        },
+        {
+            "include": "#literal6"
+        },
+        {
+            "include": "#identifier7"
+        },
+        {
+            "include": "#string-literal8"
+        }
+    ],
+    "repository": {
+        "bind-parameter-identifier2": {
+            "patterns": [
+                {
+                    "match": "\\b(world)\\b",
+                    "name": "variable.parameter"
+                }
+            ]
+        },
+        "comment0": {
+            "patterns": [
+                {
+                    "match": "(#.*)",
+                    "name": "comment.block"
+                }
+            ]
+        },
+        "function-identifier5": {
+            "patterns": [
+                {
+                    "match": "([A-Z][A-Za-z_\\-0-9]*)",
+                    "name": "entity.name.function"
+                },
+                {
+                    "match": "('[A-Za-z_\\-0-9]+\\.[A-Za-z_\\-0-9]+)",
+                    "name": "entity.name.function"
+                },
+                {
+                    "match": "('\"[A-Za-z_\\-0-9]+\\.[A-Za-z_\\-0-9]+\")",
+                    "name": "entity.name.function"
+                }
+            ]
+        },
+        "identifier7": {
+            "patterns": [
+                {
+                    "match": "\\b([a-z_0-9][A-Za-z_\\-0-9]*)\\b",
+                    "name": "variable.other"
+                }
+            ]
+        },
+        "keyword1": {
+            "patterns": [
+                {
+                    "match": "\\b(set_package_version|override_library|package|library|declare|return|lambda|import|export|quote|block|let)\\b",
+                    "name": "keyword.control"
+                }
+            ]
+        },
+        "literal6": {
+            "patterns": [
+                {
+                    "match": "('[A-Za-z_\\-0-9]+)",
+                    "name": "constant.numeric"
+                }
+            ]
+        },
+        "quoted-identifier3": {
+            "patterns": [
+                {
+                    "match": "([A-Z][A-Za-z_\\-0-9]*!)",
+                    "name": "string.interpolated"
+                }
+            ]
+        },
+        "string-literal8": {
+            "patterns": [
+                {
+                    "begin": "\\\"",
+                    "end": "\\\"",
+                    "name": "string.quoted.double",
+                    "patterns": [
+                        {
+                            "match": "\\\\.",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                },
+                {
+                    "begin": "\\@\\@\\#py",
+                    "end": "\\@\\@",
+                    "patterns": [
+                        {
+                            "include": "source.python"
+                        },
+                        {
+                            "match": "\\@\\@\\@\\@",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                },
+                {
+                    "begin": "\\@\\@\\/\\/js",
+                    "end": "\\@\\@",
+                    "patterns": [
+                        {
+                            "include": "source.js"
+                        },
+                        {
+                            "match": "\\@\\@\\@\\@",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                },
+                {
+                    "begin": "\\@\\@",
+                    "end": "\\@\\@",
+                    "name": "string.quoted.double",
+                    "patterns": [
+                        {
+                            "match": "\\@\\@\\@\\@",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                }
+            ]
+        },
+        "type-identifier4": {
+            "patterns": [
+                {
+                    "match": "\\b(([a-zA-Z_])([a-zA-Z_0-9])*)(?=\\<)\\b",
+                    "name": "entity.name.type"
+                },
+                {
+                    "match": "\\b(DECIMAL)\\b",
+                    "name": "entity.name.type"
+                },
+                {
+                    "match": "\\b(pgpg_brin_minmax_multi_summary|pganycompatiblemultirange|pgpg_brin_bloom_summary|pganycompatiblenonarray|pganycompatiblerange|pganycompatiblearray|pgtable_am_handler|pglanguage_handler|pgindex_am_handler|pgpg_dependencies|_pgtstzmultirange|_pgint8multirange|_pgint4multirange|_pgdatemultirange|pgtstzmultirange|pgpg_ddl_command|pgint8multirange|pgint4multirange|pgdatemultirange|_pgtxid_snapshot|_pgregdictionary|_pgnummultirange|pgtxid_snapshot|pgregdictionary|pgnummultirange|pgevent_trigger|pganymultirange|pganycompatible|_pgtsmultirange|_pgregprocedure|_pgregnamespace|_pgregcollation|_pgpg_attribute|pgtsmultirange|pgregprocedure|pgregnamespace|pgregcollation|pgpg_node_tree|pgpg_ndistinct|pgpg_attribute|_pgtimestamptz|_pgregoperator|_pgpg_snapshot|pgtsm_handler|pgtimestamptz|pgregoperator|pgpg_snapshot|pgpg_mcv_list|pgfdw_handler|pganynonarray|_pgint2vector|TzTimestamp64|pgint2vector|pganyelement|_pgtstzrange|_pgtimestamp|_pgregconfig|_pgrefcursor|_pgoidvector|_pgint8range|_pgint4range|_pggtsvector|_pgdaterange|TzDatetime64|JsonDocument|pgtstzrange|pgtimestamp|pgregconfig|pgrefcursor|pgoidvector|pgint8range|pgint4range|pggtsvector|pgdaterange|_pgtsvector|_pgregclass|_pgpg_class|_pgnumrange|_pgmacaddr8|_pgjsonpath|_pginterval|TzTimestamp|Timestamp64|pgtsvector|pgregclass|pgpg_class|pgnumrange|pgmacaddr8|pgjsonpath|pginterval|pginternal|pganyrange|pganyarray|_pgvarchar|_pgtsrange|_pgtsquery|_pgregtype|_pgregrole|_pgregproc|_pgregoper|_pgpolygon|_pgpg_type|_pgpg_proc|_pgnumeric|_pgmacaddr|_pgcstring|_pgaclitem|TzDatetime|Interval64|Datetime64|pgvarchar|pgunknown|pgtsrange|pgtsquery|pgtrigger|pgregtype|pgregrole|pgregproc|pgregoper|pgpolygon|pgpg_type|pgpg_proc|pgnumeric|pgmacaddr|pgcstring|pganyenum|pgaclitem|_pgvarbit|_pgtimetz|_pgrecord|_pgpg_lsn|_pgfloat8|_pgfloat4|_pgcircle|_pgbpchar|Timestamp|EmptyList|EmptyDict|pgvarbit|pgtimetz|pgrecord|pgpg_lsn|pgfloat8|pgfloat4|pgcircle|pgbpchar|_pgpoint|_pgmoney|_pgjsonb|_pgbytea|TzDate32|Interval|DyNumber|Datetime|pgpoint|pgmoney|pgjsonb|pgbytea|_pgxid8|_pguuid|_pgtime|_pgtext|_pgpath|_pgname|_pglseg|_pgline|_pgjson|_pgint8|_pgint4|_pgint2|_pginet|_pgdate|_pgcidr|_pgchar|_pgbool|Generic|pgxid8|pgvoid|pguuid|pgtime|pgtext|pgpath|pgname|pglseg|pgline|pgjson|pgint8|pgint4|pgint2|pginet|pgdate|pgcidr|pgchar|pgbool|_pgxml|_pgxid|_pgtid|_pgoid|_pgcid|_pgbox|_pgbit|Uint64|Uint32|Uint16|TzDate|String|Double|Date32|pgxml|pgxid|pgtid|pgoid|pgcid|pgbox|pgbit|pgany|Uint8|Int64|Int32|Int16|Float|Yson|Void|Uuid|Utf8|Unit|Json|Int8|Date|Bool)\\b",
+                    "name": "entity.name.type"
+                }
+            ]
+        }
+    },
+    "scope": "source.yqls",
+    "scopeName": "source.yqls"
+}

package/build/s-expressions/s-expressions.js

@@ -1,4 +1,4 @@
-import { keywordControl, keywordOperator, variables } from './s-expressions.keywords';
+import YQLsMonarch from './YQLs.monarch.json';
 export const LANGUAGE_ID = 's-expressions';
 export const conf = {
     comments: {
@@ -29,52 +29,6 @@ export const language = {
         { open: '(', close: ')', token: 'delimiter.parenthesis' },
         { open: '{', close: '}', token: 'delimiter.curly' },
     ],
-    keywordControl,
-    keywordOperator,
-    variables,
     escapes: /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
-    tokenizer: {
-        root: [
-            { include: '@whitespace' },
-            { include: '@comment' },
-            [/(#)((?:\w|[\\+-=<>'"&#])+)/, ['delimiter', 'constant']],
-            [
-                /(?:\b(?:(defun|defmethod|defmacro))\b)(\s+)((?:\w|-|\?)*)/,
-                ['type.function', 'text', 'entity.name'],
-            ],
-            [/(\*)(\S*)(\*)/, ['delimiter', 'variable', 'delimiter']],
-            { include: '@strings' },
-            [/'[^#\s)(]+/, 'variable.parameter'],
-            [/[(){}[\]]/, '@brackets'],
-            // identifiers and keywords
-            [
-                /(?:(?:<=?|>=?|==|!=|[-+*/%])|[a-zA-Z][a-zA-Z0-9!]*)/,
-                {
-                    cases: {
-                        '@keywordControl': { token: 'keyword.operator' },
-                        '@keywordOperator': { token: 'keyword.control' },
-                        '@variables': { token: 'variable' },
-                        '@default': 'identifier',
-                    },
-                },
-            ],
-        ],
-        whitespace: [[/\s+/, 'white']],
-        comment: [[/#.*/, 'comment']],
-        strings: [
-            [/'?"(?=.)/, { token: 'string', next: '@qqstring' }],
-            [/'?[@]{2}/, { token: 'string', next: '@multiline' }],
-            [/'?x"(?:[0-9A-Fa-f]{2})*"/, 'string'],
-        ],
-        qqstring: [
-            [/\\(?:[0-3][0-7][0-7]|x[0-9A-Fa-f]{2}|["tnrbfav\\])/, 'string.escape'],
-            [/[^"\\]+/, 'string'],
-            [/"|$/, { token: 'string', next: '@pop' }],
-        ],
-        multiline: [
-            [/[^@]+/, 'string'],
-            [/[@]{2}/, { token: 'string', next: '@pop' }],
-            [/./, { token: 'string' }],
-        ],
-    },
+    tokenizer: YQLsMonarch.tokenizer,
 };

package/build/yql/YQL.ansi.tmLanguage.json

@@ -0,0 +1,224 @@
+{
+    "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+    "fileTypes": ["yql"],
+    "name": "yql",
+    "patterns": [
+        {
+            "include": "#comment0"
+        },
+        {
+            "include": "#option-identifier2"
+        },
+        {
+            "include": "#function-identifier3"
+        },
+        {
+            "include": "#type-identifier4"
+        },
+        {
+            "include": "#function-identifier5"
+        },
+        {
+            "include": "#literal6"
+        },
+        {
+            "include": "#keyword7"
+        },
+        {
+            "include": "#quoted-identifier8"
+        },
+        {
+            "include": "#bind-parameter-identifier9"
+        },
+        {
+            "include": "#identifier10"
+        },
+        {
+            "include": "#string-literal11"
+        }
+    ],
+    "repository": {
+        "bind-parameter-identifier9": {
+            "patterns": [
+                {
+                    "match": "(\\$([a-zA-Z_])([a-zA-Z_0-9])*)",
+                    "name": "variable.parameter"
+                }
+            ]
+        },
+        "comment0": {
+            "patterns": [
+                {
+                    "match": "(((\\/\\*(.|\\n)*?\\*\\/)|(\\-\\-[^\\n\\r]*(\\r\\n?|\\n|$))))",
+                    "name": "comment.block"
+                },
+                {
+                    "begin": "\\/\\*",
+                    "end": "\\*\\/",
+                    "name": "comment.block"
+                }
+            ]
+        },
+        "function-identifier3": {
+            "patterns": [
+                {
+                    "match": "\\b(([a-zA-Z_])([a-zA-Z_0-9])*\\:\\:([a-zA-Z_])([a-zA-Z_0-9])*)\\b",
+                    "name": "entity.name.function"
+                }
+            ]
+        },
+        "function-identifier5": {
+            "patterns": [
+                {
+                    "match": "\\b(([a-zA-Z_])([a-zA-Z_0-9])*)(?=\\()\\b",
+                    "name": "entity.name.function"
+                }
+            ]
+        },
+        "identifier10": {
+            "patterns": [
+                {
+                    "match": "\\b(([a-zA-Z_])([a-zA-Z_0-9])*)\\b",
+                    "name": "variable.other"
+                }
+            ]
+        },
+        "keyword7": {
+            "patterns": [
+                {
+                    "match": "(?i)\\b(replication_factor|force_infer_schema|replicationfactor|compression_codec|CURRENT_TIMESTAMP|forceinferschema|compressioncodec|MATCH_RECOGNIZE|primary_medium|monotonic_keys|ignore_type_v3|security_tags|primarymedium|monotonickeys|erasure_codec|column_groups|UNCONDITIONAL|DYNAMICLINEAR|AUTOINCREMENT|securitytags|infer_scheme|infer_schema|ignoretypev3|erasurecodec|columngroups|MILLISECONDS|MICROSECONDS|EMPTY_ACTION|CURRENT_TIME|CURRENT_DATE|inferscheme|inferschema|TRANSACTION|TABLESAMPLE|REPLICATION|NANOSECONDS|JSON_EXISTS|INCREMENTAL|CONDITIONAL|COMPRESSION|user_attrs|non_unique|expiration|TABLESTORE|REPEATABLE|REFERENCES|PRIVILEGES|JSON_VALUE|JSON_QUERY|DEFERRABLE|CONSTRAINT|COLLECTION|CLASSIFIER|CHANGEFEED|ATTRIBUTES|ASYMMETRIC|userattrs|unordered|nonUnique|keep_meta|WATERMARK|UNMATCHED|UNBOUNDED|TEMPORARY|SYMMETRIC|STREAMING|SAVEPOINT|RETURNING|PRECEDING|PARTITION|INTERSECT|INITIALLY|INCREMENT|IMMEDIATE|FOLLOWING|EXCLUSIVE|EXCLUSION|ENCRYPTED|DIRECTORY|BERNOULLI|truncate|keepmeta|TRANSFER|SUBQUERY|SEQUENCE|ROLLBACK|RESTRICT|RESOURCE|PASSWORD|PARALLEL|OPTIONAL|MEASURES|INHERITS|GROUPING|FUNCTION|EXTERNAL|EVALUATE|DISTINCT|DESCRIBE|DEFERRED|DATABASE|CONSUMER|CONFLICT|CALLABLE|WRAPPER|WITHOUT|VIRTUAL|VARIANT|UNKNOWN|TRIGGER|SYMBOLS|SECONDS|RESTORE|RESTART|RESPECT|REPLACE|RELEASE|REINDEX|PROCESS|PRIMARY|PRESORT|PERMUTE|PATTERN|PASSING|NOTNULL|NOLOGIN|NATURAL|MATCHES|INSTEAD|INITIAL|INDEXED|FOREIGN|FLATTEN|EXPLAIN|EXCLUDE|DISCARD|DISABLE|DEFAULT|DECLARE|DECIMAL|CURRENT|CONNECT|COMPACT|COLUMNS|COLLATE|CASCADE|BITCAST|BETWEEN|AUTOMAP|ANALYZE|inline|WINDOW|VALUES|VACUUM|UPSERT|UPDATE|UNIQUE|TAGGED|TABLES|SYSTEM|SUBSET|STRUCT|STREAM|SOURCE|SELECT|SECRET|SCHEMA|SAMPLE|ROLLUP|REVOKE|REVERT|RETURN|RESULT|RENAME|REMOVE|REGEXP|REDUCE|PRAGMA|OTHERS|OPTION|OFFSET|OBJECT|MODIFY|MANAGE|LINEAR|LEGACY|ISNULL|INSERT|IMPORT|IGNORE|HAVING|GROUPS|GLOBAL|FILTER|FAMILY|EXPORT|EXISTS|EXCEPT|ESCAPE|DETACH|DELETE|DEFINE|CREATE|COMMIT|COLUMN|BEFORE|BACKUP|ATTACH|ASSUME|ACTION|xlock|media|WHERE|USING|UNION|TUPLE|TOPIC|TABLE|START|RLIKE|RIGHT|RESET|RANGE|RAISE|QUEUE|QUERY|OWNER|OUTER|ORDER|NULLS|MATCH|LOGIN|LOCAL|LIMIT|INNER|INDEX|ILIKE|GROUP|GRANT|FIRST|FALSE|ERROR|ERASE|EMPTY|CROSS|COVER|CHECK|BEGIN|BATCH|ASYNC|ARRAY|ALTER|AFTER|ABORT|WITH|WHEN|VIEW|USER|TYPE|TRUE|TIES|THEN|TEMP|SYNC|SKIP|SHOW|SETS|SEMI|SEEK|ROWS|POOL|PLAN|PAST|OVER|ONLY|OMIT|NULL|NEXT|LIST|LIKE|LEFT|LAST|JOIN|INTO|HASH|GLOB|FULL|FROM|FLOW|FAIL|ENUM|ELSE|EACH|DROP|DICT|DESC|DATA|CUBE|CAST|CASE|ANSI|XOR|USE|SET|ROW|PER|ONE|NOT|KEY|HOP|FOR|END|ASC|ANY|AND|ALL|ADD|TO|OR|ON|OF|NO|IS|IN|IF|DO|BY|AT|AS)\\b",
+                    "name": "keyword.control"
+                }
+            ]
+        },
+        "literal6": {
+            "patterns": [
+                {
+                    "match": "\\b((([0-9]+)\\.[0-9]*([eE](\\+|\\-)?([0-9]+))?|([0-9]+)([eE](\\+|\\-)?([0-9]+)))([fF]|[pP]([fF](4|8)|[nN])?)?)\\b",
+                    "name": "constant.numeric"
+                },
+                {
+                    "match": "\\b(((0[xX]([0-9a-fA-F])+)|(0[oO][0-8]+)|(0[bB](0|1)+)|([0-9]+))(([pPuU])?([lLsStTiIbBnN])?))\\b",
+                    "name": "constant.numeric"
+                },
+                {
+                    "match": "\\b((0[xX]([0-9a-fA-F])+)|(0[oO][0-8]+)|(0[bB](0|1)+)|([0-9]+))\\b",
+                    "name": "constant.numeric"
+                },
+                {
+                    "match": "(?i)\\b(TRUE)\\b",
+                    "name": "constant.numeric"
+                },
+                {
+                    "match": "(?i)\\b(FALSE)\\b",
+                    "name": "constant.numeric"
+                }
+            ]
+        },
+        "option-identifier2": {
+            "patterns": [
+                {
+                    "match": "(?i)\\b(?<=PRAGMA( |\\r|\\t|\\f|\\n))(([a-zA-Z_])([a-zA-Z_0-9])*(\\.([a-zA-Z_])([a-zA-Z_0-9])*)?)\\b",
+                    "name": "identifier"
+                }
+            ]
+        },
+        "quoted-identifier8": {
+            "patterns": [
+                {
+                    "match": "(\\`(\\\\(.|\\n)|\\`\\`|[^`\\\\])*\\`)",
+                    "name": "string.interpolated"
+                },
+                {
+                    "match": "(\\@([a-zA-Z_])([a-zA-Z_0-9])*)",
+                    "name": "string.interpolated"
+                }
+            ]
+        },
+        "string-literal11": {
+            "patterns": [
+                {
+                    "match": "(((((\\'([^'\\\\]|(\\\\(.|\\n)))*\\'))|((\\\"([^\"\\\\]|(\\\\(.|\\n)))*\\\"))|((\\@\\@(.|\\n)*?\\@\\@)+\\@?))([sSuUyYjJ]|[pP]([tTbBvV])?)?))",
+                    "name": "string.quoted.double"
+                },
+                {
+                    "begin": "\\'",
+                    "end": "\\'",
+                    "name": "string.quoted.double",
+                    "patterns": [
+                        {
+                            "match": "\\\\.",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                },
+                {
+                    "begin": "\\\"",
+                    "end": "\\\"",
+                    "name": "string.quoted.double",
+                    "patterns": [
+                        {
+                            "match": "\\\\.",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                },
+                {
+                    "begin": "\\@\\@\\#py",
+                    "end": "\\@\\@",
+                    "patterns": [
+                        {
+                            "include": "source.python"
+                        },
+                        {
+                            "match": "\\@\\@\\@\\@",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                },
+                {
+                    "begin": "\\@\\@\\/\\/js",
+                    "end": "\\@\\@",
+                    "patterns": [
+                        {
+                            "include": "source.js"
+                        },
+                        {
+                            "match": "\\@\\@\\@\\@",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                },
+                {
+                    "begin": "\\@\\@",
+                    "end": "\\@\\@",
+                    "name": "string.quoted.double",
+                    "patterns": [
+                        {
+                            "match": "\\@\\@\\@\\@",
+                            "name": "constant.character.escape.untitled"
+                        }
+                    ]
+                }
+            ]
+        },
+        "type-identifier4": {
+            "patterns": [
+                {
+                    "match": "\\b(([a-zA-Z_])([a-zA-Z_0-9])*)(?=\\<)\\b",
+                    "name": "entity.name.type"
+                },
+                {
+                    "match": "(?i)\\b(DECIMAL)\\b",
+                    "name": "entity.name.type"
+                },
+                {
+                    "match": "(?i)\\b(pgpg_brin_minmax_multi_summary|pganycompatiblemultirange|pgpg_brin_bloom_summary|pganycompatiblenonarray|pganycompatiblerange|pganycompatiblearray|pgtable_am_handler|pglanguage_handler|pgindex_am_handler|pgpg_dependencies|_pgtstzmultirange|_pgint8multirange|_pgint4multirange|_pgdatemultirange|pgtstzmultirange|pgpg_ddl_command|pgint8multirange|pgint4multirange|pgdatemultirange|_pgtxid_snapshot|_pgregdictionary|_pgnummultirange|pgtxid_snapshot|pgregdictionary|pgnummultirange|pgevent_trigger|pganymultirange|pganycompatible|_pgtsmultirange|_pgregprocedure|_pgregnamespace|_pgregcollation|_pgpg_attribute|pgtsmultirange|pgregprocedure|pgregnamespace|pgregcollation|pgpg_node_tree|pgpg_ndistinct|pgpg_attribute|_pgtimestamptz|_pgregoperator|_pgpg_snapshot|pgtsm_handler|pgtimestamptz|pgregoperator|pgpg_snapshot|pgpg_mcv_list|pgfdw_handler|pganynonarray|_pgint2vector|TzTimestamp64|pgint2vector|pganyelement|_pgtstzrange|_pgtimestamp|_pgregconfig|_pgrefcursor|_pgoidvector|_pgint8range|_pgint4range|_pggtsvector|_pgdaterange|TzDatetime64|JsonDocument|pgtstzrange|pgtimestamp|pgregconfig|pgrefcursor|pgoidvector|pgint8range|pgint4range|pggtsvector|pgdaterange|_pgtsvector|_pgregclass|_pgpg_class|_pgnumrange|_pgmacaddr8|_pgjsonpath|_pginterval|TzTimestamp|Timestamp64|pgtsvector|pgregclass|pgpg_class|pgnumrange|pgmacaddr8|pgjsonpath|pginterval|pginternal|pganyrange|pganyarray|_pgvarchar|_pgtsrange|_pgtsquery|_pgregtype|_pgregrole|_pgregproc|_pgregoper|_pgpolygon|_pgpg_type|_pgpg_proc|_pgnumeric|_pgmacaddr|_pgcstring|_pgaclitem|TzDatetime|Interval64|Datetime64|pgvarchar|pgunknown|pgtsrange|pgtsquery|pgtrigger|pgregtype|pgregrole|pgregproc|pgregoper|pgpolygon|pgpg_type|pgpg_proc|pgnumeric|pgmacaddr|pgcstring|pganyenum|pgaclitem|_pgvarbit|_pgtimetz|_pgrecord|_pgpg_lsn|_pgfloat8|_pgfloat4|_pgcircle|_pgbpchar|Timestamp|EmptyList|EmptyDict|pgvarbit|pgtimetz|pgrecord|pgpg_lsn|pgfloat8|pgfloat4|pgcircle|pgbpchar|_pgpoint|_pgmoney|_pgjsonb|_pgbytea|TzDate32|Interval|DyNumber|Datetime|pgpoint|pgmoney|pgjsonb|pgbytea|_pgxid8|_pguuid|_pgtime|_pgtext|_pgpath|_pgname|_pglseg|_pgline|_pgjson|_pgint8|_pgint4|_pgint2|_pginet|_pgdate|_pgcidr|_pgchar|_pgbool|Generic|pgxid8|pgvoid|pguuid|pgtime|pgtext|pgpath|pgname|pglseg|pgline|pgjson|pgint8|pgint4|pgint2|pginet|pgdate|pgcidr|pgchar|pgbool|_pgxml|_pgxid|_pgtid|_pgoid|_pgcid|_pgbox|_pgbit|Uint64|Uint32|Uint16|TzDate|String|Double|Date32|pgxml|pgxid|pgtid|pgoid|pgcid|pgbox|pgbit|pgany|Uint8|Int64|Int32|Int16|Float|Yson|Void|Uuid|Utf8|Unit|Json|Int8|Date|Bool)\\b",
+                    "name": "entity.name.type"
+                }
+            ]
+        }
+    },
+    "scope": "source.yql",
+    "scopeName": "source.yql"
+}

package/build/{yql_unstable → yql}/YQL.monarch.json

@@ -6,13 +6,13 @@
                 "include": "@beforable"
             },
             ["(((\\\/\\*(.|\\n)*?\\*\\\/)|(\\-\\-[^\\n\\r]*(\\r\\n?|\\n|$))))", "comment"],
+            ["\\b(([a-zA-Z_])([a-zA-Z_0-9])*\\:\\:([a-zA-Z_])([a-zA-Z_0-9])*)\\b", "support.function"],
             ["\\b(([a-zA-Z_])([a-zA-Z_0-9])*)(?=\\\u003C)\\b", "keyword.type"],
             ["\\b(DECIMAL)\\b", "keyword.type"],
             [
                 "\\b(pgpg_brin_minmax_multi_summary|pganycompatiblemultirange|pgpg_brin_bloom_summary|pganycompatiblenonarray|pganycompatiblerange|pganycompatiblearray|pgtable_am_handler|pglanguage_handler|pgindex_am_handler|pgpg_dependencies|_pgtstzmultirange|_pgint8multirange|_pgint4multirange|_pgdatemultirange|pgtstzmultirange|pgpg_ddl_command|pgint8multirange|pgint4multirange|pgdatemultirange|_pgtxid_snapshot|_pgregdictionary|_pgnummultirange|pgtxid_snapshot|pgregdictionary|pgnummultirange|pgevent_trigger|pganymultirange|pganycompatible|_pgtsmultirange|_pgregprocedure|_pgregnamespace|_pgregcollation|_pgpg_attribute|pgtsmultirange|pgregprocedure|pgregnamespace|pgregcollation|pgpg_node_tree|pgpg_ndistinct|pgpg_attribute|_pgtimestamptz|_pgregoperator|_pgpg_snapshot|pgtsm_handler|pgtimestamptz|pgregoperator|pgpg_snapshot|pgpg_mcv_list|pgfdw_handler|pganynonarray|_pgint2vector|TzTimestamp64|pgint2vector|pganyelement|_pgtstzrange|_pgtimestamp|_pgregconfig|_pgrefcursor|_pgoidvector|_pgint8range|_pgint4range|_pggtsvector|_pgdaterange|TzDatetime64|JsonDocument|pgtstzrange|pgtimestamp|pgregconfig|pgrefcursor|pgoidvector|pgint8range|pgint4range|pggtsvector|pgdaterange|_pgtsvector|_pgregclass|_pgpg_class|_pgnumrange|_pgmacaddr8|_pgjsonpath|_pginterval|TzTimestamp|Timestamp64|pgtsvector|pgregclass|pgpg_class|pgnumrange|pgmacaddr8|pgjsonpath|pginterval|pginternal|pganyrange|pganyarray|_pgvarchar|_pgtsrange|_pgtsquery|_pgregtype|_pgregrole|_pgregproc|_pgregoper|_pgpolygon|_pgpg_type|_pgpg_proc|_pgnumeric|_pgmacaddr|_pgcstring|_pgaclitem|TzDatetime|Interval64|Datetime64|pgvarchar|pgunknown|pgtsrange|pgtsquery|pgtrigger|pgregtype|pgregrole|pgregproc|pgregoper|pgpolygon|pgpg_type|pgpg_proc|pgnumeric|pgmacaddr|pgcstring|pganyenum|pgaclitem|_pgvarbit|_pgtimetz|_pgrecord|_pgpg_lsn|_pgfloat8|_pgfloat4|_pgcircle|_pgbpchar|Timestamp|EmptyList|EmptyDict|pgvarbit|pgtimetz|pgrecord|pgpg_lsn|pgfloat8|pgfloat4|pgcircle|pgbpchar|_pgpoint|_pgmoney|_pgjsonb|_pgbytea|TzDate32|Interval|DyNumber|Datetime|pgpoint|pgmoney|pgjsonb|pgbytea|_pgxid8|_pguuid|_pgtime|_pgtext|_pgpath|_pgname|_pglseg|_pgline|_pgjson|_pgint8|_pgint4|_pgint2|_pginet|_pgdate|_pgcidr|_pgchar|_pgbool|Generic|pgxid8|pgvoid|pguuid|pgtime|pgtext|pgpath|pgname|pglseg|pgline|pgjson|pgint8|pgint4|pgint2|pginet|pgdate|pgcidr|pgchar|pgbool|_pgxml|_pgxid|_pgtid|_pgoid|_pgcid|_pgbox|_pgbit|Uint64|Uint32|Uint16|TzDate|String|Double|Date32|pgxml|pgxid|pgtid|pgoid|pgcid|pgbox|pgbit|pgany|Uint8|Int64|Int32|Int16|Float|Yson|Void|Uuid|Utf8|Unit|Json|Int8|Date|Bool)\\b",
                 "keyword.type"
             ],
-            ["\\b(([a-zA-Z_])([a-zA-Z_0-9])*\\:\\:([a-zA-Z_])([a-zA-Z_0-9])*)\\b", "support.function"],
             ["\\b(([a-zA-Z_])([a-zA-Z_0-9])*)(?=\\()\\b", "support.function"],
             [
                 "\\b((([0-9]+)\\.[0-9]*([eE](\\+|\\-)?([0-9]+))?|([0-9]+)([eE](\\+|\\-)?([0-9]+)))([fF]|[pP]([fF](4|8)|[nN])?)?)\\b",
@@ -26,7 +26,7 @@
             ["\\b(TRUE)\\b", "number"],
             ["\\b(FALSE)\\b", "number"],
             [
-                "\\b(replication_factor|force_infer_schema|replicationfactor|compression_codec|CURRENT_TIMESTAMP|forceinferschema|compressioncodec|MATCH_RECOGNIZE|primary_medium|monotonic_keys|ignore_type_v3|security_tags|primarymedium|monotonickeys|erasure_codec|column_groups|UNCONDITIONAL|DYNAMICLINEAR|AUTOINCREMENT|securitytags|infer_scheme|infer_schema|ignoretypev3|erasurecodec|columngroups|MILLISECONDS|MICROSECONDS|EMPTY_ACTION|CURRENT_TIME|CURRENT_DATE|inferscheme|inferschema|TRANSACTION|TABLESAMPLE|REPLICATION|NANOSECONDS|JSON_EXISTS|INCREMENTAL|CONDITIONAL|user_attrs|non_unique|expiration|TABLESTORE|REPEATABLE|REFERENCES|PRIVILEGES|JSON_VALUE|JSON_QUERY|DEFERRABLE|CONSTRAINT|COLLECTION|CLASSIFIER|CHANGEFEED|ATTRIBUTES|ASYMMETRIC|userattrs|unordered|nonUnique|keep_meta|WATERMARK|UNMATCHED|UNBOUNDED|TEMPORARY|SYMMETRIC|STREAMING|SAVEPOINT|RETURNING|PRECEDING|PARTITION|INTERSECT|INITIALLY|INCREMENT|IMMEDIATE|FOLLOWING|EXCLUSIVE|EXCLUSION|ENCRYPTED|DIRECTORY|BERNOULLI|truncate|keepmeta|TRANSFER|SUBQUERY|SEQUENCE|ROLLBACK|RESTRICT|RESOURCE|PASSWORD|PARALLEL|OPTIONAL|MEASURES|INHERITS|GROUPING|FUNCTION|EXTERNAL|EVALUATE|DISTINCT|DESCRIBE|DEFERRED|DATABASE|CONSUMER|CONFLICT|CALLABLE|WRAPPER|WITHOUT|VIRTUAL|VARIANT|UNKNOWN|TRIGGER|SYMBOLS|SECONDS|RESTORE|RESTART|RESPECT|REPLACE|RELEASE|REINDEX|PROCESS|PRIMARY|PRESORT|PERMUTE|PATTERN|PASSING|NOTNULL|NOLOGIN|NATURAL|MATCHES|INSTEAD|INITIAL|INDEXED|FOREIGN|FLATTEN|EXPLAIN|EXCLUDE|DISCARD|DISABLE|DEFAULT|DECLARE|DECIMAL|CURRENT|CONNECT|COMPACT|COLUMNS|COLLATE|CASCADE|BITCAST|BETWEEN|AUTOMAP|ANALYZE|inline|WINDOW|VALUES|VACUUM|UPSERT|UPDATE|UNIQUE|TAGGED|TABLES|SYSTEM|SUBSET|STRUCT|STREAM|SOURCE|SELECT|SECRET|SCHEMA|SAMPLE|ROLLUP|REVOKE|REVERT|RETURN|RESULT|RENAME|REMOVE|REGEXP|REDUCE|PRAGMA|OTHERS|OPTION|OFFSET|OBJECT|MODIFY|MANAGE|LINEAR|LEGACY|ISNULL|INSERT|IMPORT|IGNORE|HAVING|GROUPS|GLOBAL|FILTER|FAMILY|EXPORT|EXISTS|EXCEPT|ESCAPE|DETACH|DELETE|DEFINE|CREATE|COMMIT|COLUMN|BEFORE|BACKUP|ATTACH|ASSUME|ACTION|xlock|media|WHERE|USING|UNION|TUPLE|TOPIC|TABLE|START|RLIKE|RIGHT|RESET|RANGE|RAISE|QUEUE|QUERY|OWNER|OUTER|ORDER|NULLS|MATCH|LOGIN|LOCAL|LIMIT|INNER|INDEX|ILIKE|GROUP|GRANT|FIRST|FALSE|ERROR|ERASE|EMPTY|CROSS|COVER|CHECK|BEGIN|BATCH|ASYNC|ARRAY|ALTER|AFTER|ABORT|WITH|WHEN|VIEW|USER|TYPE|TRUE|TIES|THEN|TEMP|SYNC|SKIP|SHOW|SETS|SEMI|SEEK|ROWS|POOL|PLAN|PAST|OVER|ONLY|OMIT|NULL|NEXT|LIST|LIKE|LEFT|LAST|JOIN|INTO|HASH|GLOB|FULL|FROM|FLOW|FAIL|ENUM|ELSE|EACH|DROP|DICT|DESC|DATA|CUBE|CAST|CASE|ANSI|XOR|USE|SET|ROW|PER|ONE|NOT|KEY|HOP|FOR|END|ASC|ANY|AND|ALL|ADD|TO|OR|ON|OF|NO|IS|IN|IF|DO|BY|AT|AS)\\b",
+                "\\b(replication_factor|force_infer_schema|replicationfactor|compression_codec|CURRENT_TIMESTAMP|forceinferschema|compressioncodec|MATCH_RECOGNIZE|primary_medium|monotonic_keys|ignore_type_v3|security_tags|primarymedium|monotonickeys|erasure_codec|column_groups|UNCONDITIONAL|DYNAMICLINEAR|AUTOINCREMENT|securitytags|infer_scheme|infer_schema|ignoretypev3|erasurecodec|columngroups|MILLISECONDS|MICROSECONDS|EMPTY_ACTION|CURRENT_TIME|CURRENT_DATE|inferscheme|inferschema|TRANSACTION|TABLESAMPLE|REPLICATION|NANOSECONDS|JSON_EXISTS|INCREMENTAL|CONDITIONAL|COMPRESSION|user_attrs|non_unique|expiration|TABLESTORE|REPEATABLE|REFERENCES|PRIVILEGES|JSON_VALUE|JSON_QUERY|DEFERRABLE|CONSTRAINT|COLLECTION|CLASSIFIER|CHANGEFEED|ATTRIBUTES|ASYMMETRIC|userattrs|unordered|nonUnique|keep_meta|WATERMARK|UNMATCHED|UNBOUNDED|TEMPORARY|SYMMETRIC|STREAMING|SAVEPOINT|RETURNING|PRECEDING|PARTITION|INTERSECT|INITIALLY|INCREMENT|IMMEDIATE|FOLLOWING|EXCLUSIVE|EXCLUSION|ENCRYPTED|DIRECTORY|BERNOULLI|truncate|keepmeta|TRANSFER|SUBQUERY|SEQUENCE|ROLLBACK|RESTRICT|RESOURCE|PASSWORD|PARALLEL|OPTIONAL|MEASURES|INHERITS|GROUPING|FUNCTION|EXTERNAL|EVALUATE|DISTINCT|DESCRIBE|DEFERRED|DATABASE|CONSUMER|CONFLICT|CALLABLE|WRAPPER|WITHOUT|VIRTUAL|VARIANT|UNKNOWN|TRIGGER|SYMBOLS|SECONDS|RESTORE|RESTART|RESPECT|REPLACE|RELEASE|REINDEX|PROCESS|PRIMARY|PRESORT|PERMUTE|PATTERN|PASSING|NOTNULL|NOLOGIN|NATURAL|MATCHES|INSTEAD|INITIAL|INDEXED|FOREIGN|FLATTEN|EXPLAIN|EXCLUDE|DISCARD|DISABLE|DEFAULT|DECLARE|DECIMAL|CURRENT|CONNECT|COMPACT|COLUMNS|COLLATE|CASCADE|BITCAST|BETWEEN|AUTOMAP|ANALYZE|inline|WINDOW|VALUES|VACUUM|UPSERT|UPDATE|UNIQUE|TAGGED|TABLES|SYSTEM|SUBSET|STRUCT|STREAM|SOURCE|SELECT|SECRET|SCHEMA|SAMPLE|ROLLUP|REVOKE|REVERT|RETURN|RESULT|RENAME|REMOVE|REGEXP|REDUCE|PRAGMA|OTHERS|OPTION|OFFSET|OBJECT|MODIFY|MANAGE|LINEAR|LEGACY|ISNULL|INSERT|IMPORT|IGNORE|HAVING|GROUPS|GLOBAL|FILTER|FAMILY|EXPORT|EXISTS|EXCEPT|ESCAPE|DETACH|DELETE|DEFINE|CREATE|COMMIT|COLUMN|BEFORE|BACKUP|ATTACH|ASSUME|ACTION|xlock|media|WHERE|USING|UNION|TUPLE|TOPIC|TABLE|START|RLIKE|RIGHT|RESET|RANGE|RAISE|QUEUE|QUERY|OWNER|OUTER|ORDER|NULLS|MATCH|LOGIN|LOCAL|LIMIT|INNER|INDEX|ILIKE|GROUP|GRANT|FIRST|FALSE|ERROR|ERASE|EMPTY|CROSS|COVER|CHECK|BEGIN|BATCH|ASYNC|ARRAY|ALTER|AFTER|ABORT|WITH|WHEN|VIEW|USER|TYPE|TRUE|TIES|THEN|TEMP|SYNC|SKIP|SHOW|SETS|SEMI|SEEK|ROWS|POOL|PLAN|PAST|OVER|ONLY|OMIT|NULL|NEXT|LIST|LIKE|LEFT|LAST|JOIN|INTO|HASH|GLOB|FULL|FROM|FLOW|FAIL|ENUM|ELSE|EACH|DROP|DICT|DESC|DATA|CUBE|CAST|CASE|ANSI|XOR|USE|SET|ROW|PER|ONE|NOT|KEY|HOP|FOR|END|ASC|ANY|AND|ALL|ADD|TO|OR|ON|OF|NO|IS|IN|IF|DO|BY|AT|AS)\\b",
                 "keyword"
             ],
             ["(\\`(\\\\(.|\\n)|\\`\\`|[^`\\\\])*\\`)", "string.tablepath"],
@@ -56,7 +56,7 @@
         ],
         "stringLiteral\u0027": [
             [
-                "#py",
+                "\\#py",
                 {
                     "nextEmbedded": "python",
                     "goBack": 3,
@@ -73,15 +73,6 @@
                     "token": "string.js"
                 }
             ],
-            [
-                "{",
-                {
-                    "nextEmbedded": "javascript",
-                    "goBack": 1,
-                    "next": "@embedded",
-                    "token": "string.js"
-                }
-            ],
             ["\\\\.", "string.escape"],
             ["[^\\\u0027]", "string"],
             ["\\\u0027", "string", "@pop"],
@@ -89,7 +80,7 @@
         ],
         "stringLiteral\"": [
             [
-                "#py",
+                "\\#py",
                 {
                     "nextEmbedded": "python",
                     "goBack": 3,
@@ -106,15 +97,6 @@
                     "token": "string.js"
                 }
             ],
-            [
-                "{",
-                {
-                    "nextEmbedded": "javascript",
-                    "goBack": 1,
-                    "next": "@embedded",
-                    "token": "string.js"
-                }
-            ],
             ["\\\\.", "string.escape"],
             ["[^\\\"]", "string"],
             ["\\\"", "string", "@pop"],
@@ -122,7 +104,7 @@
         ],
         "stringLiteral@@": [
             [
-                "#py",
+                "\\#py",
                 {
                     "nextEmbedded": "python",
                     "goBack": 3,
@@ -139,15 +121,6 @@
                     "token": "string.js"
                 }
             ],
-            [
-                "{",
-                {
-                    "nextEmbedded": "javascript",
-                    "goBack": 1,
-                    "next": "@embedded",
-                    "token": "string.js"
-                }
-            ],
             ["\\@\\@\\@\\@", "string.escape"],
             ["[^\\@\\@]", "string"],
             ["\\@\\@", "string", "@pop"],