Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-28 08:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #176989 from microsoft/roblou/yawning-koi

Browse Source 
Fix command followup styling
This commit is contained in:
Rob Lourens
2023-03-13 14:12:39 -05:00
committed by GitHub
parent 8882465150 e73602cf76
commit a94a3b022c
7 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionFollowups.ts
+4 -3
View File
@@ -3,10 +3,10 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Disposable } from 'vs/base/common/lifecycle';
import * as dom from 'vs/base/browser/dom';
import { Button, IButtonStyles } from 'vs/base/browser/ui/button/button';
import { Disposable } from 'vs/base/common/lifecycle';
import { IInteractiveSessionFollowup } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService';
import { Button } from 'vs/base/browser/ui/button/button';
const $ = dom.$;
@@ -14,6 +14,7 @@ export class InteractiveSessionFollowups<T extends IInteractiveSessionFollowup>
constructor(
container: HTMLElement,
followups: T[],
private readonly options: IButtonStyles | undefined,
private readonly clickHandler: (followup: T) => void,
) {
super();
@@ -23,7 +24,7 @@ export class InteractiveSessionFollowups<T extends IInteractiveSessionFollowup>
}
private renderFollowup(container: HTMLElement, followup: T): void {
const button = this._register(new Button(container, { supportIcons: typeof followup !== 'string' }));
const button = this._register(new Button(container, { ...this.options, supportIcons: true }));
const label = followup.kind === 'reply' ?
'$(wand) ' + (followup.title || followup.message) :
followup.title;
src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionListRenderer.ts
+2
View File
@@ -37,6 +37,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { ILogService } from 'vs/platform/log/common/log';
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
@@ -231,6 +232,7 @@ export class InteractiveListItemRenderer extends Disposable implements ITreeRend
templateData.elementDisposables.add(new InteractiveSessionFollowups(
followupsContainer,
element.commandFollowups,
defaultButtonStyles,
followup => this.commandService.executeCommand(followup.commandId, ...(followup.args ?? []))));
}
}
src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget.ts
+6 -4
View File
@@ -112,7 +112,9 @@ export class InteractiveSessionWidget extends Disposable implements IInteractive
this.slashCommandsPromise = undefined;
this.lastSlashCommands = undefined;
this.getSlashCommands(); // start the refresh
this.getSlashCommands().then(() => {
this.onDidChangeItems();
});
this._onDidChangeViewModel.fire();
}
@@ -186,8 +188,8 @@ export class InteractiveSessionWidget extends Disposable implements IInteractive
this.tree.setChildren(null, treeItems, {
diffIdentityProvider: {
getId(element) {
return element.id;
getId: (element) => {
return element.id + `${isRequestVM(element) && !!this.lastSlashCommands ? '_scLoaded' : ''}`;
},
}
});
@@ -206,7 +208,7 @@ export class InteractiveSessionWidget extends Disposable implements IInteractive
dom.clearNode(this.followupsContainer);
if (items) {
this.followupsDisposables.add(new InteractiveSessionFollowups(this.followupsContainer, items, followup => this.acceptInput(followup.message)));
this.followupsDisposables.add(new InteractiveSessionFollowups(this.followupsContainer, items, undefined, followup => this.acceptInput(followup.message)));
}
if (this.bodyDimension) {
src/vs/workbench/contrib/interactiveSession/browser/media/interactiveSession.css
+11 -4
View File
@@ -226,10 +226,6 @@
.interactive-session .interactive-session-followups .monaco-button {
width: initial;
padding: 0px;
font-size: 11px;
font-weight: 600;
border: none;
color: var(--vscode-textLink-foreground);
justify-content: left;
@@ -240,6 +236,10 @@
margin-left: 0;
}
.interactive-session .interactive-response-followups .monaco-button {
padding: 4px 8px;
}
.interactive-session .interactive-input-part .interactive-input-followups {
padding: 0px 20px;
}
@@ -247,3 +247,10 @@
.interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups {
margin-bottom: 8px;
}
.interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups .monaco-button {
padding: 0px;
font-size: 11px;
font-weight: 600;
border: none;
}
src/vs/workbench/contrib/interactiveSession/common/interactiveSessionModel.ts
+4 -2
View File
@@ -143,6 +143,7 @@ export interface ISerializableInteractiveSessionRequestData {
message: string;
response: string | undefined;
responseErrorDetails: IInteractiveResponseErrorDetails | undefined;
followups: IInteractiveSessionFollowup[] | undefined;
}
export interface ISerializableInteractiveSessionData {
@@ -202,7 +203,7 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS
return requests.map((raw: ISerializableInteractiveSessionRequestData) => {
const request = new InteractiveRequestModel(raw.message, this.session.requesterUsername, this.session.requesterAvatarIconUri);
if (raw.response || raw.responseErrorDetails) {
request.response = new InteractiveResponseModel(new MarkdownString(raw.response), this.session.responderUsername, this.providerId, this.session.responderAvatarIconUri, true, raw.providerResponseId, raw.responseErrorDetails);
request.response = new InteractiveResponseModel(new MarkdownString(raw.response), this.session.responderUsername, this.providerId, this.session.responderAvatarIconUri, true, raw.providerResponseId, raw.responseErrorDetails, raw.followups);
}
return request;
});
@@ -275,7 +276,8 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS
providerResponseId: r.response?.providerResponseId,
message: r.message,
response: r.response ? r.response.response.value : undefined,
responseErrorDetails: r.response?.errorDetails
responseErrorDetails: r.response?.errorDetails,
followups: r.response?.followups
};
}),
providerId: this.providerId,
src/vs/workbench/contrib/interactiveSession/common/interactiveSessionService.ts
-1
View File
@@ -118,7 +118,6 @@ export interface IInteractiveSessionService {
acceptNewSessionState(sessionId: number, state: any): void;
addInteractiveRequest(context: any): void;
provideSuggestions(providerId: string, token: CancellationToken): Promise<string[] | undefined>;
// provideFollowups(sessionId: number, token: CancellationToken): Promise<IInteractiveSessionFollowup[] | undefined>;
onDidPerformUserAction: Event<IInteractiveSessionUserActionEvent>;
notifyUserAction(event: IInteractiveSessionUserActionEvent): void;
src/vs/workbench/contrib/interactiveSession/common/interactiveSessionServiceImpl.ts
+1 -20
View File
@@ -15,7 +15,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { ISerializableInteractiveSessionData, ISerializableInteractiveSessionsData, InteractiveSessionModel } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionModel';
import { IInteractiveProgress, IInteractiveProvider, IInteractiveSessionFollowup, IInteractiveSessionService, IInteractiveSessionUserActionEvent, IInteractiveSlashCommand } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService';
import { IInteractiveProgress, IInteractiveProvider, IInteractiveSessionService, IInteractiveSessionUserActionEvent, IInteractiveSlashCommand } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
const serializedInteractiveSessionKey = 'interactive.sessions';
@@ -72,25 +72,6 @@ export class InteractiveSessionService extends Disposable implements IInteractiv
}));
}
async provideFollowups(sessionId: number, token: CancellationToken): Promise<IInteractiveSessionFollowup[] | undefined> {
this.trace('provideFollowups', `sessionId: ${sessionId}`);
const model = this._sessionModels.get(sessionId);
if (!model) {
throw new Error(`Unknown session: ${sessionId}`);
}
const provider = this._providers.get(model.providerId);
if (!provider) {
throw new Error(`Unknown provider: ${model.providerId}`);
}
if (!provider.provideFollowups) {
return;
}
return withNullAsUndefined(await provider.provideFollowups(model.session, token));
}
notifyUserAction(action: IInteractiveSessionUserActionEvent): void {
this._onDidPerformUserAction.fire(action);
}