From 1a5e786467afdce45bedbd46b846311889a2384d Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Tue, 12 Sep 2017 09:31:05 +0900
Subject: [PATCH] fix

---
 public/app/plugins/datasource/prometheus/completer.ts  | 10 +++++-----
 .../plugins/datasource/prometheus/mode-prometheus.js   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/completer.ts b/public/app/plugins/datasource/prometheus/completer.ts
index 577b872c21b..799822eb571 100644
--- a/public/app/plugins/datasource/prometheus/completer.ts
+++ b/public/app/plugins/datasource/prometheus/completer.ts
@@ -21,7 +21,7 @@ export class PromCompleter {
 
     var metricName;
     switch (token.type) {
-      case 'keyword':
+      case 'entity.name.tag':
         metricName = this.findMetricName(session, pos.row, pos.column);
         if (!metricName) {
           callback(null, this.transformToCompletions(['__name__', 'instance', 'job'], 'label name'));
@@ -43,14 +43,14 @@ export class PromCompleter {
           callback(null, labelNames);
         });
         return;
-      case 'string':
+      case 'string.quoted':
         metricName = this.findMetricName(session, pos.row, pos.column);
         if (!metricName) {
           callback(null, []);
           return;
         }
 
-        var labelNameToken = this.findToken(session, pos.row, pos.column, 'keyword', null, 'paren.lparen');
+        var labelNameToken = this.findToken(session, pos.row, pos.column, 'entity.name.tag', null, 'paren.lparen');
         if (!labelNameToken) {
           callback(null, []);
           return;
@@ -135,11 +135,11 @@ export class PromCompleter {
     var metricName = '';
 
     var tokens;
-    var nameLabelNameToken = this.findToken(session, row, column, 'keyword', '__name__', 'paren.lparen');
+    var nameLabelNameToken = this.findToken(session, row, column, 'entity.name.tag', '__name__', 'paren.lparen');
     if (nameLabelNameToken) {
       tokens = session.getTokens(nameLabelNameToken.row);
       var nameLabelValueToken = tokens[nameLabelNameToken.index + 2];
-      if (nameLabelValueToken && nameLabelValueToken.type === 'string') {
+      if (nameLabelValueToken && nameLabelValueToken.type === 'string.quoted') {
         metricName = nameLabelValueToken.value.slice(1, -1); // cut begin/end quotation
       }
     } else {
diff --git a/public/app/plugins/datasource/prometheus/mode-prometheus.js b/public/app/plugins/datasource/prometheus/mode-prometheus.js
index 78edbbd30d1..165c1a364c4 100644
--- a/public/app/plugins/datasource/prometheus/mode-prometheus.js
+++ b/public/app/plugins/datasource/prometheus/mode-prometheus.js
@@ -65,13 +65,13 @@ var PrometheusHighlightRules = function() {
       regex : "\\s+"
     } ],
     "start-label-matcher" : [ {
-      token : "keyword",
+      token : "entity.name.tag",
       regex : '[a-zA-Z_][a-zA-Z0-9_]*'
     }, {
       token : "keyword.operator",
       regex : '=~|=|!~|!='
     }, {
-      token : "string",
+      token : "string.quoted",
       regex : '"[^"]*"|\'[^\']*\''
     }, {
       token : "punctuation.operator",
@@ -401,7 +401,7 @@ var PrometheusCompletions = function() {};
 (function() {
   this.getCompletions = function(state, session, pos, prefix, callback) {
     var token = session.getTokenAt(pos.row, pos.column);
-    if (token.type === 'label.name' || token.type === 'label.value') {
+    if (token.type === 'entity.name.tag' || token.type === 'string.quoted') {
       return callback(null, []);
     }