Skip to content

Commit 607e77d

Browse files
saumitsAmazonsaumitsAmazon
committed
Normalising reference directories and paths in patch hunks
1 parent da4c460 commit 607e77d

File tree

51 files changed

+481
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+481
-481
lines changed

‎patches/common/allow-unused-vars.diff‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Index: AWSCodeOSS/build/private/code-editor-src/src/tsconfig.base.json
1+
Index: third-party-src/src/tsconfig.base.json
22
===================================================================
3-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/tsconfig.base.json
4-
+++ AWSCodeOSS/build/private/code-editor-src/src/tsconfig.base.json
3+
--- third-party-src.orig/src/tsconfig.base.json
4+
+++ third-party-src/src/tsconfig.base.json
55
@@ -6,7 +6,7 @@
66
"experimentalDecorators": true,
77
"noImplicitReturns": true,
@@ -11,10 +11,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/tsconfig.base.json
1111
"noUncheckedSideEffectImports": true,
1212
"allowUnreachableCode": false,
1313
"strict": true,
14-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
14+
Index: third-party-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
1515
===================================================================
16-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
17-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
16+
--- third-party-src.orig/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
17+
+++ third-party-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
1818
@@ -30,7 +30,7 @@ export interface IEndpointDetails {
1919
export class PreferencesSearchService extends Disposable implements IPreferencesSearchService {
2020
declare readonly _serviceBrand: undefined;
@@ -24,10 +24,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/prefere
2424
private _installedExtensions: Promise<ILocalExtension[]>;
2525
private _remoteSearchProvider: IRemoteSearchProvider | undefined;
2626
private _aiSearchProvider: IAiSearchProvider | undefined;
27-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
27+
Index: third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
2828
===================================================================
29-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
30-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
29+
--- third-party-src.orig/src/vs/workbench/contrib/remote/browser/tunnelView.ts
30+
+++ third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
3131
@@ -762,7 +762,7 @@ export class TunnelPanel extends ViewPan
3232
private protocolChangableContextKey: IContextKey<boolean>;
3333
private isEditing: boolean = false;

‎patches/common/disable-online-services.diff‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
1+
Index: third-party-src/src/vs/platform/update/common/update.config.contribution.ts
22
===================================================================
3-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
4-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
3+
--- third-party-src.orig/src/vs/platform/update/common/update.config.contribution.ts
4+
+++ third-party-src/src/vs/platform/update/common/update.config.contribution.ts
55
@@ -18,7 +18,7 @@ configurationRegistry.registerConfigurat
66
'update.mode': {
77
type: 'string',
@@ -29,10 +29,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/update/common/up
2929
scope: ConfigurationScope.APPLICATION,
3030
description: localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from a Microsoft online service."),
3131
tags: ['usesOnlineServices']
32-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
32+
Index: third-party-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
3333
===================================================================
34-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
35-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
34+
--- third-party-src.orig/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
35+
+++ third-party-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
3636
@@ -111,7 +111,7 @@ registry.registerConfiguration({
3737
'workbench.settings.enableNaturalLanguageSearch': {
3838
'type': 'boolean',
@@ -42,10 +42,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/prefere
4242
'scope': ConfigurationScope.WINDOW,
4343
'tags': ['usesOnlineServices']
4444
},
45-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
45+
Index: third-party-src/src/vs/workbench/services/assignment/common/assignmentService.ts
4646
===================================================================
47-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
48-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
47+
--- third-party-src.orig/src/vs/workbench/services/assignment/common/assignmentService.ts
48+
+++ third-party-src/src/vs/workbench/services/assignment/common/assignmentService.ts
4949
@@ -146,7 +146,7 @@ registry.registerConfiguration({
5050
'workbench.enableExperiments': {
5151
'type': 'boolean',

‎patches/common/disable-telemetry-service.diff‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ When pulling a new change from upstream, make sure to replace all .data.microsof
22
Otherwise the OSS will still ping microsoft, even if the telemetry is set to OFF.
33
See: https://github.com/VSCodium/vscodium/issues/26
44

5-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
5+
Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
66
===================================================================
7-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
8-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
7+
--- third-party-src.orig/src/vs/platform/telemetry/common/telemetryService.ts
8+
+++ third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
99
@@ -209,7 +209,7 @@ configurationRegistry.registerConfigurat
1010
'properties': {
1111
[TELEMETRY_SETTING_ID]: {
@@ -33,10 +33,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common
3333
'restricted': true,
3434
'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}#\``),
3535
'scope': ConfigurationScope.APPLICATION,
36-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
36+
Index: third-party-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
3737
===================================================================
38-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
39-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
38+
--- third-party-src.orig/src/vs/workbench/electron-sandbox/desktop.contribution.ts
39+
+++ third-party-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
4040
@@ -322,7 +322,7 @@ import { registerWorkbenchContribution2,
4141
'telemetry.enableCrashReporter': {
4242
'type': 'boolean',
@@ -46,10 +46,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/electron-sandbo
4646
'tags': ['usesOnlineServices', 'telemetry'],
4747
'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}#\``),
4848
}
49-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
49+
Index: third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
5050
===================================================================
51-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
52-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
51+
--- third-party-src.orig/src/vs/platform/telemetry/common/1dsAppender.ts
52+
+++ third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
5353
@@ -19,8 +19,8 @@ export interface IAppInsightsCore {
5454
unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
5555
}

‎patches/common/embedded-api.diff‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ received.
3434
src/vscode-dts/vscode.d.ts | 2 ++
3535
6 files changed, 47 insertions(+), 1 deletion(-)
3636

37-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
37+
Index: third-party-src/src/vs/workbench/api/browser/mainThreadWindow.ts
3838
===================================================================
39-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
40-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
39+
--- third-party-src.orig/src/vs/workbench/api/browser/mainThreadWindow.ts
40+
+++ third-party-src/src/vs/workbench/api/browser/mainThreadWindow.ts
4141
@@ -3,6 +3,7 @@
4242
* Licensed under the MIT License. See License.txt in the project root for license information.
4343
*--------------------------------------------------------------------------------------------*/
@@ -77,10 +77,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/browser/mai
7777
+ mainWindow.parent.postMessage(message, origin);
7878
+ }
7979
}
80-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
80+
Index: third-party-src/src/vs/workbench/api/common/extHost.api.impl.ts
8181
===================================================================
82-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
83-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
82+
--- third-party-src.orig/src/vs/workbench/api/common/extHost.api.impl.ts
83+
+++ third-party-src/src/vs/workbench/api/common/extHost.api.impl.ts
8484
@@ -690,6 +690,14 @@ export function createApiFactoryAndRegis
8585

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

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

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

157157
export const IExtHostWindow = createDecorator<IExtHostWindow>('IExtHostWindow');
158-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
158+
Index: third-party-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
159159
===================================================================
160-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
161-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
160+
--- third-party-src.orig/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
161+
+++ third-party-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
162162
@@ -44,7 +44,7 @@ export class ExtensionsProposedApi {
163163
for (const [k, value] of Object.entries(productService.extensionEnabledApiProposals)) {
164164
const key = ExtensionIdentifier.toKey(k);
@@ -168,10 +168,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/extens
168168
_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.`);
169169
return false;
170170
}
171-
Index: AWSCodeOSS/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
171+
Index: third-party-src/src/vscode-dts/vscode.d.ts
172172
===================================================================
173-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
174-
+++ AWSCodeOSS/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
173+
--- third-party-src.orig/src/vscode-dts/vscode.d.ts
174+
+++ third-party-src/src/vscode-dts/vscode.d.ts
175175
@@ -11000,6 +11000,8 @@ declare module 'vscode' {
176176
* asking for user input.
177177
*/

‎patches/common/heartbeat.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
1+
Index: third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
22
===================================================================
3-
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
4-
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
3+
--- third-party-src.orig/src/vs/server/node/remoteExtensionHostAgentServer.ts
4+
+++ third-party-src/src/vs/server/node/remoteExtensionHostAgentServer.ts
55
@@ -130,6 +130,13 @@ class RemoteExtensionHostAgentServer ext
66
pathname = pathname.substring(this._serverProductPath.length);
77
}

0 commit comments

Comments
 (0)