summaryrefslogtreecommitdiff
path: root/editors/vscode/files
diff options
context:
space:
mode:
Diffstat (limited to 'editors/vscode/files')
-rw-r--r--editors/vscode/files/patch-build_gulpfile.vscode.js4
-rw-r--r--editors/vscode/files/patch-build_lib_layersChecker.ts4
-rw-r--r--editors/vscode/files/patch-build_npm_postinstall.js8
-rw-r--r--editors/vscode/files/patch-product.json6
-rw-r--r--editors/vscode/files/patch-src_main.js4
-rw-r--r--editors/vscode/files/patch-src_vs_base_common_platform.ts6
-rw-r--r--editors/vscode/files/patch-src_vs_code_electron-main_app.ts4
-rw-r--r--editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js20
-rw-r--r--editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts4
-rw-r--r--editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts4
-rw-r--r--editors/vscode/files/patch-test_automation_src_code.ts4
-rw-r--r--editors/vscode/files/patch-test_smoke_src_main.ts6
12 files changed, 38 insertions, 36 deletions
diff --git a/editors/vscode/files/patch-build_gulpfile.vscode.js b/editors/vscode/files/patch-build_gulpfile.vscode.js
index a39237a1c48b..6d949cf6de1c 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-06-17 12:10:36 UTC
+--- build/gulpfile.vscode.js.orig 2021-11-16 15:42:03 UTC
+++ build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName,
+@@ -293,7 +293,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-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts
index e7d03c3d44c4..e9f7a36a7178 100644
--- a/editors/vscode/files/patch-build_lib_layersChecker.ts
+++ b/editors/vscode/files/patch-build_lib_layersChecker.ts
@@ -1,6 +1,6 @@
---- build/lib/layersChecker.ts.orig 2021-03-30 12:04:46 UTC
+--- build/lib/layersChecker.ts.orig 2021-10-19 14:41:40 UTC
+++ build/lib/layersChecker.ts
-@@ -289,7 +289,7 @@ function checkFile(program: ts.Program, sourceFile: ts
+@@ -290,7 +290,7 @@ function checkFile(program: ts.Program, sourceFile: ts
function createProgram(tsconfigPath: string): ts.Program {
const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index 4e057d4aae3f..8961fc41dbc0 100644
--- a/editors/vscode/files/patch-build_npm_postinstall.js
+++ b/editors/vscode/files/patch-build_npm_postinstall.js
@@ -1,4 +1,4 @@
---- build/npm/postinstall.js.orig 2021-07-14 21:51:05 UTC
+--- build/npm/postinstall.js.orig 2021-09-22 11:45:58 UTC
+++ build/npm/postinstall.js
@@ -21,8 +21,9 @@ function yarnInstall(location, opts) {
const raw = process.env['npm_config_argv'] || '{}';
@@ -12,9 +12,11 @@
args.push('--ignore-engines');
delete opts.ignoreEngines;
}
-@@ -88,4 +89,4 @@ runtime "${runtime}"`;
+@@ -90,5 +91,5 @@ runtime "${runtime}"`;
yarnInstall(watchPath);
}
-cp.execSync('git config pull.rebase merges');
-+// cp.execSync('git config pull.rebase true');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
++// cp.execSync('git config pull.rebase merges');
++// cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/editors/vscode/files/patch-product.json b/editors/vscode/files/patch-product.json
index 2da3381a2b2f..42a096edcbc5 100644
--- a/editors/vscode/files/patch-product.json
+++ b/editors/vscode/files/patch-product.json
@@ -1,6 +1,6 @@
---- product.json.orig 2021-06-17 12:10:36 UTC
+--- product.json.orig 2021-11-16 15:42:03 UTC
+++ product.json
-@@ -31,6 +31,17 @@
+@@ -32,6 +32,17 @@
"GitHub.remotehub",
"GitHub.remotehub-insiders"
],
@@ -17,4 +17,4 @@
+ "tipsAndTricksUrl": "https://go.microsoft.com/fwlink/?linkid=852118",
"builtInExtensions": [
{
- "name": "ms-vscode.node-debug",
+ "name": "ms-vscode.references-view",
diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js
index 064248bef20b..675b4d00fba6 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-05-04 21:42:00 UTC
+--- src/main.js.orig 2021-09-22 11:45:58 UTC
+++ src/main.js
-@@ -152,7 +152,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
+@@ -163,7 +163,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 0920935c7dfb..e446bb704110 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-07-14 21:51:05 UTC
+--- src/vs/base/common/platform.ts.orig 2021-09-22 11:45:58 UTC
+++ src/vs/base/common/platform.ts
-@@ -103,7 +103,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -78,7 +78,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,7 +9,7 @@
_isWeb = true;
_locale = navigator.language;
_language = _locale;
-@@ -113,7 +113,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -88,7 +88,7 @@ if (typeof navigator === 'object' && !isElectronRender
else if (typeof nodeProcess === 'object') {
_isWindows = (nodeProcess.platform === 'win32');
_isMacintosh = (nodeProcess.platform === 'darwin');
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 697548c88d9a..2a88072d7d43 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-07-14 21:51:05 UTC
+--- src/vs/code/electron-main/app.ts.orig 2021-11-16 15:42:03 UTC
+++ src/vs/code/electron-main/app.ts
-@@ -490,7 +490,7 @@ export class CodeApplication extends Disposable {
+@@ -463,7 +463,7 @@ export class CodeApplication extends Disposable {
services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
break;
diff --git a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js
index c44ba9328c93..dd33dbc7d628 100644
--- a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js
+++ b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js
@@ -1,11 +1,11 @@
---- src/vs/platform/environment/node/userDataPath.js.orig 2021-05-04 21:42:00 UTC
+--- src/vs/platform/environment/node/userDataPath.js.orig 2021-08-18 23:34:31 UTC
+++ src/vs/platform/environment/node/userDataPath.js
-@@ -80,7 +80,7 @@
- case 'darwin':
- appDataPath = path.join(os.homedir(), 'Library', 'Application Support');
- break;
-- case 'linux':
-+ case 'linux': case 'freebsd':
- appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
- break;
- default:
+@@ -85,7 +85,7 @@
+ case 'darwin':
+ appDataPath = path.join(os.homedir(), 'Library', 'Application Support');
+ break;
+- case 'linux':
++ case 'linux': case 'freebsd':
+ appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
+ break;
+ default:
diff --git a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
index fa8de8b4bd75..587152993056 100644
--- a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
+++ b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
@@ -1,6 +1,6 @@
---- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2021-02-03 15:33:23 UTC
+--- src/vs/workbench/api/browser/mainThreadTask.ts.orig 2021-08-18 23:34:31 UTC
+++ src/vs/workbench/api/browser/mainThreadTask.ts
-@@ -651,7 +651,7 @@ export class MainThreadTask implements MainThreadTaskS
+@@ -650,7 +650,7 @@ export class MainThreadTask implements MainThreadTaskS
case 'darwin':
platform = Platform.Platform.Mac;
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 e93bff561ead..918f3ffda062 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-07-14 21:51:05 UTC
+--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2021-11-16 15:42:03 UTC
+++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
-@@ -1381,7 +1381,8 @@ export class ExtensionEditor extends EditorPane {
+@@ -1578,7 +1578,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_code.ts
index 28c91a9a4bf7..f2ec54c4342a 100644
--- a/editors/vscode/files/patch-test_automation_src_code.ts
+++ b/editors/vscode/files/patch-test_automation_src_code.ts
@@ -1,4 +1,4 @@
---- test/automation/src/code.ts.orig 2021-07-14 21:51:05 UTC
+--- 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 {
switch (process.platform) {
@@ -18,7 +18,7 @@
const product = require(path.join(root, 'resources', 'app', 'product.json'));
return path.join(root, product.applicationName);
}
-@@ -148,7 +148,7 @@ export async function spawn(options: SpawnOptions): Pr
+@@ -146,7 +146,7 @@ export async function spawn(options: SpawnOptions): Pr
'--driver', handle
];
diff --git a/editors/vscode/files/patch-test_smoke_src_main.ts b/editors/vscode/files/patch-test_smoke_src_main.ts
index dfcf4a0a4f1c..17e336b519be 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-07-14 21:51:05 UTC
+--- test/smoke/src/main.ts.orig 2021-09-22 11:45:58 UTC
+++ test/smoke/src/main.ts
-@@ -91,7 +91,7 @@ if (!opts.web) {
+@@ -101,7 +101,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`);
-@@ -104,7 +104,7 @@ if (!opts.web) {
+@@ -114,7 +114,7 @@ if (!opts.web) {
switch (process.platform) {
case 'darwin':
return path.join(root, 'Contents', 'MacOS', 'Electron');
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-29 09:51:55 +0000