From d6f5469bcd4c1e92362f543e63a86a0052b7bebc Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 11 Feb 2022 12:54:30 -0700
Subject: [PATCH 1/2] chore: update vscode commit

This includes two fixes from coder/vscode:
- https://github.com/coder/vscode/pull/43
- https://github.com/coder/vscode/pull/42
---
 vendor/package.json | 2 +-
 vendor/yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vendor/package.json b/vendor/package.json
index fb8d1302fae2..c1414d98ffbc 100644
--- a/vendor/package.json
+++ b/vendor/package.json
@@ -7,6 +7,6 @@
     "postinstall": "./postinstall.sh"
   },
   "devDependencies": {
-    "code-oss-dev": "coder/vscode#d4f09b4df0d23ead4389b4a69c6fad86ac358892"
+    "code-oss-dev": "coder/vscode#96e241330d9c44b64897c1e5031e00aa894103db"
   }
 }
diff --git a/vendor/yarn.lock b/vendor/yarn.lock
index 0a5687da4ac5..98921a1b6c47 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@coder/vscode#d4f09b4df0d23ead4389b4a69c6fad86ac358892:
+code-oss-dev@coder/vscode#96e241330d9c44b64897c1e5031e00aa894103db:
   version "1.63.0"
-  resolved "https://codeload.github.com/coder/vscode/tar.gz/d4f09b4df0d23ead4389b4a69c6fad86ac358892"
+  resolved "https://codeload.github.com/coder/vscode/tar.gz/96e241330d9c44b64897c1e5031e00aa894103db"
   dependencies:
     "@microsoft/applicationinsights-web" "^2.6.4"
     "@parcel/watcher" "2.0.3"

From ad984d553d11380a3b14468741d7a176ad613f48 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 14 Feb 2022 16:14:57 -0700
Subject: [PATCH 2/2] fix: use double-bracket in ext. e2e test

---
 test/e2e/extensions.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/extensions.test.ts b/test/e2e/extensions.test.ts
index f83e8e031692..f458ac29d4f9 100644
--- a/test/e2e/extensions.test.ts
+++ b/test/e2e/extensions.test.ts
@@ -7,6 +7,6 @@ describe("Extensions", true, () => {
 
     await codeServerPage.executeCommandViaMenus("code-server: Get proxy URI")
 
-    await codeServerPage.page.waitForSelector(`text=${address}/proxy/{port}`)
+    await codeServerPage.page.waitForSelector(`text=${address}/proxy/{{port}}`)
   })
 })