From e1101c195d8ef8a1c898acf3e41b027978a920b4 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 31 Jan 2019 16:19:12 -0600 Subject: [PATCH] Fix refactoring --- packages/ide/src/client.ts | 2 +- scripts/vscode.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/ide/src/client.ts b/packages/ide/src/client.ts index 038aa15d6..a189cda3f 100644 --- a/packages/ide/src/client.ts +++ b/packages/ide/src/client.ts @@ -5,7 +5,7 @@ import { retry } from "./retry"; import { upload } from "./upload"; import { client } from "./fill/client"; import { clipboard } from "./fill/clipboard"; -import { INotificationService, NotificationService, IProgressService, ProgressService } from "./fill/notification"; +import { INotificationService, IProgressService } from "./fill/notification"; import { IURIFactory } from "./fill/uri"; /** diff --git a/scripts/vscode.patch b/scripts/vscode.patch index c9be5a1cd..82192aa77 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -108,6 +108,20 @@ index 2bf7fe37d7..81cc668f12 100644 } catch (err) { errorback(err); +diff --git a/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts b/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts +index e3efb95b75..03e85113a0 100644 +--- a/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts ++++ b/src/vs/workbench/api/electron-browser/mainThreadHeapService.ts +@@ -55,6 +55,9 @@ export class HeapService implements IHeapService { + + private _doTrackRecursive(obj: any): Promise { + ++ // cannot control GC in the browser. ++ return Promise.resolve(obj); ++ + if (isNullOrUndefined(obj)) { + return Promise.resolve(obj); + } diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts index 38bf337a61..aae3a68ff5 100644 --- a/src/vs/workbench/browser/dnd.ts