From f04fcf2d649f73238ff660fd9b4768def4dbebca Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 4 Jan 2022 12:37:11 -0600
Subject: [PATCH] chore: update vscode (#4680)

* Update VS Code

Fixes https://github.com/coder/code-server/issues/4598
Fixes https://github.com/coder/code-server/issues/4620
Fixes https://github.com/coder/code-server/issues/4600

* Add locale flag back

This is valid again now that we have restored display language support.
---
 CHANGELOG.md               | 7 +++----
 src/node/cli.ts            | 2 ++
 test/unit/node/cli.test.ts | 3 +++
 vendor/package.json        | 2 +-
 vendor/yarn.lock           | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 332c9ff7f..2f6fe730e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,12 +32,11 @@ implementation (#4414).
 - Web socket compression has been made the default (when supported). This means
   the `--enable` flag will no longer take `permessage-deflate` as an option.
 - Extra extension directories have been removed. The `--extra-extensions-dir`
-  and `--extra-builtin-extensions-dir` will no longer be accepted.
-- The `--install-source` and `--locale` flags have been removed.
+  and `--extra-builtin-extensions-dir` flags will no longer be accepted.
+- The `--install-source` flag has been removed.
 - The static endpoint can no longer reach outside code-server. However the
   vscode-remote-resource endpoint still can.
-- OpenVSX has been made the default marketplace. However this means web
-  extensions like Vim may be broken.
+- OpenVSX has been made the default marketplace.
 - The last opened folder/workspace is no longer stored separately in the
   settings file (we rely on the already-existing query object instead).
 
diff --git a/src/node/cli.ts b/src/node/cli.ts
index 7806c420f..6565fbc9a 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -57,6 +57,7 @@ export interface UserProvidedArgs {
   enable?: string[]
   help?: boolean
   host?: string
+  locale?: string
   port?: number
   json?: boolean
   log?: LogLevel
@@ -163,6 +164,7 @@ const options: Options<Required<UserProvidedArgs>> = {
   enable: { type: "string[]" },
   help: { type: "boolean", short: "h", description: "Show this output." },
   json: { type: "boolean" },
+  locale: { type: "string" }, // The preferred way to set the locale is via the UI.
   open: { type: "boolean", description: "Open in browser on startup. Does not work remotely." },
 
   "bind-addr": {
diff --git a/test/unit/node/cli.test.ts b/test/unit/node/cli.test.ts
index ac848c9bb..a4cffb9a6 100644
--- a/test/unit/node/cli.test.ts
+++ b/test/unit/node/cli.test.ts
@@ -63,6 +63,8 @@ describe("parser", () => {
           "--verbose",
           "2",
 
+          ["--locale", "ja"],
+
           ["--log", "error"],
 
           "--help",
@@ -103,6 +105,7 @@ describe("parser", () => {
       help: true,
       host: "0.0.0.0",
       json: true,
+      locale: "ja",
       log: "error",
       open: true,
       port: 8081,
diff --git a/vendor/package.json b/vendor/package.json
index 685475472..8ac4d1bc8 100644
--- a/vendor/package.json
+++ b/vendor/package.json
@@ -7,6 +7,6 @@
     "postinstall": "./postinstall.sh"
   },
   "devDependencies": {
-    "code-oss-dev": "cdr/vscode#48fae57fd9adb772fc1b10e4a9a5e1ba6880640a"
+    "code-oss-dev": "cdr/vscode#69a6ce45fc5b883aa8a950e10b79fd083eb0a7d7"
   }
 }
diff --git a/vendor/yarn.lock b/vendor/yarn.lock
index cba0057ef..d826b0c97 100644
--- a/vendor/yarn.lock
+++ b/vendor/yarn.lock
@@ -274,9 +274,9 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-code-oss-dev@cdr/vscode#48fae57fd9adb772fc1b10e4a9a5e1ba6880640a:
+code-oss-dev@cdr/vscode#69a6ce45fc5b883aa8a950e10b79fd083eb0a7d7:
   version "1.63.0"
-  resolved "https://codeload.github.com/cdr/vscode/tar.gz/48fae57fd9adb772fc1b10e4a9a5e1ba6880640a"
+  resolved "https://codeload.github.com/cdr/vscode/tar.gz/69a6ce45fc5b883aa8a950e10b79fd083eb0a7d7"
   dependencies:
     "@microsoft/applicationinsights-web" "^2.6.4"
     "@parcel/watcher" "2.0.3"