Skip to content

Update to v1.101.0 #9

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
skazantsev merged 1 commit into from
Jul 1, 2025
Merged

Update to v1.101.0 #9

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
1,598 changes: 1,409 additions & 189 deletions LICENSE-THIRD-PARTY
View file
Open in desktop

Large diffs are not rendered by default.

1,598 changes: 1,409 additions & 189 deletions overrides/LICENSE-THIRD-PARTY
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions patches/common/allow-unused-vars.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,15 @@ Index: AWSCodeOSS/build/private/code-editor-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
@@ -5,7 +5,7 @@
@@ -6,7 +6,7 @@
"experimentalDecorators": true,
"noImplicitReturns": true,
"noImplicitOverride": true,
- "noUnusedLocals": true,
+ "noUnusedLocals": false,
"noUncheckedSideEffectImports": true,
"allowUnreachableCode": false,
"strict": true,
"exactOptionalPropertyTypes": false,
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/editor/test/node/classification/typescript.test.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/editor/test/node/classification/typescript.test.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/editor/test/node/classification/typescript.test.ts
@@ -108,7 +108,7 @@ function parseTest(fileName: string): IT
return { content, assertions };
}

-// @ts-expect-error
+// @ts-ignore
function executeTest(fileName: string, parseFunc: IParseFunc): void {
const { content, assertions } = parseTest(fileName);
const actual = parseFunc(content);
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
Expand All @@ -36,4 +23,17 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/contrib/prefere
+ // @ts-ignore disable remote search for now, ref https://github.com/microsoft/vscode/issues/172411
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
===================================================================
--- 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
@@ -762,7 +762,7 @@ export class TunnelPanel extends ViewPan
private protocolChangableContextKey: IContextKey<boolean>;
private isEditing: boolean = false;
// TODO: Should this be removed?
- //@ts-expect-error
+ //@ts-ignore
private titleActions: IAction[] = [];
private lastFocus: number[] = [];

10 changes: 5 additions & 5 deletions patches/common/disable-telemetry-service.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common
===================================================================
--- 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
@@ -208,7 +208,7 @@ Registry.as<IConfigurationRegistry>(Exte
@@ -209,7 +209,7 @@ configurationRegistry.registerConfigurat
'properties': {
[TELEMETRY_SETTING_ID]: {
'type': 'string',
Expand All @@ -15,16 +15,16 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/platform/telemetry/common
'enumDescriptions': [
localize('telemetry.telemetryLevel.default', "Sends usage data, errors, and crash reports."),
localize('telemetry.telemetryLevel.error', "Sends general error telemetry and crash reports."),
@@ -216,7 +216,7 @@ Registry.as<IConfigurationRegistry>(Exte
@@ -217,7 +217,7 @@ configurationRegistry.registerConfigurat
localize('telemetry.telemetryLevel.off', "Disables all product telemetry.")
],
'markdownDescription': getTelemetryLevelSettingDescription(),
- 'default': TelemetryConfiguration.ON,
+ 'default': TelemetryConfiguration.OFF,
'restricted': true,
'scope': ConfigurationScope.APPLICATION,
'tags': ['usesOnlineServices', 'telemetry']
@@ -237,7 +237,7 @@ Registry.as<IConfigurationRegistry>(Exte
'tags': ['usesOnlineServices', 'telemetry'],
@@ -243,7 +243,7 @@ configurationRegistry.registerConfigurat
!product.privacyStatementUrl ?
localize('telemetry.enableTelemetry', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made.", product.nameLong) :
localize('telemetry.enableTelemetryMd', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made. [Read more]({1}) about what we collect and our privacy statement.", product.nameLong, product.privacyStatementUrl),
Expand All @@ -37,7 +37,7 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/electron-sandbo
===================================================================
--- 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
@@ -296,7 +296,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL
@@ -322,7 +322,7 @@ import { registerWorkbenchContribution2,
'telemetry.enableCrashReporter': {
'type': 'boolean',
'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),
Expand Down
62 changes: 31 additions & 31 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: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
===================================================================
--- VSCodeEmbedded.orig/build/private/code-editor-src/src/vs/workbench/api/browser/mainThreadWindow.ts
+++ VSCodeEmbedded/build/private/code-editor-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
@@ -3,6 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
Expand All @@ -46,10 +46,10 @@ Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/browser
import { Event } from '../../../base/common/event.js';
import { DisposableStore } from '../../../base/common/lifecycle.js';
import { URI, UriComponents } from '../../../base/common/uri.js';
@@ -29,6 +30,17 @@ export class MainThreadWindow implements
Event.latch(hostService.onDidChangeFocus)
@@ -31,6 +32,17 @@ export class MainThreadWindow implements
(this.proxy.$onDidChangeWindowFocus, this.proxy, this.disposables);
userActivityService.onDidChangeIsActive(this.proxy.$onDidChangeWindowActive, this.proxy, this.disposables);
this.registerNativeHandle();
+
+ mainWindow.addEventListener('message', (e) => {
+ if (e.origin !== this.getOrigin() || e.source !== mainWindow.parent) {
Expand All @@ -64,7 +64,7 @@ Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/browser
}

dispose(): void {
@@ -63,4 +75,12 @@ export class MainThreadWindow implements
@@ -76,4 +88,12 @@ export class MainThreadWindow implements
const result = await this.openerService.resolveExternalUri(URI.revive(uriComponents), options);
return result.resolved;
}
Expand All @@ -77,11 +77,11 @@ Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/browser
+ mainWindow.parent.postMessage(message, origin);
+ }
}
Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
===================================================================
--- VSCodeEmbedded.orig/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
+++ VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -676,6 +676,14 @@ export function createApiFactoryAndRegis
--- 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
@@ -690,6 +690,14 @@ export function createApiFactoryAndRegis

// namespace: window
const window: typeof vscode.window = {
Expand All @@ -96,47 +96,47 @@ Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/common/
get activeTextEditor() {
return extHostEditors.getActiveTextEditor();
},
Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
===================================================================
--- VSCodeEmbedded.orig/build/private/code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
+++ VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/common/extHost.protocol.ts
@@ -1698,6 +1698,7 @@ export interface MainThreadWindowShape e
--- 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
@@ -1744,6 +1744,7 @@ export interface MainThreadWindowShape e
$getInitialState(): Promise<{ isFocused: boolean; isActive: boolean }>;
$openUri(uri: UriComponents, uriString: string | undefined, options: IOpenUriOptions): Promise<boolean>;
$asExternalUri(uri: UriComponents, options: IOpenUriOptions): Promise<UriComponents>;
+ $sendMessage(message: any): void;
}

export enum CandidatePortSource {
@@ -2556,6 +2557,7 @@ export interface ExtHostDecorationsShape
export interface ExtHostWindowShape {
@@ -2721,6 +2722,7 @@ export interface ExtHostWindowShape {
$onDidChangeWindowFocus(value: boolean): void;
$onDidChangeWindowActive(value: boolean): void;
$onDidChangeActiveNativeWindowHandle(handle: string | undefined): void;
+ $receiveMessage(message: any): void;
}

export interface ExtHostLogLevelServiceShape {
Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
===================================================================
--- VSCodeEmbedded.orig/build/private/code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
+++ VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/common/extHostWindow.ts
@@ -22,6 +22,7 @@ export class ExtHostWindow implements Ex
--- 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
@@ -26,6 +26,7 @@ export class ExtHostWindow implements Ex
private _proxy: MainThreadWindowShape;

private readonly _onDidChangeWindowState = new Emitter<WindowState>();
+ private _receiveMessage: Emitter<any>;
readonly onDidChangeWindowState: Event<WindowState> = this._onDidChangeWindowState.event;

private _state = ExtHostWindow.InitialState;
@@ -46,6 +47,7 @@ export class ExtHostWindow implements Ex
private _nativeHandle: Uint8Array | undefined;
@@ -57,6 +58,7 @@ export class ExtHostWindow implements Ex
this.onDidChangeWindowProperty('focused', isFocused);
this.onDidChangeWindowProperty('active', isActive);
});
+ this._receiveMessage = new Emitter<any>();
}

$onDidChangeWindowFocus(value: boolean) {
@@ -91,6 +93,18 @@ export class ExtHostWindow implements Ex
get nativeHandle(): Uint8Array | undefined {
@@ -110,6 +112,18 @@ export class ExtHostWindow implements Ex
const result = await this._proxy.$asExternalUri(uri, options);
return URI.from(result);
}
Expand All @@ -155,10 +155,10 @@ Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/api/common/
}

export const IExtHostWindow = createDecorator<IExtHostWindow>('IExtHostWindow');
Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
===================================================================
--- VSCodeEmbedded.orig/build/private/code-editor-src/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
+++ VSCodeEmbedded/build/private/code-editor-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
@@ -44,7 +44,7 @@ export class ExtensionsProposedApi {
for (const [k, value] of Object.entries(productService.extensionEnabledApiProposals)) {
const key = ExtensionIdentifier.toKey(k);
Expand All @@ -168,11 +168,11 @@ Index: VSCodeEmbedded/build/private/code-editor-src/src/vs/workbench/services/ex
_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: VSCodeEmbedded/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
Index: AWSCodeOSS/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
===================================================================
--- VSCodeEmbedded.orig/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
+++ VSCodeEmbedded/build/private/code-editor-src/src/vscode-dts/vscode.d.ts
@@ -10660,6 +10660,8 @@ declare module 'vscode' {
--- 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
@@ -11000,6 +11000,8 @@ declare module 'vscode' {
* asking for user input.
*/
export namespace window {
Expand Down
Loading