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

bob it...twist it...patch it

Browse Source
This commit is contained in:
Asher 2019-01-25 14:36:47 -06:00 committed by Kyle Carberry
parent 536ded2cc5
commit e43e7b36e7
No known key found for this signature in database
GPG Key ID: A0409BDB6B0B3EDB
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/vscode.patch
View File

@ -53,7 +53,7 @@ index a43d63aa51..4c6df2fcd9 100644
+++ b/src/vs/workbench/electron-browser/main.ts +++ b/src/vs/workbench/electron-browser/main.ts
@@ -147,13 +147,14 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> { @@ -147,13 +147,14 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
shell.open(); shell.open();
// Inform user about loading issues from the loader // Inform user about loading issues from the loader
- (<any>self).require.config({ - (<any>self).require.config({
- onError: err => { - onError: err => {
@ -73,6 +73,19 @@ index a43d63aa51..4c6df2fcd9 100644
}); });
}); });
}); });
diff --git a/src/vs/workbench/node/extensionHostProcess.ts b/src/vs/workbench/node/extensionHostProcess.ts
index 8d182d18d9..69d51e1aea 100644
--- a/src/vs/workbench/node/extensionHostProcess.ts
+++ b/src/vs/workbench/node/extensionHostProcess.ts
@@ -129,7 +129,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
// Kill oneself if one's parent dies. Much drama.
setInterval(function () {
try {
- process.kill(initData.parentPid, 0); // throws an exception if the main process doesn't exist anymore.
+ // process.kill(initData.parentPid, 0); // throws an exception if the main process doesn't exist anymore.
} catch (e) {
onTerminate();
}
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
index 7b4e8721ac..8f26dc2f28 100644 index 7b4e8721ac..8f26dc2f28 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts --- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts