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

Inline chat fixes #218318

Merged
merged 6 commits into from
Jun 26, 2024
Merged

Inline chat fixes #218318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b550e24
fix https://github.com/microsoft/vscode/issues/218059
jrieken Jun 26, 2024
d3fac76
Change enablement of "Toggle Changes" instead of visibility
jrieken Jun 26, 2024
799647a
have padding per part (actions, input, list)
jrieken Jun 26, 2024
dabf8be
fixes https://github.com/microsoft/vscode/issues/218021
jrieken Jun 26, 2024
e923319
fix notebook button groups for inline chat
jrieken Jun 26, 2024
5974ef5
tweak inline chat content widget when text btn are enabled
jrieken Jun 26, 2024
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: 1 addition & 1 deletion src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
// | value
// -----------------------------------------------------
const lhsContainer = dom.append(rowContainer, $('.column.left'));
const rhsContainer = dom.append(rowContainer, $('.column'));
const rhsContainer = dom.append(rowContainer, $('.column.right'));

headerParent = lhsContainer;
detailContainerParent = rhsContainer;
Expand Down
8 changes: 7 additions & 1 deletion src/vs/workbench/contrib/chat/browser/media/chat.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,14 @@
}

.interactive-item-container.minimal .column.left {
width: 20px;
padding-top: 2px;
display: inline-block;
flex-grow: 0;
}

.interactive-item-container.minimal .column.right {
display: inline-block;
flex-grow: 1;
}

.interactive-item-container.minimal .user > .username {
Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,9 +525,9 @@ export class ToggleDiffForChange extends AbstractInlineChatAction {
},
menu: {
id: MENU_INLINE_CHAT_WIDGET_STATUS,
group: 'more',
when: ContextKeyExpr.and(CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live), CTX_INLINE_CHAT_CHANGE_HAS_DIFF),
order: 10,
group: 'zzz',
when: ContextKeyExpr.and(CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)),
order: 1,
}
});
}
Expand Down
8 changes: 4 additions & 4 deletions src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ export class InlineChatContentWidget implements IContentWidget {
this._domNode.appendChild(this._inputContainer);

this._toolbarContainer.classList.add('toolbar');
if (!configurationService.getValue<boolean>(InlineChatConfigKeys.ExpTextButtons)) {
this._toolbarContainer.style.display = 'none';
this._domNode.style.paddingBottom = '6px';
if (configurationService.getValue<boolean>(InlineChatConfigKeys.ExpTextButtons)) {
this._toolbarContainer.style.display = 'inherit';
this._domNode.style.paddingBottom = '4px';
}
this._domNode.appendChild(this._toolbarContainer);

Expand Down Expand Up @@ -188,7 +188,6 @@ export class InlineChatContentWidget implements IContentWidget {
this._focusNext = true;

this._editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(position), ScrollType.Immediate);
this._widget.inputEditor.setValue('');

const wordInfo = this._editor.getModel()?.getWordAtPosition(position);

Expand All @@ -202,6 +201,7 @@ export class InlineChatContentWidget implements IContentWidget {
if (this._visible) {
this._visible = false;
this._editor.removeContentWidget(this);
this._widget.inputEditor.setValue('');
this._widget.saveState();
this._widget.setVisible(false);
}
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export class InlineChatWidget {
}

protected _getExtraHeight(): number {
return 4 /* padding */ + 2 /*border*/ + 12 /*shadow*/;
return 4 /* padding */ + 2 /*border*/ + 4 /*shadow*/;
}

updateProgress(show: boolean) {
Expand Down
18 changes: 13 additions & 5 deletions src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@

.monaco-workbench .inline-chat {
color: inherit;
padding: 0 8px;
border-radius: 4px;
border: 1px solid var(--vscode-inlineChat-border);
box-shadow: 0 2px 4px 0 var(--vscode-widget-shadow);
margin-top: 8px;
background: var(--vscode-inlineChat-background);
}

.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part {
padding: 4px 6px 0 6px;
}

.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar {
margin-bottom: 1px;
}
Expand All @@ -35,8 +37,10 @@
}

.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact {
padding: 2px 0;
gap: 6px;
padding-top: 2px;
padding-right: 20px;
padding-left: 6px;
}

.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar {
Expand All @@ -53,6 +57,10 @@
border: none;
}

.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal > .header {
right: 10px;
}

/* progress bit */

.monaco-workbench .inline-chat .progress {
Expand All @@ -66,10 +74,11 @@

/* status */

.monaco-workbench .inline-chat .status {
.monaco-workbench .inline-chat > .status {
display: flex;
justify-content: space-between;
align-items: center;
padding: 4px 6px 0 6px
}

.monaco-workbench .inline-chat .status .actions.hidden {
Expand Down Expand Up @@ -147,7 +156,6 @@

display: flex;
height: 18px;
padding: 3px 0; /* makes space for action focus borders: https://github.com/microsoft/vscode-copilot/issues/5814 */

.actions-container {
gap: 3px
Expand Down
7 changes: 6 additions & 1 deletion src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

.monaco-workbench .inline-chat-content-widget {
z-index: 50;
padding: 6px 6px 0px 6px;
padding: 6px;
border-radius: 4px;
background-color: var(--vscode-inlineChat-background);
box-shadow: 0 4px 8px var(--vscode-inlineChat-shadow);
Expand All @@ -23,3 +23,8 @@
.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part.compact {
padding: 0;
}

.monaco-workbench .inline-chat-content-widget.interactive-session .toolbar {
display: none;
padding-top: 4px;
}
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ registerAction2(class extends NotebookAction {
menu: [
{
id: MENU_CELL_CHAT_WIDGET_STATUS,
group: 'inline',
group: '0_main',
order: 0,
when: CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.Messages),
}
Expand Down Expand Up @@ -286,7 +286,7 @@ registerAction2(class extends NotebookAction {
},
menu: {
id: MENU_CELL_CHAT_WIDGET_STATUS,
group: 'main',
group: '0_main',
order: 1
},
f1: false
Expand Down
Loading