IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tempo: TraceQL syntax highlighting improvements (#62349)

Browse Source 
* Better syntax highlighting for durations, floats and right-hand-side tags

* Remove hex rule in TraceQL syntax highlighting
This commit is contained in:
Andre Pereira 2023-02-02 15:48:29 +00:00 committed by GitHub
parent ec01e6d6b2
commit 60f2433a0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/plugins/datasource/tempo/traceql/traceql.ts
View File

@ -45,16 +45,17 @@ export const language = {
digits: /\d+(_+\d+)*/, digits: /\d+(_+\d+)*/,
octaldigits: /[0-7]+(_+[0-7]+)*/, octaldigits: /[0-7]+(_+[0-7]+)*/,
binarydigits: /[0-1]+(_+[0-1]+)*/, binarydigits: /[0-1]+(_+[0-1]+)*/,
hexdigits: /[[0-9a-fA-F]+(_+[0-9a-fA-F]+)*/,
integersuffix: /(ll|LL|u|U|l|L)?(ll|LL|u|U|l|L)?/,
floatsuffix: /[fFlL]?/,
tokenizer: { tokenizer: {
root: [ root: [
// labels // labels
[/[a-z_.][\w./_-]*(?=\s*(=|!=|>|<|>=|<=|=~|!~))/, 'tag'], [/[a-z_.][\w./_-]*(?=\s*(=|!=|>|<|>=|<=|=~|!~))/, 'tag'],
[/[a-z_.][\w./_-]*/, 'tag'],
//trace ID // durations
[/[0-9.]+(s|ms|ns|m)/, 'number'],
// trace ID
[/^\s*[0-9A-Fa-f]+\s*$/, 'tag'], [/^\s*[0-9A-Fa-f]+\s*$/, 'tag'],
// all keywords have the same color // all keywords have the same color
@ -92,14 +93,12 @@ export const language = {
], ],
// numbers // numbers
[/\d+/, 'number'], [/(@digits)[eE]([\-+]?(@digits))?[fFdD]?/, 'number.float'],
[/\d*\d+[eE]([\-+]?\d+)?(@floatsuffix)/, 'number.float'], [/(@digits)\.(@digits)([eE][\-+]?(@digits))?[fFdD]?/, 'number.float'],
[/\d*\.\d+([eE][\-+]?\d+)?(@floatsuffix)/, 'number.float'], [/0(@octaldigits)[Ll]?/, 'number.octal'],
[/0[xX][0-9a-fA-F']*[0-9a-fA-F](@integersuffix)/, 'number.hex'], [/0[bB](@binarydigits)[Ll]?/, 'number.binary'],
[/0[0-7']*[0-7](@integersuffix)/, 'number.octal'], [/(@digits)[fFdD]/, 'number.float'],
[/0[bB][0-1']*[0-1](@integersuffix)/, 'number.binary'], [/(@digits)[lL]?/, 'number'],
[/\d[\d']*\d(@integersuffix)/, 'number'],
[/\d(@integersuffix)/, 'number'],
], ],
string_double: [ string_double: [