Skip to content

Patches 1.70 #5422

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
merged 20 commits into from
Aug 17, 2022
Merged

Patches 1.70 #5422

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6ee7e63
chore: update upstream code
fritterhoff Aug 7, 2022
886894e
patches: start patching 1.70
fritterhoff Aug 7, 2022
f25e0dc
fix: use correct storage type
fritterhoff Aug 7, 2022
833606e
chore: update patches
fritterhoff Aug 7, 2022
a8a606c
fix: use correct path for localeService
fritterhoff Aug 7, 2022
a51136b
fix: use correct csp hashes
fritterhoff Aug 8, 2022
56ebd89
Merge branch 'main' into patches-1.70
repo-ranger[bot] Aug 10, 2022
02dc3d7
Merge branch 'main' into patches-1.70
repo-ranger[bot] Aug 10, 2022
e48f91c
Merge branch 'main' into patches-1.70
repo-ranger[bot] Aug 10, 2022
cd2ee28
Merge branch 'main' into patches-1.70
repo-ranger[bot] Aug 10, 2022
ae1e4ff
Merge branch 'main' into patches-1.70
repo-ranger[bot] Aug 11, 2022
0d6935d
Merge branch 'main' into patches-1.70
fritterhoff Aug 12, 2022
3fbe58a
Update comment on remote authority
code-asher Aug 12, 2022
424fb8d
Add back comment to unique db patch
code-asher Aug 12, 2022
045e4a9
Use absolute path for disable download patch
code-asher Aug 12, 2022
53fb3d8
Implement telemetry
code-asher Aug 12, 2022
1798d5e
Refresh patch offsets
code-asher Aug 12, 2022
7592cb1
Fix display languages
code-asher Aug 16, 2022
2b0725a
Merge branch 'main' into patches-1.70
repo-ranger[bot] Aug 16, 2022
92a6ca2
Fix inability to change language while code-server is running
code-asher Aug 16, 2022
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
10 changes: 5 additions & 5 deletions patches/disable-downloads.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
import { Schemas } from 'vs/base/common/network';
import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
import { IProductService } from 'vs/platform/product/common/productService';
+import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService';
+import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
Copy link
Contributor

@jsjoeio jsjoeio Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch! I don't know why i didn't do that before lol thanks for fixing.


export class WorkbenchContextKeysHandler extends Disposable {
private inputFocusedContext: IContextKey<boolean>;
Expand All @@ -121,16 +121,16 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts
@IProductService private readonly productService: IProductService,
@IEditorService private readonly editorService: IEditorService,
@IEditorResolverService private readonly editorResolverService: IEditorResolverService,
@@ -198,6 +198,9 @@ export class WorkbenchContextKeysHandler
// Auxiliary Bar
@@ -199,6 +199,9 @@ export class WorkbenchContextKeysHandler
this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
+
+ // code-server
+ IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true)
+
this.registerListeners();
}

Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
===================================================================
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
Expand Down