Skip to content

Commit c588c74

Browse files
committed
Use our retry for the watcher
1 parent 6799b78 commit c588c74

File tree

2 files changed

+40
-0
lines changed

2 files changed

+40
-0
lines changed

packages/vscode/src/workbench.ts

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import { ServiceCollection } from "vs/platform/instantiation/common/serviceColle
3030
import { URI } from "vs/base/common/uri";
3131

3232
export class Workbench {
33+
public readonly retry = client.retry;
34+
3335
private readonly windowId = parseInt(new Date().toISOString().replace(/[-:.TZ]/g, ""), 10);
3436
private _serviceCollection: ServiceCollection | undefined;
3537
private _clipboardContextKey: RawContextKey<boolean> | undefined;

scripts/vscode.patch

+38
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,44 @@ index 484cef9..f728fc8 100644
921921
@@ -137 +137 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
922922
- process.kill(initData.parentPid, 0); // throws an exception if the main process doesn't exist anymore.
923923
+ // process.kill(initData.parentPid, 0); // throws an exception if the main process doesn't exist anymore.
924+
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
925+
index ca03fc9..b8befc8 100644
926+
--- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
927+
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts
928+
@@ -18,0 +19 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
929+
+const retry = (require('vs/../../../../packages/vscode/src/workbench') as typeof import ('vs/../../../../packages/vscode/src/workbench')).workbench.retry;
930+
@@ -35,0 +37 @@ export class FileWatcher {
931+
+ retry.register('Watcher', () => this.startWatching());
932+
@@ -56,0 +59 @@ export class FileWatcher {
933+
+ return retry.run('Watcher');
934+
@@ -113 +116 @@ export class FileWatcher {
935+
- }));
936+
+ })).then(() => retry.recover('Watcher'));
937+
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
938+
index 7e3a324..0bc5aac 100644
939+
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
940+
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
941+
@@ -18,0 +19 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
942+
+const retry = (require('vs/../../../../packages/vscode/src/workbench') as typeof import ('vs/../../../../packages/vscode/src/workbench')).workbench.retry;
943+
@@ -36,0 +38 @@ export class FileWatcher {
944+
+ retry.register('Watcher', () => this.startWatching());
945+
@@ -59,0 +62 @@ export class FileWatcher {
946+
+ return retry.run('Watcher');
947+
@@ -116 +119 @@ export class FileWatcher {
948+
- }));
949+
+ })).then(() => retry.recover('Watcher'));
950+
diff --git a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
951+
index 74dad64..34cd83b 100644
952+
--- a/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
953+
+++ b/src/vs/workbench/services/files/node/watcher/win32/csharpWatcherService.ts
954+
@@ -14,0 +15 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
955+
+const retry = (require('vs/../../../../packages/vscode/src/workbench') as typeof import ('vs/../../../../packages/vscode/src/workbench')).workbench.retry;
956+
@@ -40,0 +42 @@ export class OutOfProcessWin32FolderWatcher {
957+
+ retry.register('Watcher', () => this.startWatcher());
958+
@@ -52,0 +55 @@ export class OutOfProcessWin32FolderWatcher {
959+
+ this.handle.stdout.once('data', () => retry.recover('Watcher'));
960+
@@ -110,0 +114 @@ export class OutOfProcessWin32FolderWatcher {
961+
+ return retry.run('Watcher');
924962
diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
925963
index 3c78990..545d91a 100644
926964
--- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts

0 commit comments

Comments
 (0)