Skip to content

Fix for code editor server targets unable to open workspace folders #6

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
azmkercso merged 1 commit into from
Jun 9, 2025
Merged

Fix for code editor server targets unable to open workspace folders #6

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
2 changes: 1 addition & 1 deletion patches/web-server/cdn.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/code/browser/workbench/wo
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/code/browser/workbench/workbench.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/code/browser/workbench/workbench.ts
@@ -582,15 +582,34 @@ function readCookie(name: string): strin
@@ -594,15 +594,34 @@ function readCookie(name: string): strin
return undefined;
}

Expand Down
28 changes: 8 additions & 20 deletions patches/web-server/embedding-events.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,17 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/code/browser/workbench/wo
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/code/browser/workbench/workbench.ts
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/code/browser/workbench/workbench.ts
@@ -472,19 +472,25 @@ class WorkspaceProvider implements IWork
@@ -472,6 +472,24 @@ class WorkspaceProvider implements IWork

const targetHref = this.createTargetUrl(workspace, options);
if (targetHref) {
- if (options?.reuse) {
- mainWindow.location.href = targetHref;
- return true;
- } else {
- let result;
- if (isStandalone()) {
- result = mainWindow.open(targetHref, '_blank', 'toolbar=no'); // ensures to open another 'standalone' window!
- } else {
- result = mainWindow.open(targetHref);
- }
+ var url = new URL(targetHref);

- return !!result;
+
+ // post an event to the parent iframe
+ const url = new URL(targetHref);
+ let target, features;
+ if (!options?.reuse && isStandalone()) {
+ target = '_blank';
+ features = 'toolbar=no';
}
+ }
+ mainWindow.top?.postMessage({
+ source: 'code-editor',
+ action: "openEditor",
Expand All @@ -107,10 +95,10 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/code/browser/workbench/wo
+ features
+ }, '*');
+
+ return true;
}
return false;
}
+ // try opening a folder in case VS Code is not embedded
if (options?.reuse) {
mainWindow.location.href = targetHref;
return true;
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/workbench/browser/workbench.ts
===================================================================
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/workbench/browser/workbench.ts
Expand Down
2 changes: 1 addition & 1 deletion patches/web-server/proxy-uri.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Index: AWSCodeOSS/build/private/code-editor-src/src/vs/code/browser/workbench/wo

interface ISecretStorageCrypto {
seal(data: string): Promise<string>;
@@ -601,6 +602,20 @@ function readCookie(name: string): strin
@@ -613,6 +614,20 @@ function readCookie(name: string): strin
settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
workspaceProvider: WorkspaceProvider.create(config),
urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),
Expand Down