Skip to content

Fix regex in CodeQL TextMate grammar that was silently failing #3903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aeisenberg merged 2 commits into from
Jan 23, 2025
Merged

Fix regex in CodeQL TextMate grammar that was silently failing #3903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7086d1b
Fix regex in CodeQL TextMate grammar that was silently failing
slevithan Jan 19, 2025
a6266bb
Remove empty newliines
aeisenberg Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions extensions/ql-vscode/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion extensions/ql-vscode/syntaxes/ql.tmLanguage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
7 changes: 2 additions & 5 deletions syntaxes/ql.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,9 +675,6 @@
"begin": "(?x)(?<=/\\*\\*)([^*]|\\*(?!/))*$",
"while": "(?x)(^|\\G)\\s*([^*]|\\*(?!/))(?=([^*]|[*](?!/))*$)",
"patterns": [



{
"match": "(?x)\\G\\s* (@\\S+)",
"name": "keyword.tag.ql"
Expand Down Expand Up @@ -1469,7 +1466,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": [
{
Expand Down Expand Up @@ -1540,4 +1537,4 @@
"name": "constant.character.escape.ql"
}
}
}
}
Loading