Skip to content

chore: upgrade Code to 1.73.0 #5751

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.

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 25 commits into from
Nov 9, 2022
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
568f0ac
chore: upgrade Code to 1.73.0
jsjoeio Nov 3, 2022
134ab92
chore: refresh integration patch
jsjoeio Nov 3, 2022
91575e1
chore: clean up base-path patch
jsjoeio Nov 3, 2022
95bfeac
chore: refresh proposed-api patch
jsjoeio Nov 3, 2022
49fa8a2
chore: update marketplace patch
jsjoeio Nov 3, 2022
f58d91e
chore: update hash in webview patch
jsjoeio Nov 3, 2022
9ee00a6
chore: refresh disable-builtin-ext-update.diff
jsjoeio Nov 3, 2022
bf8b8e0
chore: refresh update-check
jsjoeio Nov 3, 2022
2476e41
chore: refresh logout patch
jsjoeio Nov 3, 2022
cd0d1d2
chore: refresh proxy-uri patch
jsjoeio Nov 3, 2022
44fa1f3
chore: refresh local-storage patch
jsjoeio Nov 3, 2022
c2c6e37
chore: refresh sourcemaps patch
jsjoeio Nov 3, 2022
d888456
chore: refresh disable-downloads patch
jsjoeio Nov 3, 2022
8c15dfa
chore: refresh telemetry patch
jsjoeio Nov 3, 2022
fd3427b
refactor: re-apply display-language patch
jsjoeio Nov 3, 2022
a2860d2
refactor: drop exec-argv patch
jsjoeio Nov 3, 2022
0c149bf
chore: refresh getting-started patch
jsjoeio Nov 3, 2022
8b57956
fixup: add missing slash in marketplace
jsjoeio Nov 8, 2022
b53ca8a
fixup: update notes proposed-api patch
jsjoeio Nov 8, 2022
78c02a1
fixup: support this.args.log as string
jsjoeio Nov 8, 2022
43e71fb
Revert "fixup: support this.args.log as string"
jsjoeio Nov 8, 2022
504a56f
fixup!: add log to toCodeArgs
jsjoeio Nov 8, 2022
0760db7
Merge branch 'main' into jsjoeio/code-173
jsjoeio Nov 9, 2022
957635a
fixup: update telemetry description
jsjoeio Nov 9, 2022
0b8ddc8
Merge branch 'main' into jsjoeio/code-173
jsjoeio Nov 9, 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
Prev Previous commit
Next Next commit
fixup: support this.args.log as string
Seems like upstream now uses a string[] for this. For now, support
string.

See
microsoft/vscode@2b50ab0
  • Loading branch information
jsjoeio committed Nov 8, 2022
commit 78c02a1f137655e27f3137e1d07a274e482baf6b
18 changes: 18 additions & 0 deletions patches/integration.diff
Original file line number Diff line number Diff line change
Expand Up @@ -272,3 +272,21 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
embedderIdentifier: 'server-distro',
extensionsGallery: this._webExtensionResourceUrlTemplate ? {
...this._productService.extensionsGallery,
Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
===================================================================
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
@@ -223,7 +223,12 @@ export abstract class AbstractNativeEnvi
get verbose(): boolean { return !!this.args.verbose; }

@memoize
- get logLevel(): string | undefined { return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry)); }
+ get logLevel(): string | undefined {
+ if (typeof this.args.log === "string") {
+ return this.args.log
+ }
+ return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry));
+ }
@memoize
get extensionLogLevel(): [string, string][] | undefined {
const result: [string, string][] = [];