From dd9f0e811b0e63b63ba5d0c214cfd89b1f3be92c Mon Sep 17 00:00:00 2001
From: alexet <alexet@semmle.com>
Date: Wed, 4 Mar 2020 15:04:20 +0000
Subject: [PATCH 1/2] Add compiled grammar to top level for use in linguist

---
 syntaxes/README.md          |    3 +
 syntaxes/ql.tmLanguage.json | 1416 +++++++++++++++++++++++++++++++++++
 syntaxes/updateSyntax       |    4 +
 3 files changed, 1423 insertions(+)
 create mode 100644 syntaxes/README.md
 create mode 100644 syntaxes/ql.tmLanguage.json
 create mode 100755 syntaxes/updateSyntax

diff --git a/syntaxes/README.md b/syntaxes/README.md
new file mode 100644
index 000000000..49ffc3676
--- /dev/null
+++ b/syntaxes/README.md
@@ -0,0 +1,3 @@
+This folder contains a compiled version of the textmate grammar for use with systems that need a compiled verison of the grammar in the repository such as linguist. It also contains a patvh for the grammar to make it work with linguist.
+
+To update the grammar, first build the extension, then run "./updateSyntax".
\ No newline at end of file
diff --git a/syntaxes/ql.tmLanguage.json b/syntaxes/ql.tmLanguage.json
new file mode 100644
index 000000000..fc6d1b4b0
--- /dev/null
+++ b/syntaxes/ql.tmLanguage.json
@@ -0,0 +1,1416 @@
+{
+  "name": "QL",
+  "scopeName": "source.ql",
+  "fileTypes": [
+    "ql",
+    "qll"
+  ],
+  "uuid": "7F6926BF-1C6C-468A-A7AA-215EBAC86A4E",
+  "patterns": [
+    {
+      "include": "#module-member"
+    }
+  ],
+  "repository": {
+    "id-character": {
+      "match": "(?x)[0-9A-Za-z_]"
+    },
+    "end-of-id": {
+      "match": "(?x)(?!(?:[0-9A-Za-z_]))"
+    },
+    "simple-id": {
+      "match": "(?x)\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))"
+    },
+    "lower-id": {
+      "match": "(?x)\\b [a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))"
+    },
+    "upper-id": {
+      "match": "(?x)\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))"
+    },
+    "at-lower-id": {
+      "match": "(?x)@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))"
+    },
+    "comment-start": {
+      "match": "(?x)// | /\\*"
+    },
+    "non-context-sensitive": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#literal"
+        },
+        {
+          "include": "#operator-or-punctuation"
+        },
+        {
+          "include": "#keyword"
+        }
+      ]
+    },
+    "relational-operator": {
+      "match": "(?x)<=|<|>=|>",
+      "name": "keyword.operator.relational.ql"
+    },
+    "comparison-operator": {
+      "match": "(?x)=|\\!-",
+      "name": "keyword.operator.comparison.ql"
+    },
+    "arithmetic-operator": {
+      "match": "(?x)\\+|-|\\*|/|%",
+      "name": "keyword.operator.arithmetic.ql"
+    },
+    "comma": {
+      "match": "(?x),",
+      "name": "punctuation.separator.comma.ql"
+    },
+    "semicolon": {
+      "match": "(?x);",
+      "name": "punctuation.separator.statement.ql"
+    },
+    "dot": {
+      "match": "(?x)\\.",
+      "name": "punctuation.accessor.ql"
+    },
+    "dotdot": {
+      "match": "(?x)\\.\\.",
+      "name": "punctuation.operator.range.ql"
+    },
+    "pipe": {
+      "match": "(?x)\\|",
+      "name": "punctuation.separator.pipe.ql"
+    },
+    "open-paren": {
+      "match": "(?x)\\(",
+      "name": "punctuation.parenthesis.open.ql"
+    },
+    "close-paren": {
+      "match": "(?x)\\)",
+      "name": "punctuation.parenthesis.close.ql"
+    },
+    "open-brace": {
+      "match": "(?x)\\{",
+      "name": "punctuation.curlybrace.open.ql"
+    },
+    "close-brace": {
+      "match": "(?x)\\}",
+      "name": "punctuation.curlybrace.close.ql"
+    },
+    "open-bracket": {
+      "match": "(?x)\\[",
+      "name": "punctuation.squarebracket.open.ql"
+    },
+    "close-bracket": {
+      "match": "(?x)\\]",
+      "name": "punctuation.squarebracket.close.ql"
+    },
+    "operator-or-punctuation": {
+      "patterns": [
+        {
+          "include": "#relational-operator"
+        },
+        {
+          "include": "#comparison-operator"
+        },
+        {
+          "include": "#arithmetic-operator"
+        },
+        {
+          "include": "#comma"
+        },
+        {
+          "include": "#semicolon"
+        },
+        {
+          "include": "#dot"
+        },
+        {
+          "include": "#dotdot"
+        },
+        {
+          "include": "#pipe"
+        },
+        {
+          "include": "#open-paren"
+        },
+        {
+          "include": "#close-paren"
+        },
+        {
+          "include": "#open-brace"
+        },
+        {
+          "include": "#close-brace"
+        },
+        {
+          "include": "#open-bracket"
+        },
+        {
+          "include": "#close-bracket"
+        }
+      ]
+    },
+    "dont-care": {
+      "match": "(?x)\\b(?:_)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "variable.language.dont-care.ql"
+    },
+    "and": {
+      "match": "(?x)\\b(?:and)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.and.ql"
+    },
+    "any": {
+      "match": "(?x)\\b(?:any)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.quantifier.any.ql"
+    },
+    "as": {
+      "match": "(?x)\\b(?:as)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.as.ql"
+    },
+    "asc": {
+      "match": "(?x)\\b(?:asc)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.order.asc.ql"
+    },
+    "avg": {
+      "match": "(?x)\\b(?:avg)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.avg.ql"
+    },
+    "boolean": {
+      "match": "(?x)\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.type.boolean.ql"
+    },
+    "by": {
+      "match": "(?x)\\b(?:by)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.order.by.ql"
+    },
+    "class": {
+      "match": "(?x)\\b(?:class)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.class.ql"
+    },
+    "concat": {
+      "match": "(?x)\\b(?:concat)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.concat.ql"
+    },
+    "count": {
+      "match": "(?x)\\b(?:count)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.count.ql"
+    },
+    "date": {
+      "match": "(?x)\\b(?:date)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.type.date.ql"
+    },
+    "desc": {
+      "match": "(?x)\\b(?:desc)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.order.desc.ql"
+    },
+    "else": {
+      "match": "(?x)\\b(?:else)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.else.ql"
+    },
+    "exists": {
+      "match": "(?x)\\b(?:exists)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.quantifier.exists.ql"
+    },
+    "extends": {
+      "match": "(?x)\\b(?:extends)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.extends.ql"
+    },
+    "false": {
+      "match": "(?x)\\b(?:false)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "constant.language.boolean.false.ql"
+    },
+    "float": {
+      "match": "(?x)\\b(?:float)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.type.float.ql"
+    },
+    "forall": {
+      "match": "(?x)\\b(?:forall)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.quantifier.forall.ql"
+    },
+    "forex": {
+      "match": "(?x)\\b(?:forex)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.quantifier.forex.ql"
+    },
+    "from": {
+      "match": "(?x)\\b(?:from)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.from.ql"
+    },
+    "if": {
+      "match": "(?x)\\b(?:if)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.if.ql"
+    },
+    "implies": {
+      "match": "(?x)\\b(?:implies)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.implies.ql"
+    },
+    "import": {
+      "match": "(?x)\\b(?:import)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.import.ql"
+    },
+    "in": {
+      "match": "(?x)\\b(?:in)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.in.ql"
+    },
+    "instanceof": {
+      "match": "(?x)\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.instanceof.ql"
+    },
+    "int": {
+      "match": "(?x)\\b(?:int)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.type.int.ql"
+    },
+    "max": {
+      "match": "(?x)\\b(?:max)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.max.ql"
+    },
+    "min": {
+      "match": "(?x)\\b(?:min)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.min.ql"
+    },
+    "module": {
+      "match": "(?x)\\b(?:module)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.module.ql"
+    },
+    "newtype": {
+      "match": "(?x)\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.newtype.ql"
+    },
+    "none": {
+      "match": "(?x)\\b(?:none)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.quantifier.none.ql"
+    },
+    "not": {
+      "match": "(?x)\\b(?:not)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.not.ql"
+    },
+    "or": {
+      "match": "(?x)\\b(?:or)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.or.ql"
+    },
+    "order": {
+      "match": "(?x)\\b(?:order)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.order.order.ql"
+    },
+    "predicate": {
+      "match": "(?x)\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.predicate.ql"
+    },
+    "rank": {
+      "match": "(?x)\\b(?:rank)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.rank.ql"
+    },
+    "result": {
+      "match": "(?x)\\b(?:result)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "variable.language.result.ql"
+    },
+    "select": {
+      "match": "(?x)\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.query.select.ql"
+    },
+    "strictconcat": {
+      "match": "(?x)\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.strictconcat.ql"
+    },
+    "strictcount": {
+      "match": "(?x)\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.strictcount.ql"
+    },
+    "strictsum": {
+      "match": "(?x)\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.strictsum.ql"
+    },
+    "string": {
+      "match": "(?x)\\b(?:string)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.type.string.ql"
+    },
+    "sum": {
+      "match": "(?x)\\b(?:sum)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.aggregate.sum.ql"
+    },
+    "super": {
+      "match": "(?x)\\b(?:super)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "variable.language.super.ql"
+    },
+    "then": {
+      "match": "(?x)\\b(?:then)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.other.then.ql"
+    },
+    "this": {
+      "match": "(?x)\\b(?:this)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "variable.language.this.ql"
+    },
+    "true": {
+      "match": "(?x)\\b(?:true)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "constant.language.boolean.true.ql"
+    },
+    "where": {
+      "match": "(?x)\\b(?:where)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "keyword.query.where.ql"
+    },
+    "keyword": {
+      "patterns": [
+        {
+          "include": "#dont-care"
+        },
+        {
+          "include": "#and"
+        },
+        {
+          "include": "#any"
+        },
+        {
+          "include": "#as"
+        },
+        {
+          "include": "#asc"
+        },
+        {
+          "include": "#avg"
+        },
+        {
+          "include": "#boolean"
+        },
+        {
+          "include": "#by"
+        },
+        {
+          "include": "#class"
+        },
+        {
+          "include": "#concat"
+        },
+        {
+          "include": "#count"
+        },
+        {
+          "include": "#date"
+        },
+        {
+          "include": "#desc"
+        },
+        {
+          "include": "#else"
+        },
+        {
+          "include": "#exists"
+        },
+        {
+          "include": "#extends"
+        },
+        {
+          "include": "#false"
+        },
+        {
+          "include": "#float"
+        },
+        {
+          "include": "#forall"
+        },
+        {
+          "include": "#forex"
+        },
+        {
+          "include": "#from"
+        },
+        {
+          "include": "#if"
+        },
+        {
+          "include": "#implies"
+        },
+        {
+          "include": "#import"
+        },
+        {
+          "include": "#in"
+        },
+        {
+          "include": "#instanceof"
+        },
+        {
+          "include": "#int"
+        },
+        {
+          "include": "#max"
+        },
+        {
+          "include": "#min"
+        },
+        {
+          "include": "#module"
+        },
+        {
+          "include": "#newtype"
+        },
+        {
+          "include": "#none"
+        },
+        {
+          "include": "#not"
+        },
+        {
+          "include": "#or"
+        },
+        {
+          "include": "#order"
+        },
+        {
+          "include": "#predicate"
+        },
+        {
+          "include": "#rank"
+        },
+        {
+          "include": "#result"
+        },
+        {
+          "include": "#select"
+        },
+        {
+          "include": "#strictconcat"
+        },
+        {
+          "include": "#strictcount"
+        },
+        {
+          "include": "#strictsum"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#sum"
+        },
+        {
+          "include": "#super"
+        },
+        {
+          "include": "#then"
+        },
+        {
+          "include": "#this"
+        },
+        {
+          "include": "#true"
+        },
+        {
+          "include": "#where"
+        }
+      ]
+    },
+    "predicate-start-keyword": {
+      "patterns": [
+        {
+          "include": "#boolean"
+        },
+        {
+          "include": "#date"
+        },
+        {
+          "include": "#float"
+        },
+        {
+          "include": "#int"
+        },
+        {
+          "include": "#predicate"
+        },
+        {
+          "include": "#string"
+        }
+      ]
+    },
+    "abstract": {
+      "match": "(?x)\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.abstract.ql"
+    },
+    "bindingset": {
+      "match": "(?x)\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.bindingset.ql"
+    },
+    "cached": {
+      "match": "(?x)\\b(?:cached)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.cached.ql"
+    },
+    "deprecated": {
+      "match": "(?x)\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.deprecated.ql"
+    },
+    "external": {
+      "match": "(?x)\\b(?:external)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.external.ql"
+    },
+    "final": {
+      "match": "(?x)\\b(?:final)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.final.ql"
+    },
+    "language": {
+      "match": "(?x)\\b(?:language)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.language.ql"
+    },
+    "library": {
+      "match": "(?x)\\b(?:library)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.library.ql"
+    },
+    "override": {
+      "match": "(?x)\\b(?:override)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.override.ql"
+    },
+    "pragma": {
+      "match": "(?x)\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.pragma.ql"
+    },
+    "private": {
+      "match": "(?x)\\b(?:private)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.private.ql"
+    },
+    "query": {
+      "match": "(?x)\\b(?:query)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.query.ql"
+    },
+    "transient": {
+      "match": "(?x)\\b(?:transient)(?:(?!(?:[0-9A-Za-z_])))",
+      "name": "storage.modifier.transient.ql"
+    },
+    "annotation-keyword": {
+      "patterns": [
+        {
+          "include": "#abstract"
+        },
+        {
+          "include": "#bindingset"
+        },
+        {
+          "include": "#cached"
+        },
+        {
+          "include": "#deprecated"
+        },
+        {
+          "include": "#external"
+        },
+        {
+          "include": "#final"
+        },
+        {
+          "include": "#language"
+        },
+        {
+          "include": "#library"
+        },
+        {
+          "include": "#override"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#private"
+        },
+        {
+          "include": "#query"
+        },
+        {
+          "include": "#transient"
+        }
+      ]
+    },
+    "comment": {
+      "patterns": [
+        {
+          "begin": "(?x)/\\*\\*",
+          "end": "(?x)\\*/",
+          "name": "comment.block.documentation.ql",
+          "patterns": [
+            {
+              "begin": "(?x)(?<=/\\*\\*)([^*]|\\*(?!/))*$",
+              "while": "(?x)(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)",
+              "patterns": [
+                
+                
+                
+                {
+                  "match": "(?x)\\G\\s* (@\\S+)",
+                  "name": "keyword.tag.ql"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?x)/\\*",
+          "end": "(?x)\\*/",
+          "name": "comment.block.ql"
+        },
+        {
+          "match": "(?x)//.*$",
+          "name": "comment.line.double-slash.ql"
+        }
+      ]
+    },
+    "module-member": {
+      "patterns": [
+        {
+          "include": "#import-directive"
+        },
+        {
+          "include": "#import-as-clause"
+        },
+        {
+          "include": "#module-declaration"
+        },
+        {
+          "include": "#class-declaration"
+        },
+        {
+          "include": "#select-clause"
+        },
+        {
+          "include": "#predicate-or-field-declaration"
+        },
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "include": "#annotation"
+        }
+      ]
+    },
+    "import-directive": {
+      "end": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))) (?!\\s*(\\.|\\:\\:))",
+      "endCaptures": {
+        "0": {
+          "name": "entity.name.type.namespace.ql"
+        }
+      },
+      "name": "meta.block.import-directive.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.namespace.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#import"
+            }
+          ]
+        }
+      }
+    },
+    "end-of-as-clause": {
+      "match": "(?x)(?: (?<=(?:[0-9A-Za-z_])) (?!(?:[0-9A-Za-z_])) (?<!(?<!(?:[0-9A-Za-z_]))as)) | (?=\\s* (?!(?:// | /\\*) | (?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))) \\S) | (?=\\s* (?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_])))))))"
+    },
+    "import-as-clause": {
+      "end": "(?x)(?:(?: (?<=(?:[0-9A-Za-z_])) (?!(?:[0-9A-Za-z_])) (?<!(?<!(?:[0-9A-Za-z_]))as)) | (?=\\s* (?!(?:// | /\\*) | (?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))) \\S) | (?=\\s* (?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))))",
+      "name": "meta.block.import-as-clause.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.namespace.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#as"
+            }
+          ]
+        }
+      }
+    },
+    "module-declaration": {
+      "end": "(?x)(?<=\\}|;)",
+      "name": "meta.block.module-declaration.ql",
+      "patterns": [
+        {
+          "include": "#module-body"
+        },
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.namespace.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#module"
+            }
+          ]
+        }
+      }
+    },
+    "module-body": {
+      "name": "meta.block.module-body.ql",
+      "patterns": [
+        {
+          "include": "#module-member"
+        }
+      ],
+      "begin": "(?x)((?:\\{))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#open-brace"
+            }
+          ]
+        }
+      },
+      "end": "(?x)((?:\\}))",
+      "endCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#close-brace"
+            }
+          ]
+        }
+      }
+    },
+    "module-qualifier": {
+      "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))) (?=\\s*\\:\\:)",
+      "name": "entity.name.type.namespace.ql"
+    },
+    "predicate-or-field-declaration": {
+      "begin": "(?x)(?:(?=(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))(?!(?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))|(?:(?:(?:\\b(?:abstract)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:cached)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:deprecated)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:external)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:final)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:language)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:library)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:override)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:private)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:query)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:transient)(?:(?!(?:[0-9A-Za-z_])))))))) | (?=(?:(?:(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))))) | (?=(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))))",
+      "end": "(?x)(?<=\\}|;)",
+      "name": "meta.block.predicate-or-field-declaration.ql",
+      "patterns": [
+        {
+          "include": "#predicate-parameter-list"
+        },
+        {
+          "include": "#predicate-body"
+        },
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "include": "#module-qualifier"
+        },
+        {
+          "match": "(?x)(?:\\b [a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))(?=\\s*;)",
+          "name": "variable.field.ql"
+        },
+        {
+          "match": "(?x)(?:\\b [a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.function.ql"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.ql"
+        }
+      ]
+    },
+    "predicate-parameter-list": {
+      "name": "meta.block.predicate-parameter-list.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))(?=\\s*(?:,|\\)))",
+          "name": "variable.parameter.ql"
+        },
+        {
+          "include": "#module-qualifier"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.ql"
+        },
+        {
+          "match": "(?x)(?:\\b [a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "variable.parameter.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\())",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#open-paren"
+            }
+          ]
+        }
+      },
+      "end": "(?x)((?:\\)))",
+      "endCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#close-paren"
+            }
+          ]
+        }
+      }
+    },
+    "expr-as-clause": {
+      "end": "(?x)(?:(?: (?<=(?:[0-9A-Za-z_])) (?!(?:[0-9A-Za-z_])) (?<!(?<!(?:[0-9A-Za-z_]))as)) | (?=\\s* (?!(?:// | /\\*) | (?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))) \\S) | (?=\\s* (?:(?:(?:\\b(?:_)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:and)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:any)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:asc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:avg)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:boolean)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:by)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:concat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:count)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:date)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:desc)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:else)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:exists)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:false)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:float)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forall)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:forex)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:if)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:implies)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:import)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:in)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:instanceof)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:int)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:max)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:min)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:module)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:none)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:not)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:or)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:order)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:predicate)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:rank)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:result)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictconcat)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictcount)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:strictsum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:string)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:sum)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:super)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:then)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:this)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:true)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))))))",
+      "name": "meta.block.expr-as-clause.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "variable.other.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#as"
+            }
+          ]
+        }
+      }
+    },
+    "predicate-body-contents": {
+      "patterns": [
+        {
+          "include": "#expr-as-clause"
+        },
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "include": "#module-qualifier"
+        },
+        {
+          "match": "(?x)(?:\\b [a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))\\s*(?:\\*|\\+)?\\s*(?=\\()",
+          "name": "entity.name.function.ql"
+        },
+        {
+          "match": "(?x)(?:\\b [a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "variable.other.ql"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.ql"
+        }
+      ]
+    },
+    "predicate-body": {
+      "name": "meta.block.predicate-body.ql",
+      "patterns": [
+        {
+          "include": "#predicate-body-contents"
+        }
+      ],
+      "begin": "(?x)((?:\\{))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#open-brace"
+            }
+          ]
+        }
+      },
+      "end": "(?x)((?:\\}))",
+      "endCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#close-brace"
+            }
+          ]
+        }
+      }
+    },
+    "annotation": {
+      "patterns": [
+        {
+          "include": "#bindingset-annotation"
+        },
+        {
+          "include": "#language-annotation"
+        },
+        {
+          "include": "#pragma-annotation"
+        },
+        {
+          "include": "#annotation-keyword"
+        }
+      ]
+    },
+    "bindingset-annotation": {
+      "end": "(?x)(?! \\s | (?:// | /\\*) | \\[ ) | (?<=\\])",
+      "name": "meta.block.bindingset-annotation.ql",
+      "patterns": [
+        {
+          "include": "#bindingset-annotation-body"
+        },
+        {
+          "include": "#non-context-sensitive"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:bindingset)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#bindingset"
+            }
+          ]
+        }
+      }
+    },
+    "bindingset-annotation-body": {
+      "name": "meta.block.bindingset-annotation-body.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "variable.parameter.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\[))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#open-bracket"
+            }
+          ]
+        }
+      },
+      "end": "(?x)((?:\\]))",
+      "endCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#close-bracket"
+            }
+          ]
+        }
+      }
+    },
+    "language-annotation": {
+      "end": "(?x)(?! \\s | (?:// | /\\*) | \\[ ) | (?<=\\])",
+      "name": "meta.block.language-annotation.ql",
+      "patterns": [
+        {
+          "include": "#language-annotation-body"
+        },
+        {
+          "include": "#non-context-sensitive"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:language)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ]
+        }
+      }
+    },
+    "language-annotation-body": {
+      "name": "meta.block.language-annotation-body.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)\\b(?:monotonicAggregates)(?:(?!(?:[0-9A-Za-z_])))",
+          "name": "storage.modifier.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\[))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#open-bracket"
+            }
+          ]
+        }
+      },
+      "end": "(?x)((?:\\]))",
+      "endCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#close-bracket"
+            }
+          ]
+        }
+      }
+    },
+    "pragma-annotation": {
+      "end": "(?x)(?! \\s | (?:// | /\\*) | \\[ ) | (?<=\\])",
+      "name": "meta.block.pragma-annotation.ql",
+      "patterns": [
+        {
+          "include": "#pragma-annotation-body"
+        },
+        {
+          "include": "#non-context-sensitive"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:pragma)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#pragma"
+            }
+          ]
+        }
+      }
+    },
+    "pragma-annotation-body": {
+      "name": "meta.block.pragma-annotation-body.ql",
+      "patterns": [
+        {
+          "match": "(?x)\\b(?:inline|noinline|nomagic|noopt)\\b",
+          "name": "storage.modifier.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\[))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#open-bracket"
+            }
+          ]
+        }
+      },
+      "end": "(?x)((?:\\]))",
+      "endCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#close-bracket"
+            }
+          ]
+        }
+      }
+    },
+    "newtype-declaration": {
+      "end": "(?x)(?! \\s | (?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_])))) | (?:// | /\\*) | \\= | \\( )",
+      "name": "meta.block.newtype.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "include": "#newtype-branch"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:newtype)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#newtype"
+            }
+          ]
+        }
+      }
+    },
+    "newtype-branch": {
+      "begin": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+      "beginCaptures": {
+        "0": {
+          "name": "entity.name.type.ql"
+        }
+      },
+      "end": "(?x)(?<=\\}) | (?! \\s | (?:// | /\\*) | \\{ )",
+      "name": "meta.block.newtype-branch.ql",
+      "patterns": [
+        {
+          "include": "#predicate-body"
+        },
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.ql"
+        }
+      ]
+    },
+    "class-declaration": {
+      "end": "(?x)(?<= \\} | ; )",
+      "name": "meta.block.class-declaration.ql",
+      "patterns": [
+        {
+          "include": "#class-body"
+        },
+        {
+          "include": "#extends-clause"
+        },
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.class.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:class)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#class"
+            }
+          ]
+        }
+      }
+    },
+    "extends-clause": {
+      "end": "(?x)(?= \\{ )",
+      "name": "meta.block.extends-clause.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:extends)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#extends"
+            }
+          ]
+        }
+      }
+    },
+    "class-body": {
+      "name": "meta.block.class-body.ql",
+      "patterns": [
+        {
+          "include": "#class-member"
+        }
+      ],
+      "begin": "(?x)((?:\\{))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#open-brace"
+            }
+          ]
+        }
+      },
+      "end": "(?x)((?:\\}))",
+      "endCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#close-brace"
+            }
+          ]
+        }
+      }
+    },
+    "class-member": {
+      "patterns": [
+        {
+          "include": "#predicate-or-field-declaration"
+        },
+        {
+          "include": "#annotation"
+        },
+        {
+          "include": "#non-context-sensitive"
+        }
+      ]
+    },
+    "select-clause": {
+      "begin": "(?x)(?=(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))))",
+      "end": "(?x)(?!(?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))))",
+      "name": "meta.block.select-clause.ql",
+      "patterns": [
+        {
+          "include": "#from-section"
+        },
+        {
+          "include": "#where-section"
+        },
+        {
+          "include": "#select-section"
+        }
+      ]
+    },
+    "from-section": {
+      "end": "(?x)(?= (?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))) | (?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_])))) )",
+      "name": "meta.block.from-section.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))(?=\\s*(?:,|(?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_]))))|(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_]))))|$))",
+          "name": "variable.parameter.ql"
+        },
+        {
+          "include": "#module-qualifier"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))|(?:@[a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "entity.name.type.ql"
+        },
+        {
+          "match": "(?x)(?:\\b [a-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "variable.parameter.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:from)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#from"
+            }
+          ]
+        }
+      }
+    },
+    "where-section": {
+      "end": "(?x)(?=(?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))))",
+      "name": "meta.block.where-section.ql",
+      "patterns": [
+        {
+          "include": "#predicate-body-contents"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:where)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#where"
+            }
+          ]
+        }
+      }
+    },
+    "select-section": {
+      "end": "(?x)(?=\\n)",
+      "name": "meta.block.select-section.ql",
+      "patterns": [
+        {
+          "include": "#predicate-body-contents"
+        },
+        {
+          "include": "#select-as-clause"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:select)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#select"
+            }
+          ]
+        }
+      }
+    },
+    "select-as-clause": {
+      "end": "(?x)(?<=(?:[0-9A-Za-z_])(?:(?!(?:[0-9A-Za-z_]))))",
+      "match": "(?x)meta.block.select-as-clause.ql",
+      "patterns": [
+        {
+          "include": "#non-context-sensitive"
+        },
+        {
+          "match": "(?x)(?:\\b [A-Za-z][0-9A-Za-z_]* (?:(?!(?:[0-9A-Za-z_]))))",
+          "name": "variable.other.ql"
+        }
+      ],
+      "begin": "(?x)((?:\\b(?:as)(?:(?!(?:[0-9A-Za-z_])))))",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#as"
+            }
+          ]
+        }
+      }
+    },
+    "literal": {
+      "patterns": [
+        {
+          "include": "#float-literal"
+        },
+        {
+          "include": "#int-literal"
+        },
+        {
+          "include": "#string-literal"
+        }
+      ]
+    },
+    "int-literal": {
+      "match": "(?x)-?[0-9]+(?![0-9])",
+      "name": "constant.numeric.decimal.ql"
+    },
+    "float-literal": {
+      "match": "(?x)-?[0-9]+\\.[0-9]+(?![0-9])",
+      "name": "constant.numeric.decimal.ql"
+    },
+    "string-literal": {
+      "name": "string.quoted.double.ql",
+      "begin": "(?x)\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ql"
+        }
+      },
+      "end": "(?x)(\") | ((?:[^\\\\\\n])$)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.ql"
+        },
+        "2": {
+          "name": "invalid.illegal.newline.ql"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#string-escape"
+        }
+      ]
+    },
+    "string-escape": {
+      "match": "(?x)\\\\[\"\\\\nrt]",
+      "name": "constant.character.escape.ql"
+    }
+  }
+}
\ No newline at end of file
diff --git a/syntaxes/updateSyntax b/syntaxes/updateSyntax
new file mode 100755
index 000000000..6821cd7b7
--- /dev/null
+++ b/syntaxes/updateSyntax
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+
+perl -0777 -pe 's/{\s*"include"\s*:\s*"text.html.markdown#[a-zA-Z_]+\"\s*}\s*,//igs' ../extensions/ql-vscode/out/syntaxes/ql.tmLanguage.json > ./ql.tmLanguage.json

From 2435a0b2f7f61b2ee19f87edc04e46e4915dea74 Mon Sep 17 00:00:00 2001
From: Alexander Eyers-Taylor <alexet@semmle.com>
Date: Wed, 4 Mar 2020 16:24:37 +0000
Subject: [PATCH 2/2] Update syntaxes/README.md

Co-Authored-By: jcreedcmu <jcreed@gmail.com>
---
 syntaxes/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntaxes/README.md b/syntaxes/README.md
index 49ffc3676..b5cca18bf 100644
--- a/syntaxes/README.md
+++ b/syntaxes/README.md
@@ -1,3 +1,3 @@
-This folder contains a compiled version of the textmate grammar for use with systems that need a compiled verison of the grammar in the repository such as linguist. It also contains a patvh for the grammar to make it work with linguist.
+This folder contains a compiled version of the textmate grammar for use with systems that need a compiled version of the grammar in the repository such as linguist. It also contains a patch for the grammar to make it work with linguist.
 
-To update the grammar, first build the extension, then run "./updateSyntax".
\ No newline at end of file
+To update the grammar, first build the extension, then run "./updateSyntax".