diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 78615a87792..3ed535f2554 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -3,6 +3,7 @@ ## [UNRELEASED] - Remove support for CodeQL CLI versions older than 2.18.4. [#3895](https://github.com/github/vscode-codeql/pull/3895) +- Fix regex in CodeQL TextMate grammar that was silently failing. [#3903](https://github.com/github/vscode-codeql/pull/3903) ## 1.7.0 - 20 December 2024 diff --git a/extensions/ql-vscode/syntaxes/ql.tmLanguage.yml b/extensions/ql-vscode/syntaxes/ql.tmLanguage.yml index fe10a86d03d..9348f74f763 100644 --- a/extensions/ql-vscode/syntaxes/ql.tmLanguage.yml +++ b/extensions/ql-vscode/syntaxes/ql.tmLanguage.yml @@ -1065,7 +1065,7 @@ repository: beginPattern: '#as' # Ends after the first identifier we encounter. # REVIEW: Make similar to import-as-clause. - end: '(?<=(?#id-character)(?#end-of-id))' + end: '(?<=(?#id-character))(?#end-of-id)' match: meta.block.select-as-clause.ql patterns: - include: '#non-context-sensitive' diff --git a/syntaxes/ql.tmLanguage.json b/syntaxes/ql.tmLanguage.json index a8b5c3909a2..902ef034e88 100644 --- a/syntaxes/ql.tmLanguage.json +++ b/syntaxes/ql.tmLanguage.json @@ -675,9 +675,9 @@ "begin": "(?x)(?<=/\\*\\*)([^*]|\\*(?!/))*$", "while": "(?x)(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)", "patterns": [ - - - + + + { "match": "(?x)\\G\\s* (@\\S+)", "name": "keyword.tag.ql" @@ -1469,7 +1469,7 @@ } }, "select-as-clause": { - "end": "(?x)(?<=(?:[0-9A-Za-z_])(?:(?!(?:[0-9A-Za-z_]))))", + "end": "(?x)(?<=(?:[0-9A-Za-z_]))(?:(?!(?:[0-9A-Za-z_])))", "match": "(?x)meta.block.select-as-clause.ql", "patterns": [ { @@ -1540,4 +1540,4 @@ "name": "constant.character.escape.ql" } } -} +} \ No newline at end of file