Skip to content

Normalising reference directories and paths in patch hunks #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saumitsAmazon merged 1 commit into from
Jul 4, 2025
Merged

Normalising reference directories and paths in patch hunks #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions patches/common/allow-unused-vars.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Index: AWSCodeOSS/build/private/code-editor-src/src/tsconfig.base.json
Index: third-party-src/src/tsconfig.base.json
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/tsconfig.base.json
+++ AWSCodeOSS/build/private/code-editor-src/src/tsconfig.base.json
--- third-party-src.orig/src/tsconfig.base.json
+++ third-party-src/src/tsconfig.base.json
@@ -6,7 +6,7 @@
"experimentalDecorators": true,
"noImplicitReturns": true,
Expand All @@ -11,10 +11,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/tsconfig.base.json
"noUncheckedSideEffectImports": true,
"allowUnreachableCode": false,
"strict": true,
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
Index: third-party-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
--- third-party-src.orig/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ third-party-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -30,7 +30,7 @@ export interface IEndpointDetails {
export class PreferencesSearchService extends Disposable implements IPreferencesSearchService {
declare readonly _serviceBrand: undefined;
Expand All @@ -24,10 +24,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/prefere
private _installedExtensions: Promise<ILocalExtension[]>;
private _remoteSearchProvider: IRemoteSearchProvider | undefined;
private _aiSearchProvider: IAiSearchProvider | undefined;
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
Index: third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
--- third-party-src.orig/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
@@ -762,7 +762,7 @@ export class TunnelPanel extends ViewPan
private protocolChangableContextKey: IContextKey<boolean>;
private isEditing: boolean = false;
Expand Down
18 changes: 9 additions & 9 deletions patches/common/disable-online-services.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
Index: third-party-src/src/vs/platform/update/common/update.config.contribution.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
--- third-party-src.orig/src/vs/platform/update/common/update.config.contribution.ts
+++ third-party-src/src/vs/platform/update/common/update.config.contribution.ts
@@ -18,7 +18,7 @@ configurationRegistry.registerConfigurat
'update.mode': {
type: 'string',
Expand Down Expand Up @@ -29,10 +29,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/update/common/up
scope: ConfigurationScope.APPLICATION,
description: localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from a Microsoft online service."),
tags: ['usesOnlineServices']
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
Index: third-party-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
--- third-party-src.orig/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ third-party-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
@@ -111,7 +111,7 @@ registry.registerConfiguration({
'workbench.settings.enableNaturalLanguageSearch': {
'type': 'boolean',
Expand All @@ -42,10 +42,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/prefere
'scope': ConfigurationScope.WINDOW,
'tags': ['usesOnlineServices']
},
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
Index: third-party-src/src/vs/workbench/services/assignment/common/assignmentService.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
--- third-party-src.orig/src/vs/workbench/services/assignment/common/assignmentService.ts
+++ third-party-src/src/vs/workbench/services/assignment/common/assignmentService.ts
@@ -146,7 +146,7 @@ registry.registerConfiguration({
'workbench.enableExperiments': {
'type': 'boolean',
Expand Down
18 changes: 9 additions & 9 deletions patches/common/disable-telemetry-service.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ When pulling a new change from upstream, make sure to replace all .data.microsof
Otherwise the OSS will still ping microsoft, even if the telemetry is set to OFF.
See: https://github.com/VSCodium/vscodium/issues/26

Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
--- third-party-src.orig/src/vs/platform/telemetry/common/telemetryService.ts
+++ third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
@@ -209,7 +209,7 @@ configurationRegistry.registerConfigurat
'properties': {
[TELEMETRY_SETTING_ID]: {
Expand Down Expand Up @@ -33,10 +33,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common
'restricted': true,
'markdownDeprecationMessage': localize('enableTelemetryDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated in favor of the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
'scope': ConfigurationScope.APPLICATION,
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
Index: third-party-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
--- third-party-src.orig/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ third-party-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -322,7 +322,7 @@ import { registerWorkbenchContribution2,
'telemetry.enableCrashReporter': {
'type': 'boolean',
Expand All @@ -46,10 +46,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/electron-sandbo
'tags': ['usesOnlineServices', 'telemetry'],
'markdownDeprecationMessage': localize('enableCrashReporterDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated due to being combined into the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
}
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
Index: third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
--- third-party-src.orig/src/vs/platform/telemetry/common/1dsAppender.ts
+++ third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -19,8 +19,8 @@ export interface IAppInsightsCore {
unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
}
Expand Down
36 changes: 18 additions & 18 deletions patches/common/embedded-api.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ received.
src/vscode-dts/vscode.d.ts | 2 ++
6 files changed, 47 insertions(+), 1 deletion(-)

Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
Index: third-party-src/src/vs/workbench/api/browser/mainThreadWindow.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
--- third-party-src.orig/src/vs/workbench/api/browser/mainThreadWindow.ts
+++ third-party-src/src/vs/workbench/api/browser/mainThreadWindow.ts
@@ -3,6 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
Expand Down Expand Up @@ -77,10 +77,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/browser/mai
+ mainWindow.parent.postMessage(message, origin);
+ }
}
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
Index: third-party-src/src/vs/workbench/api/common/extHost.api.impl.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
--- third-party-src.orig/src/vs/workbench/api/common/extHost.api.impl.ts
+++ third-party-src/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -690,6 +690,14 @@ export function createApiFactoryAndRegis

// namespace: window
Expand All @@ -96,10 +96,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extH
get activeTextEditor() {
return extHostEditors.getActiveTextEditor();
},
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
Index: third-party-src/src/vs/workbench/api/common/extHost.protocol.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
--- third-party-src.orig/src/vs/workbench/api/common/extHost.protocol.ts
+++ third-party-src/src/vs/workbench/api/common/extHost.protocol.ts
@@ -1744,6 +1744,7 @@ export interface MainThreadWindowShape e
$getInitialState(): Promise<{ isFocused: boolean; isActive: boolean }>;
$openUri(uri: UriComponents, uriString: string | undefined, options: IOpenUriOptions): Promise<boolean>;
Expand All @@ -116,10 +116,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extH
}

export interface ExtHostLogLevelServiceShape {
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
Index: third-party-src/src/vs/workbench/api/common/extHostWindow.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
--- third-party-src.orig/src/vs/workbench/api/common/extHostWindow.ts
+++ third-party-src/src/vs/workbench/api/common/extHostWindow.ts
@@ -26,6 +26,7 @@ export class ExtHostWindow implements Ex
private _proxy: MainThreadWindowShape;

Expand Down Expand Up @@ -155,10 +155,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extH
}

export const IExtHostWindow = createDecorator<IExtHostWindow>('IExtHostWindow');
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
Index: third-party-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
--- third-party-src.orig/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
+++ third-party-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
@@ -44,7 +44,7 @@ export class ExtensionsProposedApi {
for (const [k, value] of Object.entries(productService.extensionEnabledApiProposals)) {
const key = ExtensionIdentifier.toKey(k);
Expand All @@ -168,10 +168,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/extens
_logService.warn(`Via 'product.json#extensionEnabledApiProposals' extension '${key}' wants API proposal '${name}' but that proposal DOES NOT EXIST. Likely, the proposal has been finalized (check 'vscode.d.ts') or was abandoned.`);
return false;
}
Index: AWSCodeOSS/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
Index: third-party-src/src/vscode-dts/vscode.d.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
--- third-party-src.orig/src/vscode-dts/vscode.d.ts
+++ third-party-src/src/vscode-dts/vscode.d.ts
@@ -11000,6 +11000,8 @@ declare module 'vscode' {
* asking for user input.
*/
Expand Down
6 changes: 3 additions & 3 deletions patches/common/heartbeat.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
--- third-party-src.orig/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
@@ -130,6 +130,13 @@ class RemoteExtensionHostAgentServer ext
pathname = pathname.substring(this._serverProductPath.length);
}
Expand Down
Loading