From b6b8c160ff3f93f4874a7c71d4908ed3ddbdd769 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 5 Jul 2018 09:14:50 +0200 Subject: [PATCH] review comments --- src/vs/base/parts/ipc/node/ipc.cp.ts | 1 + .../services/files/node/watcher/nsfw/nsfwWatcherService.ts | 2 +- .../services/files/node/watcher/nsfw/watcherService.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts index b81be1c3d74..38a8a96f813 100644 --- a/src/vs/base/parts/ipc/node/ipc.cp.ts +++ b/src/vs/base/parts/ipc/node/ipc.cp.ts @@ -242,6 +242,7 @@ export class Client implements IChannelClient, IDisposable { } dispose() { + this._onDidProcessExit.dispose(); this.disposeDelayer.cancel(); this.disposeDelayer = null; this.disposeClient(); diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts index 600fdc7c547..af8eb9b35b3 100644 --- a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts @@ -43,7 +43,7 @@ export class NsfwWatcherService implements IWatcherService { readonly onWatchEvent = this._onWatchEvent.event; watch(options: IWatcherOptions): Event { - this._verboseLogging = true; + this._verboseLogging = options.verboseLogging; return this.onWatchEvent; } diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts index 81d2b70d092..4cdf1a6ee94 100644 --- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts @@ -16,7 +16,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Schemas } from 'vs/base/common/network'; import { filterEvent } from 'vs/base/common/event'; -import { isError } from 'util'; +import { isError } from 'vs/base/common/errors'; export class FileWatcher { private static readonly MAX_RESTARTS = 5; -- GitLab