Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add stuff for widget status #238508

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −13
Draft

add stuff for widget status #238508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export class SuggestWidgetStatus {
@IContextKeyService private _contextKeyService: IContextKeyService,
) {
this.element = dom.append(container, dom.$('.suggest-status-bar'));
console.log('SuggestWidgetStatus element', this.element);
console.log('SuggestWidgetStatus container', container);

const actionViewItemProvider = <IActionViewItemProvider>(action => {
return action instanceof MenuItemAction ? instantiationService.createInstance(TextOnlyMenuEntryActionViewItem, action, { useComma: true }) : undefined;
Expand Down
1 change: 1 addition & 0 deletions src/vs/platform/actions/common/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export class MenuId {
static readonly MenubarSwitchEditorMenu = new MenuId('MenubarSwitchEditorMenu');
static readonly MenubarSwitchGroupMenu = new MenuId('MenubarSwitchGroupMenu');
static readonly MenubarTerminalMenu = new MenuId('MenubarTerminalMenu');
static readonly MenubarTerminalSuggestStatusMenu = new MenuId('MenubarTerminalSuggestStatusMenu');
static readonly MenubarViewMenu = new MenuId('MenubarViewMenu');
static readonly MenubarHomeMenu = new MenuId('MenubarHomeMenu');
static readonly OpenEditorsContext = new MenuId('OpenEditorsContext');
Expand Down
4 changes: 4 additions & 0 deletions src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { PwshCompletionProviderAddon } from './pwshCompletionProviderAddon.js';
import { SimpleSuggestContext } from '../../../../services/suggest/browser/simpleSuggestWidget.js';
import { SuggestDetailsClassName } from '../../../../services/suggest/browser/simpleSuggestWidgetDetails.js';
import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
import { MenuId } from '../../../../../platform/actions/common/actions.js';

registerSingleton(ITerminalCompletionService, TerminalCompletionService, InstantiationType.Delayed);

Expand Down Expand Up @@ -326,6 +327,9 @@ registerActiveInstanceAction({
// Tab is bound to other workbench keybindings that this needs to beat
weight: KeybindingWeight.WorkbenchContrib + 1
},
menu: {
id: MenuId.MenubarTerminalSuggestStatusMenu
},
run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.acceptSelectedSuggestion()
});

Expand Down
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { TerminalShellType } from '../../../../../platform/terminal/common/termi
import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
import { ThemeIcon } from '../../../../../base/common/themables.js';
import { MenuId } from '../../../../../platform/actions/common/actions.js';

export interface ISuggestController {
isPasting: boolean;
Expand Down Expand Up @@ -408,7 +409,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
this._container!,
this._instantiationService.createInstance(PersistedWidgetSize),
() => fontInfo,
{}
{ statusBarMenuId: MenuId.MenubarTerminalSuggestStatusMenu },
));
this._suggestWidget.list.style(getListStyles({
listInactiveFocusBackground: editorSuggestWidgetSelectedBackground,
Expand Down
12 changes: 12 additions & 0 deletions src/vs/workbench/services/suggest/browser/media/suggest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,18 @@
display: flex;
}

.monaco-workbench .workbench-suggest-widget .suggest-status-bar {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copied from the editor's css file

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vscode/src/vs/editor/contrib/suggest/browser/media/suggest.css

Lines 41 to 51 in 478d09d

.monaco-editor .suggest-widget .suggest-status-bar {
box-sizing: border-box;
display: none;
flex-flow: row nowrap;
justify-content: space-between;
width: 100%;
font-size: 80%;
padding: 0 4px 0 4px;
border-top: 1px solid var(--vscode-editorSuggestWidget-border);
overflow: hidden;
}

box-sizing: border-box;
display: none;
flex-flow: row nowrap;
justify-content: space-between;
width: 100%;
font-size: 80%;
padding: 0 4px 0 4px;
border-top: 1px solid var(--vscode-editorSuggestWidget-border);
overflow: hidden;
}

.monaco-workbench .workbench-suggest-widget .suggest-status-bar .left {
padding-right: 8px;
}
Expand Down
28 changes: 16 additions & 12 deletions src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export class SimpleSuggestWidget extends Disposable {
private readonly _container: HTMLElement,
private readonly _persistedSize: IPersistedWidgetSizeDelegate,
private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo,
options: IWorkbenchSuggestWidgetOptions,
private readonly _options: IWorkbenchSuggestWidgetOptions,
@IInstantiationService instantiationService: IInstantiationService,
@IConfigurationService configurationService: IConfigurationService,
@IStorageService private readonly _storageService: IStorageService,
Expand Down Expand Up @@ -227,9 +227,10 @@ export class SimpleSuggestWidget extends Disposable {
this._details = this._register(new SimpleSuggestDetailsOverlay(details, this._listElement));
this._register(dom.addDisposableListener(this._details.widget.domNode, 'blur', (e) => this._onDidBlurDetails.fire(e)));

if (options.statusBarMenuId) {
this._status = this._register(instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, options.statusBarMenuId));
if (_options.statusBarMenuId) {
this._status = this._register(instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, _options.statusBarMenuId));
this.element.domNode.classList.toggle('with-status-bar', true);
console.log(dom.$('.workbench-suggest-widget.with-status-bar').querySelector('.suggest-status-bar'));
}

this._register(this._list.onMouseDown(e => this._onListMouseDownOrTap(e)));
Expand Down Expand Up @@ -470,27 +471,30 @@ export class SimpleSuggestWidget extends Disposable {
break;
case State.Open:
dom.hide(this._messageElement);
dom.show(this._listElement);
if (this._status) {
dom.show(this._status?.element);
dom.show(this._listElement, this._status?.element);
} else {
dom.show(this._listElement);
}
this._show();
break;
case State.Frozen:
dom.hide(this._messageElement);
dom.show(this._listElement);
if (this._status) {
dom.show(this._status?.element);
dom.show(this._listElement, this._status?.element);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is what the editor's one does

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

Line 493 in 478d09d

dom.show(this._listElement, this._status.element);

} else {
dom.show(this._listElement);
}
this._show();
break;
case State.Details:
dom.hide(this._messageElement);
dom.show(this._listElement);
if (this._status) {
dom.show(this._status?.element);
dom.show(this._listElement, this._status?.element);
} else {
dom.show(this._listElement);
}
// this._details.show();
this._details.show();
this._show();
break;
}
Expand Down Expand Up @@ -628,7 +632,7 @@ export class SimpleSuggestWidget extends Disposable {

// status bar
if (this._status) {
this._status.element.style.lineHeight = `${info.itemHeight}px`;
this._status.element.style.height = `${info.itemHeight}px`;
}

// if (this._state === State.Empty || this._state === State.Loading) {
Expand Down Expand Up @@ -749,7 +753,7 @@ export class SimpleSuggestWidget extends Disposable {
private _getLayoutInfo() {
const fontInfo = this._getFontInfo();
const itemHeight = clamp(Math.ceil(fontInfo.lineHeight), 8, 1000);
const statusBarHeight = 0; //!this.editor.getOption(EditorOption.suggest).showStatusBar || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight;
const statusBarHeight = !this._options.statusBarMenuId || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight;
const borderWidth = 1; //this._details.widget.borderWidth;
const borderHeight = 2 * borderWidth;

Expand Down
Loading