mirror of
https://github.com/danog/code-server.git
synced 2024-11-26 20:34:56 +01:00
a1af9e2a56
* Move integration types into code-server
This will be easier to maintain than to have it as a patch.
* Disable connection token
Using a flag means we will not need to patch it out. I think this is
new from 1.64?
* Add product.json to build process
This way we do not have to patch it.
* Ship with remote agent package.json
Instead of the root one. This contains fewer dependencies.
* Let Code handle errors
This way we will not have to patch Code to make this work and I think it
makes sense to let Code handle the request.
If we do want to handle errors we can do it cleanly by patching their
error handler to throw instead.
* Move manifest override into code-server
This way we will not have to patch it.
* Move to patches
- Switch submodule to track upstream
- Add quilt to the process
- Add patches
The node-* ignore was ignoring one of the diffs so I removed it. This
was added when we were curling Node as node-v{version}-darwin-x64 for
the macOS build but this no longer happens (we use the Node action to
install a specific version now so we just use the system-wide Node).
* Use pre-packaged Code
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
Remove last opened functionality
|
|
|
|
This conflicts with our own handling of the last opened workspace. If we wanted
|
|
to switch to this we would need to pass through the disable-last-opened flag and
|
|
respect it here then remove our own redirction code that handles this.
|
|
|
|
Our version might be better anyway since it puts the workspace in the URL.
|
|
|
|
Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
|
|
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
|
|
@@ -350,19 +350,6 @@ class WorkspaceProvider implements IWork
|
|
workspace = { folderUri: URI.revive(config.folderUri) };
|
|
} else if (config.workspaceUri) {
|
|
workspace = { workspaceUri: URI.revive(config.workspaceUri) };
|
|
- } else {
|
|
- workspace = (() => {
|
|
- const lastWorkspaceRaw = window.localStorage.getItem(WorkspaceProvider.LAST_WORKSPACE_STORAGE_KEY);
|
|
- if (lastWorkspaceRaw) {
|
|
- try {
|
|
- return parse(lastWorkspaceRaw); // use marshalling#parse() to revive potential URIs
|
|
- } catch (error) {
|
|
- // Ignore
|
|
- }
|
|
- }
|
|
-
|
|
- return undefined;
|
|
- })();
|
|
}
|
|
}
|
|
|