Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 8 insertions, 3 deletions

diff --git a/app/assets/javascripts/search/index.js b/app/assets/javascripts/search/index.js
index ba12f31ef87..d4ee857c9c1 100644
--- a/app/assets/javascripts/search/index.js
+++ b/app/assets/javascripts/search/index.js
@@ -1,6 +1,7 @@
 import setHighlightClass from 'ee_else_ce/search/highlight_blob_search_result';
 import { queryToObject } from '~/lib/utils/url_utility';
 import refreshCounts from '~/pages/search/show/refresh_counts';
+import syntaxHighlight from '~/syntax_highlight';
 import { initSidebar, sidebarInitState } from './sidebar';
 import { initSearchSort } from './sort';
 import createStore from './store';
@@ -8,10 +9,14 @@ import { initTopbar } from './topbar';
 import { initBlobRefSwitcher } from './under_topbar';
 
 export const initSearchApp = () => {
-  const query = queryToObject(window.location.search);
-  const navigation = sidebarInitState();
+  syntaxHighlight(document.querySelectorAll('.js-search-results'));
+  const query = queryToObject(window.location.search, { gatherArrays: true });
+  const { navigationJsonParsed: navigation } = sidebarInitState() || {};
 
-  const store = createStore({ query, navigation });
+  const store = createStore({
+    query,
+    navigation,
+  });
 
   initTopbar(store);
   initSidebar(store);