From ead1d2523c029e3219c3b25b43e8f7972c5fe33a Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 4 Jun 2020 15:08:21 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../code_navigation/components/doc_line.vue        | 22 ++++++++++++++++++++++
 .../code_navigation/components/popover.vue         |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/code_navigation/components/doc_line.vue

(limited to 'app/assets/javascripts/code_navigation')

diff --git a/app/assets/javascripts/code_navigation/components/doc_line.vue b/app/assets/javascripts/code_navigation/components/doc_line.vue
new file mode 100644
index 00000000000..69d398893d9
--- /dev/null
+++ b/app/assets/javascripts/code_navigation/components/doc_line.vue
@@ -0,0 +1,22 @@
+<script>
+export default {
+  props: {
+    language: {
+      type: String,
+      required: true,
+    },
+    tokens: {
+      type: Array,
+      required: true,
+    },
+  },
+};
+</script>
+
+<template>
+  <span class="line" :lang="language">
+    <span v-for="(token, tokenIndex) in tokens" :key="tokenIndex" :class="token.class">{{
+      token.value
+    }}</span>
+  </span>
+</template>
diff --git a/app/assets/javascripts/code_navigation/components/popover.vue b/app/assets/javascripts/code_navigation/components/popover.vue
index 7147ce227e8..df5f89e4faf 100644
--- a/app/assets/javascripts/code_navigation/components/popover.vue
+++ b/app/assets/javascripts/code_navigation/components/popover.vue
@@ -1,9 +1,11 @@
 <script>
 import { GlButton } from '@gitlab/ui';
+import DocLine from './doc_line.vue';
 
 export default {
   components: {
     GlButton,
+    DocLine,
   },
   props: {
     position: {
@@ -83,8 +85,7 @@ export default {
         ref="code-output"
         :class="$options.colorScheme"
         class="border-0 bg-transparent m-0 code highlight"
-        v-html="hover.value"
-      ></pre>
+      ><doc-line v-for="(tokens, tokenIndex) in hover.tokens" :key="tokenIndex" :language="hover.language" :tokens="tokens"/></pre>
       <p v-else ref="doc-output" class="p-3 m-0">
         {{ hover.value }}
       </p>
-- 
cgit v1.2.3