ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 93309f060778f6480a7d2a13913e6e7c624e9bc7

Browse Source
This commit is contained in:
ADS Merger
2020-03-26 07:08:23 +00:00
parent 685e0ccf7e
commit f5134198e2
87 changed files with 942 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/editor/common/modes.ts
View File

@@ -417,9 +417,9 @@ export interface CompletionItemLabel {
name: string;
/**
* The signature without the return type. Render after `name`.
* The parameters without the return type. Render after `name`.
*/
signature?: string;
parameters?: string;
/**
* The fully qualified name, like package name or file path. Rendered after `signature`.

3
src/vs/editor/contrib/quickAccess/commandsQuickAccess.ts
View File

@@ -10,6 +10,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { stripCodicons } from 'vs/base/common/codicons';
export abstract class AbstractEditorCommandsQuickAccessProvider extends AbstractCommandsQuickAccessProvider {
@@ -40,7 +41,7 @@ export abstract class AbstractEditorCommandsQuickAccessProvider extends Abstract
editorCommandPicks.push({
commandId: editorAction.id,
commandAlias: editorAction.alias,
label: editorAction.label || editorAction.id,
label: stripCodicons(editorAction.label) || editorAction.id,
});
}

8
src/vs/editor/contrib/suggest/suggestWidget.ts
View File

@@ -63,7 +63,7 @@ interface ISuggestionTemplateData {
colorspan: HTMLElement;
iconLabel: IconLabel;
iconContainer: HTMLElement;
signatureLabel: HTMLElement;
parametersLabel: HTMLElement;
qualifierLabel: HTMLElement;
/**
* Showing either `CompletionItem#details` or `CompletionItemLabel#type`
@@ -151,7 +151,7 @@ class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTemplateD
data.iconLabel = new IconLabel(data.left, { supportHighlights: true, supportCodicons: true });
data.disposables.add(data.iconLabel);
data.signatureLabel = append(data.left, $('span.signature-label'));
data.parametersLabel = append(data.left, $('span.signature-label'));
data.qualifierLabel = append(data.left, $('span.qualifier-label'));
data.detailsLabel = append(data.right, $('span.details-label'));
@@ -239,12 +239,12 @@ class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTemplateD
data.iconLabel.setLabel(textLabel, undefined, labelOptions);
if (typeof suggestion.label === 'string') {
data.signatureLabel.textContent = '';
data.parametersLabel.textContent = '';
data.qualifierLabel.textContent = '';
data.detailsLabel.textContent = (suggestion.detail || '').replace(/\n.*$/m, '');
addClass(data.root, 'string-label');
} else {
data.signatureLabel.textContent = (suggestion.label.signature || '').replace(/\n.*$/m, '');
data.parametersLabel.textContent = (suggestion.label.parameters || '').replace(/\n.*$/m, '');
data.qualifierLabel.textContent = (suggestion.label.qualifier || '').replace(/\n.*$/m, '');
data.detailsLabel.textContent = (suggestion.label.type || '').replace(/\n.*$/m, '');
removeClass(data.root, 'string-label');