Skip to content

Commit 7086d1b

Browse files
committed
Fix regex in CodeQL TextMate grammar that was silently failing
1 parent 8b0a16e commit 7086d1b

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

extensions/ql-vscode/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## [UNRELEASED]
44

55
- Remove support for CodeQL CLI versions older than 2.18.4. [#3895](https://github.com/github/vscode-codeql/pull/3895)
6+
- Fix regex in CodeQL TextMate grammar that was silently failing. [#3903](https://github.com/github/vscode-codeql/pull/3903)
67

78
## 1.7.0 - 20 December 2024
89

extensions/ql-vscode/syntaxes/ql.tmLanguage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ repository:
10651065
beginPattern: '#as'
10661066
# Ends after the first identifier we encounter.
10671067
# REVIEW: Make similar to import-as-clause.
1068-
end: '(?<=(?#id-character)(?#end-of-id))'
1068+
end: '(?<=(?#id-character))(?#end-of-id)'
10691069
match: meta.block.select-as-clause.ql
10701070
patterns:
10711071
- include: '#non-context-sensitive'

syntaxes/ql.tmLanguage.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,9 @@
675675
"begin": "(?x)(?<=/\\*\\*)([^*]|\\*(?!/))*$",
676676
"while": "(?x)(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)",
677677
"patterns": [
678-
679-
680-
678+
679+
680+
681681
{
682682
"match": "(?x)\\G\\s* (@\\S+)",
683683
"name": "keyword.tag.ql"
@@ -1469,7 +1469,7 @@
14691469
}
14701470
},
14711471
"select-as-clause": {
1472-
"end": "(?x)(?<=(?:[0-9A-Za-z_])(?:(?!(?:[0-9A-Za-z_]))))",
1472+
"end": "(?x)(?<=(?:[0-9A-Za-z_]))(?:(?!(?:[0-9A-Za-z_])))",
14731473
"match": "(?x)meta.block.select-as-clause.ql",
14741474
"patterns": [
14751475
{
@@ -1540,4 +1540,4 @@
15401540
"name": "constant.character.escape.ql"
15411541
}
15421542
}
1543-
}
1543+
}

0 commit comments

Comments
 (0)