From 08845a66bb86e824f14695a96aa5062ed64edb20 Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Tue, 4 Aug 2020 11:02:51 +0200 Subject: Fix JS markdown component generating lots of files with highlighting --- .../src/main/components/search/searchResultRow.tsx | 20 ++++++++++++++++++-- .../frontend/src/main/types/@jetbrains/index.d.ts | 4 ---- 2 files changed, 18 insertions(+), 6 deletions(-) (limited to 'plugins/base/frontend/src') diff --git a/plugins/base/frontend/src/main/components/search/searchResultRow.tsx b/plugins/base/frontend/src/main/components/search/searchResultRow.tsx index 81e1bad9..83dd2bcb 100644 --- a/plugins/base/frontend/src/main/components/search/searchResultRow.tsx +++ b/plugins/base/frontend/src/main/components/search/searchResultRow.tsx @@ -1,6 +1,14 @@ import React from "react"; import {OptionWithSearchResult, SearchProps, SearchRank} from "./types"; -import Markdown from '@jetbrains/ring-ui/components/markdown/markdown'; +import _ from "lodash"; + +type HighlighterProps = { + label: string +} + +const Highlighter: React.FC = ({label}: HighlighterProps) => { + return {label} +} export const SearchResultRow: React.FC = ({searchResult}: SearchProps) => { const signatureFromSearchResult = (searchResult: OptionWithSearchResult): string => { @@ -10,9 +18,17 @@ export const SearchResultRow: React.FC = ({searchResult}: SearchPro return searchResult.highlight } + /* + This is a work-around for an issue: https://youtrack.jetbrains.com/issue/RG-2108 + */ + const out = _.chunk(signatureFromSearchResult(searchResult).split('**'), 2).flatMap(([txt, label]) => [ + txt, + label ? : null, + ]); + return (
- + {out} {searchResult.description}
) diff --git a/plugins/base/frontend/src/main/types/@jetbrains/index.d.ts b/plugins/base/frontend/src/main/types/@jetbrains/index.d.ts index ceee5179..3d209657 100644 --- a/plugins/base/frontend/src/main/types/@jetbrains/index.d.ts +++ b/plugins/base/frontend/src/main/types/@jetbrains/index.d.ts @@ -2,7 +2,3 @@ declare module '@jetbrains/ring-ui' { export const Select: any; export const List: any; } - -declare module '@jetbrains/ring-ui/components/markdown/markdown' { - export const Markdown: any -} -- cgit