Merge pull request microsoft#91781 from microsoft/fix/long-suggestion-handling

octref · web-flow · commit 3d23d67f33df · 2020-02-28T12:31:04.000-08:00
suggest: fix handling around long lines
diff --git a/src/vs/editor/contrib/suggest/media/suggest.css b/src/vs/editor/contrib/suggest/media/suggest.css
@@ -176,7 +176,7 @@
 }
 
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .left > .signature-label {
-	overflow: auto;
+	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
@@ -228,6 +228,7 @@
 
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .left {
 	flex-shrink: 1;
+	flex-grow: 1;
 	overflow: hidden;
 }
 .monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .left > .monaco-icon-label {
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -144,11 +144,10 @@ class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTemplateD
 		const text = append(container, $('.contents'));
 		const main = append(text, $('.main'));
 
+		data.iconContainer = append(main, $('.icon-label.codicon'));
 		data.left = append(main, $('span.left'));
 		data.right = append(main, $('span.right'));
 
-		data.iconContainer = append(data.left, $('.icon-label.codicon'));
-
 		data.iconLabel = new IconLabel(data.left, { supportHighlights: true, supportCodicons: true });
 		data.disposables.add(data.iconLabel);
 

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .left > .signature-label {`
`179`		`- overflow: auto;`
	`179`	`+ overflow: hidden;`
`180`	`180`	`text-overflow: ellipsis;`
`181`	`181`	`}`
`182`	`182`
`@@ -228,6 +228,7 @@`
`228`	`228`
`229`	`229`	`.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .left {`
`230`	`230`	`flex-shrink: 1;`
	`231`	`+ flex-grow: 1;`
`231`	`232`	`overflow: hidden;`
`232`	`233`	`}`
`233`	`234`	`.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .left > .monaco-icon-label {`