Skip to content

Commit 42685ee

Browse files
authored
Recover from bad settings migration (#7461)
Part of #7264
1 parent 1097702 commit 42685ee

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

src/view/treeNodes/workspaceFolderNode.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,18 @@ export class WorkspaceFolderNode extends TreeNode implements vscode.TreeItem {
8181
prsTreeModel: PrsTreeModel,
8282
copilotManager: CopilotRemoteAgentManager
8383
) {
84-
const queryCategories = (await WorkspaceFolderNode.getQueries(folderManager)).map(
85-
queryInfo => {
86-
if (isLocalQuery(queryInfo)) {
87-
return new CategoryTreeNode(parent, folderManager, telemetry, PRType.LocalPullRequest, notificationProvider, prsTreeModel, copilotManager);
88-
} else if (isAllQuery(queryInfo)) {
89-
return new CategoryTreeNode(parent, folderManager, telemetry, PRType.All, notificationProvider, prsTreeModel, copilotManager);
90-
}
91-
return new CategoryTreeNode(parent, folderManager, telemetry, PRType.Query, notificationProvider, prsTreeModel, copilotManager, queryInfo.label, queryInfo.query);
84+
const queries = await WorkspaceFolderNode.getQueries(folderManager);
85+
const queryCategories: Map<string, CategoryTreeNode> = new Map();
86+
for (const queryInfo of queries) {
87+
if (isLocalQuery(queryInfo)) {
88+
queryCategories.set(queryInfo.label, new CategoryTreeNode(parent, folderManager, telemetry, PRType.LocalPullRequest, notificationProvider, prsTreeModel, copilotManager));
89+
} else if (isAllQuery(queryInfo)) {
90+
queryCategories.set(queryInfo.label, new CategoryTreeNode(parent, folderManager, telemetry, PRType.All, notificationProvider, prsTreeModel, copilotManager));
91+
} else {
92+
queryCategories.set(queryInfo.label, new CategoryTreeNode(parent, folderManager, telemetry, PRType.Query, notificationProvider, prsTreeModel, copilotManager, queryInfo.label, queryInfo.query));
9293
}
93-
);
94-
return queryCategories;
94+
}
95+
96+
return Array.from(queryCategories.values());
9597
}
9698
}

0 commit comments

Comments
 (0)