Fix regex in CodeQL TextMate grammar that was silently failing

This commit is contained in:
Steven Levithan
2025-01-19 20:32:07 +01:00
parent 8b0a16ea14
commit 7086d1b707
3 changed files with 7 additions and 6 deletions

View File

@@ -3,6 +3,7 @@
## [UNRELEASED] ## [UNRELEASED]
- Remove support for CodeQL CLI versions older than 2.18.4. [#3895](https://github.com/github/vscode-codeql/pull/3895) - 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 ## 1.7.0 - 20 December 2024

View File

@@ -1065,7 +1065,7 @@ repository:
beginPattern: '#as' beginPattern: '#as'
# Ends after the first identifier we encounter. # Ends after the first identifier we encounter.
# REVIEW: Make similar to import-as-clause. # 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 match: meta.block.select-as-clause.ql
patterns: patterns:
- include: '#non-context-sensitive' - include: '#non-context-sensitive'

View File

@@ -675,9 +675,9 @@
"begin": "(?x)(?<=/\\*\\*)([^*]|\\*(?!/))*$", "begin": "(?x)(?<=/\\*\\*)([^*]|\\*(?!/))*$",
"while": "(?x)(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)", "while": "(?x)(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)",
"patterns": [ "patterns": [
{ {
"match": "(?x)\\G\\s* (@\\S+)", "match": "(?x)\\G\\s* (@\\S+)",
"name": "keyword.tag.ql" "name": "keyword.tag.ql"
@@ -1469,7 +1469,7 @@
} }
}, },
"select-as-clause": { "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", "match": "(?x)meta.block.select-as-clause.ql",
"patterns": [ "patterns": [
{ {
@@ -1540,4 +1540,4 @@
"name": "constant.character.escape.ql" "name": "constant.character.escape.ql"
} }
} }
} }