From 1b3dd310c0cf14fab5ab43b7fcecfd43b6330e10 Mon Sep 17 00:00:00 2001 From: Joey Tawadrous <90795735+joey-grafana@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:02:51 +0000 Subject: [PATCH] Loki: Uppercase autocomplete (#45123) * Updated regex * Added test for uppercase * Updated regex --- public/app/plugins/datasource/loki/syntax.test.ts | 3 +++ public/app/plugins/datasource/loki/syntax.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/loki/syntax.test.ts b/public/app/plugins/datasource/loki/syntax.test.ts index 3b96c52841e..b2d88150907 100644 --- a/public/app/plugins/datasource/loki/syntax.test.ts +++ b/public/app/plugins/datasource/loki/syntax.test.ts @@ -21,6 +21,9 @@ describe('Loki syntax', () => { expect(Prism.highlight('{key="value"', syntax, 'loki')).toBe( '{key="value"' ); + expect(Prism.highlight('{Key="value"', syntax, 'loki')).toBe( + '{Key="value"' + ); }); it('should highlight functions in Loki query correctly', () => { expect(Prism.highlight('rate({key="value"}[5m])', syntax, 'loki')).toContain( diff --git a/public/app/plugins/datasource/loki/syntax.ts b/public/app/plugins/datasource/loki/syntax.ts index cac467b365e..abb521b02e5 100644 --- a/public/app/plugins/datasource/loki/syntax.ts +++ b/public/app/plugins/datasource/loki/syntax.ts @@ -192,7 +192,7 @@ export const lokiGrammar: Grammar = { pattern: /#.*/, }, 'label-key': { - pattern: /[a-z_]\w*(?=\s*(=|!=|=~|!~))/, + pattern: /[a-zA-Z_]\w*(?=\s*(=|!=|=~|!~))/, alias: 'attr-name', greedy: true, },