Fix loading user toolset files (microsoft#252058)

roblourens · web-flow · commit 3444f742b587 · 2025-06-21T17:47:09.000-07:00
Fix microsoft#252057
diff --git a/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts b/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts
@@ -237,7 +237,6 @@ export class UserToolSetsContributions extends Disposable implements IWorkbenchC
 			const entries = await getFilesInFolder(uri);
 
 			if (cts.token.isCancellationRequested) {
-				store.clear();
 				return;
 			}
 
@@ -263,8 +262,7 @@ export class UserToolSetsContributions extends Disposable implements IWorkbenchC
 				}
 
 				if (cts.token.isCancellationRequested) {
-					store.dispose();
-					break;
+					return;
 				}
 
 				for (const [name, value] of data.entries) {

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,6 @@ export class UserToolSetsContributions extends Disposable implements IWorkbenchC`
`237`	`237`	`const entries = await getFilesInFolder(uri);`
`238`	`238`
`239`	`239`	`if (cts.token.isCancellationRequested) {`
`240`		`- store.clear();`
`241`	`240`	`return;`
`242`	`241`	`}`
`243`	`242`
`@@ -263,8 +262,7 @@ export class UserToolSetsContributions extends Disposable implements IWorkbenchC`
`263`	`262`	`}`
`264`	`263`
`265`	`264`	`if (cts.token.isCancellationRequested) {`
`266`		`- store.dispose();`
`267`		`- break;`
	`265`	`+ return;`
`268`	`266`	`}`
`269`	`267`
`270`	`268`	`for (const [name, value] of data.entries) {`