Skip to content

Commit 6d4aeb9

Browse files
authored
Merge pull request microsoft#122895 from mjbvz/fix-122585
Fix first line being replaced in suggestion label
2 parents 35e5415 + 25cb0d2 commit 6d4aeb9

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/vs/editor/contrib/suggest/suggestWidgetRenderer.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,13 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
209209
if (typeof completion.label === 'string') {
210210
data.parametersLabel.textContent = '';
211211
data.qualifierLabel.textContent = '';
212-
data.detailsLabel.textContent = (completion.detail || '').replace(/\n.*$/m, '');
212+
data.detailsLabel.textContent = stripNewLines(completion.detail || '');
213213
data.root.classList.add('string-label');
214214
data.root.title = '';
215215
} else {
216-
data.parametersLabel.textContent = (completion.label.parameters || '').replace(/\n.*$/m, '');
217-
data.qualifierLabel.textContent = (completion.label.qualifier || '').replace(/\n.*$/m, '');
218-
data.detailsLabel.textContent = (completion.label.type || '').replace(/\n.*$/m, '');
216+
data.parametersLabel.textContent = stripNewLines(completion.label.parameters || '');
217+
data.qualifierLabel.textContent = stripNewLines(completion.label.qualifier || '');
218+
data.detailsLabel.textContent = stripNewLines(completion.label.type || '');
219219
data.root.classList.remove('string-label');
220220
data.root.title = `${element.textLabel}${completion.label.parameters ?? ''} ${completion.label.qualifier ?? ''} ${completion.label.type ?? ''}`;
221221
}
@@ -250,3 +250,7 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
250250
templateData.disposables.dispose();
251251
}
252252
}
253+
254+
function stripNewLines(str: string): string {
255+
return str.replace(/\r\n|\r|\n/g, '');
256+
}

0 commit comments

Comments
 (0)