From 1fddb6144d14757731a156d27d876b43e89b2403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 4 Dec 2018 14:57:01 +0100
Subject: [PATCH] fixed promql and loggging syntax so all punctuation chars are
 treated the same, remove hover move

---
 public/app/plugins/datasource/logging/syntax.ts    | 1 +
 public/app/plugins/datasource/prometheus/promql.ts | 4 +++-
 public/sass/pages/_explore.scss                    | 4 ----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/datasource/logging/syntax.ts b/public/app/plugins/datasource/logging/syntax.ts
index aca7d09ef4d..0748b4e5ffd 100644
--- a/public/app/plugins/datasource/logging/syntax.ts
+++ b/public/app/plugins/datasource/logging/syntax.ts
@@ -18,6 +18,7 @@ const tokenizer = {
         greedy: true,
         alias: 'attr-value',
       },
+      punctuation: /[{]/,
     },
   },
   // number: /\b-?\d+((\.\d*)?([eE][+-]?\d+)?)?\b/,
diff --git a/public/app/plugins/datasource/prometheus/promql.ts b/public/app/plugins/datasource/prometheus/promql.ts
index 41463877a8f..ae0c883525a 100644
--- a/public/app/plugins/datasource/prometheus/promql.ts
+++ b/public/app/plugins/datasource/prometheus/promql.ts
@@ -386,9 +386,10 @@ const tokenizer = {
     lookbehind: true,
     inside: {
       'label-key': {
-        pattern: /[^,\s][^,]*[^,\s]*/,
+        pattern: /[^(),\s][^,)]*[^),\s]*/,
         alias: 'attr-name',
       },
+      punctuation: /[()]/,
     },
   },
   'context-labels': {
@@ -403,6 +404,7 @@ const tokenizer = {
         greedy: true,
         alias: 'attr-value',
       },
+      punctuation: /[{]/,
     },
   },
   function: new RegExp(`\\b(?:${FUNCTIONS.map(f => f.label).join('|')})(?=\\s*\\()`, 'i'),
diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss
index b62483d2a67..5617939e9ec 100644
--- a/public/sass/pages/_explore.scss
+++ b/public/sass/pages/_explore.scss
@@ -36,10 +36,6 @@
     transition: all 0.1s linear;
   }
 
-  .explore-panel__header:hover {
-    transform: translateY(-1px);
-  }
-
   .explore-panel__header-label {
     font-weight: 500;
     margin-right: $panel-margin;