Skip to content

fix: scope Sema regex literals in UI highlighting #3

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

Open
HelgeSverre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: scope Sema regex literals in UI highlighting #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions src/grammars/sema.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
{
"include": "#comment"
},
{
"include": "#regex"
},
{
"include": "#string"
},
Expand Down Expand Up @@ -50,6 +53,17 @@
}
],
"repository": {
"regex": {
"name": "string.regexp.sema",
"begin": "#\"",
"end": "\"",
"patterns": [
{
"name": "string.regexp.sema",
"match": "\\\\."
}
]
},
"block-comment": {
"name": "comment.block.sema",
"begin": "#\\|",
Expand Down
13 changes: 13 additions & 0 deletions tests/syntax-highlight-sync.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@ describe('highlightToHtmlSync', () => {
expect(out).toContain('<span class="tok-builtin">tool/policy-subjects</span>')
})

it('classifies complete raw regex literals and regex builtins', async () => {
await preloadLanguage('sema')
const out = highlightToHtmlSync(
'(regex/match? #"\\d+" text)\n(regex/match #"\\\"[^\\\"]+\\\"" text)',
'sema',
)
const normalized = out.replaceAll('</span><span class="tok-string">', '')
expect(out).toContain('<span class="tok-builtin">regex/match?</span>')
expect(out).toContain('<span class="tok-builtin">regex/match</span>')
expect(normalized).toContain('<span class="tok-string">#"\\d+"</span>')
expect(normalized).toContain('<span class="tok-string">#"\\"[^\\"]+\\""</span>')
})

it('supports non-sema languages too (json), unlike the old sema-only tokenizer', async () => {
await preloadLanguage('json')
const out = highlightToHtmlSync('{"a": 1}', 'json')
Expand Down