From ee8c7f094a37e2d4ccfccae0d78c8377fd61a183 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Fri, 2 Dec 2022 20:31:45 +0100
Subject: [PATCH] fix: remove recommendationsUrl

---
 DOCS.md                      |  2 --
 insider.json                 |  2 +-
 patches/custom-gallery.patch |  7 +++----
 product.json                 | 25 ++++++++++---------------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/DOCS.md b/DOCS.md
index f757a60..cb56221 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -64,7 +64,6 @@ With the following environment variables:
 - `VSCODE_GALLERY_CACHE_URL='https://vscode.blob.core.windows.net/gallery/index'`
 - `VSCODE_GALLERY_ITEM_URL='https://marketplace.visualstudio.com/items'`
 - `VSCODE_GALLERY_CONTROL_URL=''`
-- `VSCODE_GALLERY_RECOMMENDATIONS_URL=''`
 
 Or by creating a custom `product.json` at the following location:
 - Windows: `%APPDATA%\VSCodium` or `%USERPROFILE%\AppData\Roaming\VSCodium`
@@ -80,7 +79,6 @@ with the content:
     "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
     "itemUrl": "https://marketplace.visualstudio.com/items",
     "controlUrl": "",
-    "recommendationsUrl": ""
   }
 }
 ```
diff --git a/insider.json b/insider.json
index afedcfb..b9456b2 100644
--- a/insider.json
+++ b/insider.json
@@ -1,4 +1,4 @@
 {
   "tag": "1.74.0",
-  "commit": "d0e44be43287acadb13f7c2808332e00fe52568d"
+  "commit": "493a541735b84de36b628750ba716a430669cb7f"
 }
diff --git a/patches/custom-gallery.patch b/patches/custom-gallery.patch
index 5b2151a..0dce155 100644
--- a/patches/custom-gallery.patch
+++ b/patches/custom-gallery.patch
@@ -1,5 +1,5 @@
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index ef798fa..35b848b 100644
+index ef798fa..5a0550b 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -5,3 +5,4 @@
@@ -12,10 +12,10 @@ index ef798fa..35b848b 100644
  import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
 +import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
  
-@@ -29,2 +31,41 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
+@@ -29,2 +31,40 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
  
 +	// Set user-defined extension gallery
-+	const { serviceUrl, searchUrl, itemUrl, controlUrl, recommendationsUrl } = product.extensionsGallery || {}
++	const { serviceUrl, searchUrl, itemUrl, controlUrl } = product.extensionsGallery || {}
 +
 +	Object.assign(product, {
 +		extensionsGallery: {
@@ -23,7 +23,6 @@ index ef798fa..35b848b 100644
 +			searchUrl: env['VSCODE_GALLERY_SEARCH_URL'] || searchUrl,
 +			itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
 +			controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
-+			recommendationsUrl: env['VSCODE_GALLERY_RECOMMENDATIONS_URL'] || recommendationsUrl
 +		}
 +	})
 +
diff --git a/product.json b/product.json
index 8fd8ea7..df6f5b5 100644
--- a/product.json
+++ b/product.json
@@ -51,6 +51,7 @@
       "testObserver"
     ],
     "VisualStudioExptTeam.vscodeintellicode-completions": [
+      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "ms-vsliveshare.vsliveshare": [
@@ -69,6 +70,7 @@
       "portsAttributes",
       "findTextInFiles",
       "workspaceTrust",
+      "resolvers",
       "tunnels"
     ],
     "ms-toolsai.vscode-ai-remote": [
@@ -76,8 +78,7 @@
     ],
     "ms-python.python": [
       "quickPickSortByLabel",
-      "testObserver",
-      "telemetryLogger"
+      "testObserver"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
       "notebookMessaging"
@@ -95,7 +96,6 @@
     ],
     "ms-vscode.azure-repos": [
       "extensionRuntime",
-      "telemetryLogger",
       "fileSearchProvider",
       "textSearchProvider"
     ],
@@ -112,10 +112,8 @@
       "fileSearchProvider",
       "quickPickSortByLabel",
       "workspaceTrust",
-      "scmActionButton",
       "scmSelectedProvider",
       "scmValidation",
-      "telemetryLogger",
       "textSearchProvider",
       "timeline"
     ],
@@ -132,8 +130,7 @@
       "telemetry"
     ],
     "ms-vscode.remote-server": [
-      "resolvers",
-      "tunnels"
+      "resolvers"
     ],
     "ms-vscode.remote-explorer": [
       "contribViewsRemote",
@@ -151,24 +148,25 @@
       "portsAttributes",
       "findTextInFiles",
       "workspaceTrust",
+      "resolvers",
       "tunnels"
     ],
     "ms-vscode.lsif-browser": [
       "documentFiltersExclusive"
     ],
     "GitHub.vscode-pull-request-github": [
-      "contribCommentThreadAdditionalMenu",
       "tokenInformation",
       "commentsResolvedState",
       "contribShareMenu",
       "contribCommentPeekContext",
-      "treeItemCheckbox",
-      "codiconDecoration"
+      "treeItemCheckbox"
     ],
     "GitHub.copilot": [
+      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "GitHub.copilot-nightly": [
+      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "GitHub.remotehub": [
@@ -184,8 +182,7 @@
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
-      "telemetryLogger"
+      "timeline"
     ],
     "ms-python.gather": [
       "notebookCellExecutionState"
@@ -213,6 +210,7 @@
       "notebookCellExecutionState"
     ],
     "ms-vscode.azure-sphere-tools-ui": [
+      "resolvers",
       "tunnels"
     ],
     "ms-azuretools.vscode-azureappservice": [
@@ -223,9 +221,6 @@
     ],
     "ms-vscode.cpptools": [
       "terminalDataWriteEvent"
-    ],
-    "redhat.java": [
-      "documentPaste"
     ]
   },
   "extensionKind": {