OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix refactoring

Browse Source
This commit is contained in:
Asher 2019-01-31 16:19:12 -06:00 committed by Kyle Carberry
parent c594af4396
commit e1101c195d
No known key found for this signature in database
GPG Key ID: A0409BDB6B0B3EDB
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/ide/src/client.ts
View File

@ -5,7 +5,7 @@ import { retry } from "./retry";
import { upload } from "./upload"; import { upload } from "./upload";
import { client } from "./fill/client"; import { client } from "./fill/client";
import { clipboard } from "./fill/clipboard"; import { clipboard } from "./fill/clipboard";
import { INotificationService, NotificationService, IProgressService, ProgressService } from "./fill/notification"; import { INotificationService, IProgressService } from "./fill/notification";
import { IURIFactory } from "./fill/uri"; import { IURIFactory } from "./fill/uri";
/** /**

14
scripts/vscode.patch
View File

@ -108,6 +108,20 @@ index 2bf7fe37d7..81cc668f12 100644
} }
catch (err) { catch (err) {
errorback(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<any> {
+ // 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 diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
index 38bf337a61..aae3a68ff5 100644 index 38bf337a61..aae3a68ff5 100644
--- a/src/vs/workbench/browser/dnd.ts --- a/src/vs/workbench/browser/dnd.ts