Merge pull request #18534 from mjbvz/allow-expanding-suggestions-without-docs-but-with-long-details

Allow Expanding Suggestions with Mulitline details

src/vs/editor/contrib/suggest/browser/suggestWidget.ts

@@ -45,6 +45,14 @@ function matchesColor(text: string) {
 	return text && text.match(colorRegExp) ? text : null;
 }
 
+function canExpandCompletionItem(item: ICompletionItem) {
+	const suggestion = item.suggestion;
+	if (suggestion.documentation) {
+		return true;
+	}
+	return (suggestion.detail || '').indexOf('\n') >= 0;
+}
+
 class Renderer implements IRenderer<ICompletionItem, ISuggestionTemplateData> {
 
 	private triggerKeybindingLabel: string;
@@ -111,7 +119,7 @@ class Renderer implements IRenderer<ICompletionItem, ISuggestionTemplateData> {
 		const data = <ISuggestionTemplateData>templateData;
 		const suggestion = (<ICompletionItem>element).suggestion;
 
-		if (suggestion.documentation) {
+		if (canExpandCompletionItem(element)) {
 			data.root.setAttribute('aria-label', nls.localize('suggestionWithDetailsAriaLabel', "{0}, suggestion, has details", suggestion.label));
 		} else {
 			data.root.setAttribute('aria-label', nls.localize('suggestionAriaLabel', "{0}, suggestion", suggestion.label));
@@ -133,7 +141,7 @@ class Renderer implements IRenderer<ICompletionItem, ISuggestionTemplateData> {
 
 		data.documentation.textContent = suggestion.documentation || '';
 
-		if (suggestion.documentation) {
+		if (canExpandCompletionItem(element)) {
 			show(data.documentationDetails);
 			data.documentationDetails.onmousedown = e => {
 				e.stopPropagation();
@@ -413,7 +421,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 	}
 
 	private _getSuggestionAriaAlertLabel(item: ICompletionItem): string {
-		if (item.suggestion.documentation) {
+		if (canExpandCompletionItem(item)) {
 			return nls.localize('ariaCurrentSuggestionWithDetails', "{0}, suggestion, has details", item.suggestion.label);
 		} else {
 			return nls.localize('ariaCurrentSuggestion', "{0}, suggestion", item.suggestion.label);
@@ -679,7 +687,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 
 		const item = this.list.getFocusedElements()[0];
 
-		if (!item || !item.suggestion.documentation) {
+		if (!item || !canExpandCompletionItem(item)) {
 			return;
 		}
 
@@ -785,7 +793,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 	getHeight(element: ICompletionItem): number {
 		const focus = this.list.getFocusedElements()[0];
 
-		if (element.suggestion.documentation && element === focus) {
+		if (canExpandCompletionItem(element) && element === focus) {
 			return this.focusHeight;
 		}