diff options
Diffstat (limited to 'editors/vscode/files')
| -rw-r--r-- | editors/vscode/files/patch-build_gulpfile.extensions.js | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-build_gulpfile.vscode.js | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_main.js | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_vs_base_common_platform.ts | 8 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_vs_base_node_ps.ts | 6 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_vs_code_electron-main_app.ts | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts | 4 | ||||
| -rw-r--r-- | editors/vscode/files/patch-test_automation_src_electronDriver.ts (renamed from editors/vscode/files/patch-test_automation_src_code.ts) | 26 | ||||
| -rw-r--r-- | editors/vscode/files/patch-test_smoke_src_main.ts | 6 |
9 files changed, 33 insertions, 33 deletions
diff --git a/editors/vscode/files/patch-build_gulpfile.extensions.js b/editors/vscode/files/patch-build_gulpfile.extensions.js index c44e3efd968b..6c394089ed93 100644 --- a/editors/vscode/files/patch-build_gulpfile.extensions.js +++ b/editors/vscode/files/patch-build_gulpfile.extensions.js @@ -1,6 +1,6 @@ ---- build/gulpfile.extensions.js.orig 2021-07-14 21:51:05 UTC +--- build/gulpfile.extensions.js.orig 2021-12-06 21:35:50 UTC +++ build/gulpfile.extensions.js -@@ -218,7 +218,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex +@@ -220,7 +220,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series( cleanExtensionsBuildTask, task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))), diff --git a/editors/vscode/files/patch-build_gulpfile.vscode.js b/editors/vscode/files/patch-build_gulpfile.vscode.js index 6d949cf6de1c..2ea90b5911d4 100644 --- a/editors/vscode/files/patch-build_gulpfile.vscode.js +++ b/editors/vscode/files/patch-build_gulpfile.vscode.js @@ -1,6 +1,6 @@ ---- build/gulpfile.vscode.js.orig 2021-11-16 15:42:03 UTC +--- build/gulpfile.vscode.js.orig 2021-12-06 21:35:50 UTC +++ build/gulpfile.vscode.js -@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, +@@ -295,7 +295,7 @@ function packageTask(platform, arch, sourceFolderName, .pipe(util.skipDirectories()) .pipe(util.fixWin32DirectoryPermissions()) .pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523 diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js index 675b4d00fba6..01e601c84cfb 100644 --- a/editors/vscode/files/patch-src_main.js +++ b/editors/vscode/files/patch-src_main.js @@ -1,6 +1,6 @@ ---- src/main.js.orig 2021-09-22 11:45:58 UTC +--- src/main.js.orig 2021-12-06 21:35:50 UTC +++ src/main.js -@@ -163,7 +163,7 @@ function configureCommandlineSwitchesSync(cliArgs) { +@@ -161,7 +161,7 @@ function configureCommandlineSwitchesSync(cliArgs) { 'force-color-profile' ]; diff --git a/editors/vscode/files/patch-src_vs_base_common_platform.ts b/editors/vscode/files/patch-src_vs_base_common_platform.ts index e446bb704110..98d82e86a3a6 100644 --- a/editors/vscode/files/patch-src_vs_base_common_platform.ts +++ b/editors/vscode/files/patch-src_vs_base_common_platform.ts @@ -1,6 +1,6 @@ ---- src/vs/base/common/platform.ts.orig 2021-09-22 11:45:58 UTC +--- src/vs/base/common/platform.ts.orig 2021-12-06 21:35:50 UTC +++ src/vs/base/common/platform.ts -@@ -78,7 +78,7 @@ if (typeof navigator === 'object' && !isElectronRender +@@ -79,7 +79,7 @@ if (typeof navigator === 'object' && !isElectronRender _isWindows = _userAgent.indexOf('Windows') >= 0; _isMacintosh = _userAgent.indexOf('Macintosh') >= 0; _isIOS = (_userAgent.indexOf('Macintosh') >= 0 || _userAgent.indexOf('iPad') >= 0 || _userAgent.indexOf('iPhone') >= 0) && !!navigator.maxTouchPoints && navigator.maxTouchPoints > 0; @@ -9,12 +9,12 @@ _isWeb = true; _locale = navigator.language; _language = _locale; -@@ -88,7 +88,7 @@ if (typeof navigator === 'object' && !isElectronRender +@@ -89,7 +89,7 @@ if (typeof navigator === 'object' && !isElectronRender else if (typeof nodeProcess === 'object') { _isWindows = (nodeProcess.platform === 'win32'); _isMacintosh = (nodeProcess.platform === 'darwin'); - _isLinux = (nodeProcess.platform === 'linux'); + _isLinux = (nodeProcess.platform === 'linux' || nodeProcess.platform === 'freebsd'); _isLinuxSnap = _isLinux && !!nodeProcess.env['SNAP'] && !!nodeProcess.env['SNAP_REVISION']; + _isElectron = isElectronProcess; _locale = LANGUAGE_DEFAULT; - _language = LANGUAGE_DEFAULT; diff --git a/editors/vscode/files/patch-src_vs_base_node_ps.ts b/editors/vscode/files/patch-src_vs_base_node_ps.ts index 50e46e08dc9e..228b4599fc04 100644 --- a/editors/vscode/files/patch-src_vs_base_node_ps.ts +++ b/editors/vscode/files/patch-src_vs_base_node_ps.ts @@ -1,6 +1,6 @@ ---- src/vs/base/node/ps.ts.orig 2021-04-06 08:03:34 UTC +--- src/vs/base/node/ps.ts.orig 2021-12-06 21:35:50 UTC +++ src/vs/base/node/ps.ts -@@ -205,7 +205,7 @@ export function listProcesses(rootPid: number): Promis +@@ -214,7 +214,7 @@ export function listProcesses(rootPid: number): Promis exec('which ps', {}, (err, stdout, stderr) => { if (err || stderr) { @@ -9,7 +9,7 @@ reject(err || new Error(stderr.toString())); } else { const cmd = JSON.stringify(FileAccess.asFileUri('vs/base/node/ps.sh', require).fsPath); -@@ -220,7 +220,8 @@ export function listProcesses(rootPid: number): Promis +@@ -229,7 +229,8 @@ export function listProcesses(rootPid: number): Promis } } else { const ps = stdout.toString().trim(); diff --git a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts index 2a88072d7d43..05301d93dcf9 100644 --- a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts +++ b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts @@ -1,6 +1,6 @@ ---- src/vs/code/electron-main/app.ts.orig 2021-11-16 15:42:03 UTC +--- src/vs/code/electron-main/app.ts.orig 2021-12-06 21:35:50 UTC +++ src/vs/code/electron-main/app.ts -@@ -463,7 +463,7 @@ export class CodeApplication extends Disposable { +@@ -465,7 +465,7 @@ export class CodeApplication extends Disposable { services.set(IUpdateService, new SyncDescriptor(Win32UpdateService)); break; diff --git a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts index 918f3ffda062..146544c14b93 100644 --- a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts +++ b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts @@ -1,6 +1,6 @@ ---- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2021-11-16 15:42:03 UTC +--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2021-12-06 21:35:50 UTC +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts -@@ -1578,7 +1578,8 @@ export class ExtensionEditor extends EditorPane { +@@ -1743,7 +1743,8 @@ export class ExtensionEditor extends EditorPane { switch (platform) { case 'win32': key = rawKeyBinding.win; break; diff --git a/editors/vscode/files/patch-test_automation_src_code.ts b/editors/vscode/files/patch-test_automation_src_electronDriver.ts index f2ec54c4342a..df804e61123d 100644 --- a/editors/vscode/files/patch-test_automation_src_code.ts +++ b/editors/vscode/files/patch-test_automation_src_electronDriver.ts @@ -1,6 +1,15 @@ ---- test/automation/src/code.ts.orig 2021-08-18 23:34:31 UTC -+++ test/automation/src/code.ts -@@ -24,7 +24,7 @@ function getDevElectronPath(): string { +--- test/automation/src/electronDriver.ts.orig 2021-12-09 06:41:16 UTC ++++ test/automation/src/electronDriver.ts +@@ -39,7 +39,7 @@ export async function launch(codePath: string | undefi + '--driver', driverIPCHandle + ]; + +- if (process.platform === 'linux') { ++ if (process.platform === 'linux' || process.platform === 'freebsd') { + args.push('--disable-gpu'); // Linux has trouble in VMs to render properly with GPU enabled + } + +@@ -148,7 +148,7 @@ function getDevElectronPath(): string { switch (process.platform) { case 'darwin': return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); @@ -9,7 +18,7 @@ return path.join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return path.join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -37,7 +37,7 @@ function getBuildElectronPath(root: string): string { +@@ -161,7 +161,7 @@ function getBuildElectronPath(root: string): string { switch (process.platform) { case 'darwin': return path.join(root, 'Contents', 'MacOS', 'Electron'); @@ -18,12 +27,3 @@ const product = require(path.join(root, 'resources', 'app', 'product.json')); return path.join(root, product.applicationName); } -@@ -146,7 +146,7 @@ export async function spawn(options: SpawnOptions): Pr - '--driver', handle - ]; - -- if (process.platform === 'linux') { -+ if (process.platform === 'linux' || process.platform === 'freebsd') { - args.push('--disable-gpu'); // Linux has trouble in VMs to render properly with GPU enabled - } - diff --git a/editors/vscode/files/patch-test_smoke_src_main.ts b/editors/vscode/files/patch-test_smoke_src_main.ts index 17e336b519be..5a502f330173 100644 --- a/editors/vscode/files/patch-test_smoke_src_main.ts +++ b/editors/vscode/files/patch-test_smoke_src_main.ts @@ -1,6 +1,6 @@ ---- test/smoke/src/main.ts.orig 2021-09-22 11:45:58 UTC +--- test/smoke/src/main.ts.orig 2021-12-06 21:35:50 UTC +++ test/smoke/src/main.ts -@@ -101,7 +101,7 @@ if (!opts.web) { +@@ -109,7 +109,7 @@ if (!opts.web) { switch (process.platform) { case 'darwin': return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); @@ -9,7 +9,7 @@ return path.join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return path.join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -114,7 +114,7 @@ if (!opts.web) { +@@ -122,7 +122,7 @@ if (!opts.web) { switch (process.platform) { case 'darwin': return path.join(root, 'Contents', 'MacOS', 'Electron'); |