File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
src/vs/workbench/contrib/chat/browser Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -490,7 +490,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
490
490
templateData . requestHover . classList . toggle ( 'hidden' , ! ! this . viewModel ?. editing && ! editing ) ;
491
491
templateData . requestHover . classList . toggle ( 'expanded' , this . configService . getValue < string > ( 'chat.editRequests' ) === 'hover' ) ;
492
492
templateData . elementDisposables . add ( dom . addDisposableListener ( templateData . rowContainer , dom . EventType . CLICK , ( ) => {
493
- if ( this . viewModel ?. editing && element . id !== this . viewModel . editing . id ) {
493
+ if ( this . viewModel ?. editing && element . id !== this . viewModel . editing . id && element === this . templateDataByRequestId . get ( element . id ) ?. currentElement ) {
494
494
this . _onDidFocusOutside . fire ( ) ;
495
495
}
496
496
} ) ) ;
Original file line number Diff line number Diff line change @@ -1088,13 +1088,15 @@ export class ChatWidget extends Disposable implements IChatWidget {
1088
1088
if ( ! isInput ) {
1089
1089
this . inputPart ?. toggleChatInputOverlay ( false ) ;
1090
1090
try {
1091
- editedRequest ?. rowContainer . removeChild ( this . inputContainer ) ;
1092
- } catch ( e ) {
1093
- if ( this . inputContainer . parentElement ) {
1091
+ if ( editedRequest ?. rowContainer && editedRequest . rowContainer . contains ( this . inputContainer ) ) {
1092
+ editedRequest . rowContainer . removeChild ( this . inputContainer ) ;
1093
+ } else if ( this . inputContainer . parentElement ) {
1094
1094
this . inputContainer . parentElement . removeChild ( this . inputContainer ) ;
1095
1095
}
1096
- this . inputContainer = null ! ;
1096
+ } catch ( e ) {
1097
+ this . logService . error ( 'Error occurred while finishing editing:' , e ) ;
1097
1098
}
1099
+ this . inputContainer = dom . $ ( '.empty-chat-state' ) ;
1098
1100
}
1099
1101
if ( isInput ) {
1100
1102
this . inputPart . element . classList . remove ( 'editing' ) ;
You can’t perform that action at this time.
0 commit comments