Skip to content

Commit 3f52756

Browse files
authored
Fix cyclic dependency reporting in chat module (microsoft#269095)
* fix cyclic dependency in chat land * make sure cyclic dependencies are correctly reported when running complie-client task
1 parent 1445f02 commit 3f52756

7 files changed

Lines changed: 10 additions & 9 deletions

File tree

build/lib/tsb/builder.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/lib/tsb/builder.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,9 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
440440
messageText: `CYCLIC dependency: ${error}`
441441
});
442442
}
443+
delete oldErrors[filename];
443444
newErrors[filename] = cyclicDepErrors;
445+
cyclicDepErrors.forEach(d => onError(d));
444446
}
445447

446448
}).then(() => {

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,13 @@ import { IChatSessionItem, IChatSessionsService } from '../../common/chatSession
6666
import { ChatSessionUri } from '../../common/chatUri.js';
6767
import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from '../../common/chatViewModel.js';
6868
import { IChatWidgetHistoryService } from '../../common/chatWidgetHistoryService.js';
69-
import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
69+
import { ChatAgentLocation, ChatConfiguration, ChatModeKind, VIEWLET_ID } from '../../common/constants.js';
7070
import { ILanguageModelChatSelector, ILanguageModelsService } from '../../common/languageModels.js';
7171
import { CopilotUsageExtensionFeatureId } from '../../common/languageModelStats.js';
7272
import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
7373
import { ChatViewId, IChatWidget, IChatWidgetService, showChatView, showCopilotView } from '../chat.js';
7474
import { IChatEditorOptions } from '../chatEditor.js';
7575
import { ChatEditorInput, shouldShowClearEditingSessionConfirmation, showClearEditingSessionConfirmation } from '../chatEditorInput.js';
76-
import { VIEWLET_ID } from '../chatSessions/view/chatSessionsView.js';
7776
import { ChatViewPane } from '../chatViewPane.js';
7877
import { convertBufferToScreenshotVariable } from '../contrib/screenshot.js';
7978
import { clearChatEditor } from './chatClear.js';

src/vs/workbench/contrib/chat/browser/actions/chatSessionActions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ import { ChatContextKeys } from '../../common/chatContextKeys.js';
2828
import { IChatService } from '../../common/chatService.js';
2929
import { IChatSessionsService } from '../../common/chatSessionsService.js';
3030
import { ChatSessionUri } from '../../common/chatUri.js';
31-
import { ChatConfiguration } from '../../common/constants.js';
31+
import { ChatConfiguration, VIEWLET_ID } from '../../common/constants.js';
3232
import { ChatViewId, IChatWidgetService } from '../chat.js';
3333
import { IChatEditorOptions } from '../chatEditor.js';
3434
import { ChatEditorInput } from '../chatEditorInput.js';
3535
import { ChatSessionItemWithProvider, findExistingChatEditorByUri, isLocalChatSessionItem } from '../chatSessions/common.js';
3636
import { ChatViewPane } from '../chatViewPane.js';
3737
import { ACTION_ID_OPEN_CHAT, CHAT_CATEGORY } from './chatActions.js';
3838
import { CancellationToken } from '../../../../../base/common/cancellation.js';
39-
import { VIEWLET_ID } from '../chatSessions/view/chatSessionsView.js';
4039

4140
export interface IChatSessionContext {
4241
sessionId: string;

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ import { IChatAgentData, IChatAgentRequest, IChatAgentService } from '../common/
2323
import { ChatContextKeys } from '../common/chatContextKeys.js';
2424
import { ChatSession, ChatSessionStatus, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionsService } from '../common/chatSessionsService.js';
2525
import { ChatSessionUri } from '../common/chatUri.js';
26-
import { ChatAgentLocation, ChatModeKind } from '../common/constants.js';
26+
import { ChatAgentLocation, ChatModeKind, VIEWLET_ID } from '../common/constants.js';
2727
import { CHAT_CATEGORY } from './actions/chatActions.js';
2828
import { IChatEditorOptions } from './chatEditor.js';
2929
import { NEW_CHAT_SESSION_ACTION_ID } from './chatSessions/common.js';
30-
import { VIEWLET_ID } from './chatSessions/view/chatSessionsView.js';
3130

3231
const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatSessionsExtensionPoint[]>({
3332
extensionPoint: 'chatSessions',

src/vs/workbench/contrib/chat/browser/chatSessions/view/chatSessionsView.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ import { IChatEntitlementService } from '../../../../../services/chat/common/cha
2525
import { IExtensionService } from '../../../../../services/extensions/common/extensions.js';
2626
import { IWorkbenchLayoutService } from '../../../../../services/layout/browser/layoutService.js';
2727
import { IChatSessionsService, IChatSessionItemProvider, IChatSessionsExtensionPoint } from '../../../common/chatSessionsService.js';
28-
import { ChatConfiguration } from '../../../common/constants.js';
28+
import { ChatConfiguration, VIEWLET_ID } from '../../../common/constants.js';
2929
import { ACTION_ID_OPEN_CHAT } from '../../actions/chatActions.js';
3030
import { ChatSessionTracker } from '../chatSessionTracker.js';
3131
import { LocalChatSessionsProvider } from '../localChatSessionsProvider.js';
3232
import { SessionsViewPane } from './sessionsViewPane.js';
3333

34-
export const VIEWLET_ID = 'workbench.view.chat.sessions';
35-
3634
export class ChatSessionsView extends Disposable implements IWorkbenchContribution {
3735
static readonly ID = 'workbench.contrib.chatSessions';
3836

src/vs/workbench/contrib/chat/common/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,5 @@ export namespace ChatAgentLocation {
8686
export const ChatUnsupportedFileSchemes = new Set([Schemas.vscodeChatEditor, Schemas.walkThrough, Schemas.vscodeChatSession, 'ccreq']);
8787

8888
export const TodoListWidgetPositionSettingId = 'chat.todoListWidget.position';
89+
90+
export const VIEWLET_ID = 'workbench.view.chat.sessions';

0 commit comments

Comments
 (0)