[Code] fallback with symbolInformation.name for typeahead (#40654) (#…

…40784)
elastic · Jul 10, 2019 · f8fb833 · f8fb833
1 parent 64995d9
commit f8fb833
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...cy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx b/...cy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx
@@ -23,6 +23,9 @@ export const SuggestionComponent: SFC<Props> = props => {
 
   // An util function to help highlight the substring which matches the query.
   const renderMatchingText = (text: string) => {
+    if (!text) {
+      return text;
+    }
     // Match the text with query in case sensitive mode first.
     let index = text.indexOf(props.query);
     if (index < 0) {

diff --git a/...egacy/plugins/code/public/components/query_bar/suggestions/symbol_suggestions_provider.ts b/...egacy/plugins/code/public/components/query_bar/suggestions/symbol_suggestions_provider.ts
@@ -44,7 +44,7 @@ export class SymbolSuggestionsProvider extends AbstractSuggestionsProvider {
             description: this.getSymbolDescription(symbol.symbolInformation.location),
             end: 10,
             start: 1,
-            text: symbol.qname,
+            text: symbol.qname ? symbol.qname : symbol.symbolInformation.name,
             tokenType: this.symbolKindToTokenClass(symbol.symbolInformation.kind),
             selectUrl: this.getSymbolLinkUrl(symbol.symbolInformation.location),
           };

diff --git a/x-pack/legacy/plugins/code/server/__tests__/multi_node.ts b/x-pack/legacy/plugins/code/server/__tests__/multi_node.ts
@@ -63,7 +63,6 @@ const xpackOption = {
   },
 };
 
-// Skip because of issue: https://github.com/elastic/code/issues/1387
 describe('code in multiple nodes', () => {
   const codeNodeUuid = 'c4add484-0cba-4e05-86fe-4baa112d9e53';
   const nonodeNodeUuid = '22b75e04-0e50-4647-9643-6b1b1d88beaf';