fix: update api proposals (#1187)

.github/workflows/windows.yml

@@ -96,3 +96,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
 
+      - if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        name: Release to WinGet
+        uses: vedantmgoyal2009/winget-releaser@latest
+        with:
+          identifier: VSCodium.VSCodium
+          release-tag: env.MS_TAG
+          installers-regex: '\.exe$' # only .exe files
+          token: ${{ secrets.STRONGER_GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,6 @@
 vscode
 VS*/*
+VSCode*
 .DS_Store
 build/linux/appimage/out
 build/linux/appimage/pkg2appimage.AppDir

DOCS.md

@@ -53,7 +53,7 @@ See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on
 
 ### <a id="howto-vscode-marketplace"></a>How to use the VS Code Marketplace
 
-You can switch and use the VS Code marketplace by using the following solutions. However, note that [it is not clear whether this is legal](https://github.com/microsoft/vscode/issues/31168).
+You can switch and use the VS Code marketplace by using the following solutions. However, note that [ this is not legal](https://github.com/microsoft/vscode/issues/31168).
 
 With the following environment variables:
 - `VSCODE_GALLERY_SERVICE_URL='https://marketplace.visualstudio.com/_apis/public/gallery'`

README.md

@@ -148,7 +148,7 @@ The builds are run every day, but exit early if there isn't a new release from M
 
 ## <a id="supported-platforms"></a>Supported Platforms
 
-The minimal version is limited by the core component Electron, you may want to check its [supported platform list](https://www.electronjs.org/docs/tutorial/support#supported-platforms).
+The minimal version is limited by the core component Electron, you may want to check its [platform prerequisites](https://www.electronjs.org/docs/latest/development/build-instructions-gn#platform-prerequisites).
 - [x] macOS (`zip`, `dmg`) OS X 10.10 or newer x64
 - [x] macOS (`zip`, `dmg`) macOS 11.0 or newer arm64
 - [x] GNU/Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)

build/update_api.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+URL=`curl -s "https://update.code.visualstudio.com/api/update/win32-x64-archive/stable/VERSION" | jq -c '.url' | sed -E 's/.*"([^"]+)".*/\1/'`
+# echo "url: ${URL}"
+FILE=`echo "${URL}" | sed -E 's|.*/([^/]+\.zip)$|\1|'`
+# echo "file: ${FILE}"
+DIRECTORY=`echo "${URL}" | sed -E 's|.*/([^/]+)\.zip$|\1|'`
+# echo "directory: ${DIRECTORY}"
+
+if [[ ! -f "${FILE}" ]]; then
+  wget "${URL}"
+fi
+
+if [[ ! -d "${DIRECTORY}" ]]; then
+  unzip "${FILE}" -d "${DIRECTORY}"
+fi
+
+APIS=`cat ${DIRECTORY}/resources/app/product.json | jq -r '.extensionEnabledApiProposals'`
+
+cat <<< $(jq --argjson v "${APIS}" 'setpath(["extensionEnabledApiProposals"]; $v)' product.json) > product.json

docs/build.md

@@ -35,6 +35,7 @@
 - dpkg
 - python3
 - imagemagick (for AppImage)
+- ripgrep
 
 ### <a id="dependencies-macos"></a>MacOS
 
@@ -65,6 +66,10 @@ Firstly, create the container with:
 ```
 docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash
 ```
+like
+```
+docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash
+```
 
 When inside the container, you can use the following commands to build:
 ```
@@ -90,6 +95,10 @@ Firstly, create the container with:
 ```
 docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:stretch-armhf bash
 ```
+like
+```
+docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:stretch-armhf bash
+```
 
 When inside the container, you can use the following commands to build:
 ```

patches/fix-build-linux.patch

@@ -1,5 +1,31 @@
+diff --git a/build/linux/debian/dependencies-generator.js b/build/linux/debian/dependencies-generator.js
+index 235ca26..4f0f06e 100644
+--- a/build/linux/debian/dependencies-generator.js
++++ b/build/linux/debian/dependencies-generator.js
+@@ -17,7 +17,7 @@ const dep_lists_1 = require("./dep-lists");
+ // If true, we fail the build if there are new dependencies found during that task.
+ // The reference dependencies, which one has to update when the new dependencies
+ // are valid, are in dep-lists.ts
+-const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
++const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
+ function getDependencies(buildDir, applicationName, arch, sysroot) {
+     // Get the files for which we want to find dependencies.
+     const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
+diff --git a/build/linux/debian/dependencies-generator.ts b/build/linux/debian/dependencies-generator.ts
+index 9e3d466..776a4c2 100644
+--- a/build/linux/debian/dependencies-generator.ts
++++ b/build/linux/debian/dependencies-generator.ts
+@@ -19,7 +19,7 @@ import { ArchString } from './types';
+ // If true, we fail the build if there are new dependencies found during that task.
+ // The reference dependencies, which one has to update when the new dependencies
+ // are valid, are in dep-lists.ts
+-const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
++const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
+ 
+ export function getDependencies(buildDir: string, applicationName: string, arch: ArchString, sysroot: string): string[] {
+ 	// Get the files for which we want to find dependencies.
 diff --git a/build/linux/rpm/dependencies-generator.js b/build/linux/rpm/dependencies-generator.js
-index 1d91eb8..ed6b775 100644
+index 90cfca9..c92579e 100644
 --- a/build/linux/rpm/dependencies-generator.js
 +++ b/build/linux/rpm/dependencies-generator.js
 @@ -16,7 +16,7 @@ const dep_lists_1 = require("./dep-lists");
@@ -12,10 +38,10 @@ index 1d91eb8..ed6b775 100644
      // Get the files for which we want to find dependencies.
      const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
 diff --git a/build/linux/rpm/dependencies-generator.ts b/build/linux/rpm/dependencies-generator.ts
-index 95953ec..f5ffc2e 100644
+index 4b84640..55429fb 100644
 --- a/build/linux/rpm/dependencies-generator.ts
 +++ b/build/linux/rpm/dependencies-generator.ts
-@@ -18,7 +18,7 @@ import { ArchString } from './types';
+@@ -16,7 +16,7 @@ import { ArchString } from './types';
  // If true, we fail the build if there are new dependencies found during that task.
  // The reference dependencies, which one has to update when the new dependencies
  // are valid, are in dep-lists.ts
@@ -25,10 +51,10 @@ index 95953ec..f5ffc2e 100644
  export function getDependencies(buildDir: string, applicationName: string, arch: ArchString): string[] {
  	// Get the files for which we want to find dependencies.
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index 5b7eadb..87c914d 100644
+index 00ddb6f..cea0e97 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
-@@ -74,3 +74,5 @@ update-mime-database /usr/share/mime &> /dev/null || :
+@@ -72,3 +72,5 @@ update-mime-database /usr/share/mime &> /dev/null || :
  /usr/share/pixmaps/@@ICON@@.png
  /usr/share/bash-completion/completions/@@NAME@@
  /usr/share/zsh/site-functions/_@@NAME@@

product.json

@@ -51,7 +51,8 @@
       "testObserver"
     ],
     "VisualStudioExptTeam.vscodeintellicode-completions": [
-      "inlineCompletions"
+      "inlineCompletionsNew",
+      "inlineCompletionsAdditions"
     ],
     "ms-vsliveshare.vsliveshare": [
       "contribMenuBarHome",
@@ -61,13 +62,12 @@
       "findTextInFiles",
       "notebookCellExecutionState",
       "notebookContentProvider",
-      "notebookDocumentEvents",
       "notebookEditor",
       "notebookEditorEdit",
       "notebookLiveShare",
+      "notebookWorkspaceEdit",
       "terminalDimensions",
       "terminalDataWriteEvent",
-      "textDocumentNotebook",
       "textSearchProvider"
     ],
     "ms-vscode.js-debug": [
@@ -82,25 +82,20 @@
     ],
     "ms-python.python": [
       "quickPickSortByLabel",
-      "testObserver",
-      "notebookEditor"
+      "testObserver"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
-      "notebookConcatTextDocument",
-      "notebookContentProvider",
       "notebookCellExecutionState",
       "notebookControllerKind",
       "notebookDebugOptions",
-      "notebookDeprecated",
       "notebookEditor",
-      "notebookEditorDecorationType",
-      "notebookEditorEdit",
       "notebookLiveShare",
       "notebookMessaging",
       "notebookMime",
-      "textDocumentNotebook"
+      "notebookWorkspaceEdit"
     ],
     "GitHub.codespaces": [
+      "contribEditSessions",
       "contribMenuBarHome",
       "contribRemoteHelp",
       "contribViewsRemote",
@@ -112,10 +107,10 @@
     "ms-vscode.azure-repos": [
       "extensionRuntime",
       "fileSearchProvider",
-      "resolvers",
       "textSearchProvider"
     ],
     "ms-vscode.remote-repositories": [
+      "contribEditSessions",
       "contribRemoteHelp",
       "contribMenuBarHome",
       "contribViewsRemote",
@@ -128,14 +123,7 @@
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
-      "notebookEditor"
-    ],
-    "ms-vscode.vscode-github-issue-notebooks": [
-      "notebookEditor"
-    ],
-    "tanhakabir.rest-book": [
-      "notebookEditor"
+      "timeline"
     ],
     "ms-vscode-remote.remote-wsl": [
       "resolvers",
@@ -148,6 +136,10 @@
       "contribViewsRemote",
       "telemetry"
     ],
+    "ms-vscode.remote-server": [
+      "resolvers",
+      "contribViewsRemote"
+    ],
     "ms-vscode-remote.remote-containers": [
       "resolvers",
       "workspaceTrust",
@@ -164,15 +156,18 @@
       "documentFiltersExclusive"
     ],
     "GitHub.vscode-pull-request-github": [
-      "tokenInformation"
+      "tokenInformation",
+      "commentsResolvedState",
+      "badges",
+      "contribViewSize"
     ],
     "GitHub.copilot": [
-      "inlineCompletions",
-      "textDocumentNotebook"
+      "inlineCompletionsNew",
+      "inlineCompletionsAdditions"
     ],
     "GitHub.copilot-nightly": [
-      "inlineCompletions",
-      "textDocumentNotebook"
+      "inlineCompletionsNew",
+      "inlineCompletionsAdditions"
     ],
     "GitHub.remotehub": [
       "contribRemoteHelp",
@@ -184,12 +179,10 @@
       "fileSearchProvider",
       "quickPickSortByLabel",
       "workspaceTrust",
-      "resolvers",
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
-      "notebookEditor"
+      "timeline"
     ],
     "GitHub.remotehub-insiders": [
       "contribRemoteHelp",
@@ -201,42 +194,35 @@
       "fileSearchProvider",
       "quickPickSortByLabel",
       "workspaceTrust",
-      "resolvers",
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
-      "notebookEditor"
+      "timeline"
     ],
     "ms-python.gather": [
-      "notebookEditor",
       "notebookCellExecutionState"
     ],
     "ms-python.vscode-pylance": [
-      "notebookDocumentEvents",
       "notebookEditor",
       "notebookCellExecutionState"
     ],
     "ms-toolsai.jupyter": [
-      "notebookConcatTextDocument",
       "notebookControllerKind",
       "notebookDebugOptions",
       "notebookDeprecated",
-      "notebookEditor",
-      "notebookDocumentEvents",
-      "notebookEditorDecorationType",
-      "notebookEditorEdit",
+      "notebookWorkspaceEdit",
       "notebookMessaging",
       "notebookMime",
       "notebookCellExecutionState",
       "portsAttributes",
-      "textDocumentNotebook",
-      "quickPickSortByLabel"
+      "quickPickSortByLabel",
+      "notebookKernelSource",
+      "interactiveWindow"
+    ],
+    "ms-toolsai.vscode-jupyter-powertoys": [
+      "notebookWorkspaceEdit"
     ],
     "dbaeumer.vscode-eslint": [
-      "tabs",
-      "notebookDocumentEvents",
-      "notebookEditor",
       "notebookCellExecutionState"
     ],
     "ms-vscode.azure-sphere-tools-ui": [
@@ -244,6 +230,12 @@
     ],
     "ms-azuretools.vscode-azureappservice": [
       "terminalDataWriteEvent"
+    ],
+    "ms-vscode.anycode": [
+      "extensionsAny"
+    ],
+    "ms-vscode.cpptools": [
+      "terminalDataWriteEvent"
     ]
   },
   "extensionKind": {

undo_telemetry.sh

@@ -1,17 +1,44 @@
-# mobile.events.data.microsoft.com
-# vortex.data.microsoft.com
-TELEMETRY_URLS="[^/]+\.data\.microsoft\.com"
-REPLACEMENT="s/${TELEMETRY_URLS}/0\.0\.0\.0/g"
+#!/bin/bash
 
-#include common functions
+set -ex
+
+# list of urls to match:
+# - mobile.events.data.microsoft.com
+# - vortex.data.microsoft.com
+
+SEARCH="\.data\.microsoft\.com"
+REPLACEMENT="s|//[^/]+\.data\.microsoft\.com|//0\.0\.0\.0|g"
+
+# include common functions
 . ../utils.sh
 
-if [[ "${OS_NAME}" == "osx" ]]; then
-  if is_gnu_sed; then
-    grep -rl --exclude-dir=.git -E "${TELEMETRY_URLS}" . | xargs sed -i -E "${REPLACEMENT}"
-  else
-    grep -rl --exclude-dir=.git -E "${TELEMETRY_URLS}" . | xargs sed -i '' -E "${REPLACEMENT}"
-  fi
+if is_gnu_sed; then
+  replace_with_debug () {
+    echo "found: ${2} (`date`)"
+    sed -i -E "${1}" "${2}"
+  }
 else
-  grep -rl --exclude-dir=.git -E "${TELEMETRY_URLS}" . | xargs sed -i -E "${REPLACEMENT}"
+  replace_with_debug () {
+    echo "found: ${2} (`date`)"
+    sed -i '' -E "${1}" "${2}"
+  }
 fi
+export -f replace_with_debug
+
+d1=`date +%s`
+
+if [[ "${OS_NAME}" == "linux" ]]; then
+  if [[ ${VSCODE_ARCH} == "x64" ]]; then
+    rg --no-ignore -l "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}"
+  else
+    grep -rl --exclude-dir=.git -E "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}"
+  fi
+elif [[ "${OS_NAME}" == "osx" ]]; then
+  ./node_modules/@vscode/ripgrep/bin/rg --no-ignore -l "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}"
+else
+  ./node_modules/@vscode/ripgrep/bin/rg --no-ignore --path-separator=// -l "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}"
+fi
+
+d2=`date +%s`
+
+echo "undo_telemetry: $( echo $((${d2} - ${d1})) )s"