Merge branch 'insider'

.github/workflows/insider-linux.yml

@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -231,7 +231,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Check version
         env:

.github/workflows/insider-macos.yml

@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -48,12 +48,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Clone VSCode repo
         env:

.github/workflows/insider-windows.yml

@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: windows
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -58,7 +58,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install Yarn
         run: npm install -g yarn

.github/workflows/stable-macos.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Clone VSCode repo
         run: . get_repo.sh

.github/workflows/stable-windows.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install Yarn
         run: npm install -g yarn

.nvmrc

@@ -1 +1 @@
-16.20
+18.15

build/build.sh

@@ -103,7 +103,7 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then
   . build.sh
 
   if [[ "${VSCODE_QUALITY}" == "insider" && "${VSCODE_LATEST}" == "yes" ]]; then
-    jsonTmp=$( jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. "insider.json" | .tag=$tag | .commit=$commit' )
+    jsonTmp=$( cat "insider.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
     echo "${jsonTmp}" > "insider.json" && unset jsonTmp
   fi
 fi

build/update_api.sh

@@ -33,6 +33,7 @@ fi
 APIS=$( jq -r '.extensionEnabledApiProposals' "${DIRECTORY}/resources/app/product.json" )
 
 APIS=$( echo "${APIS}" | jq '. += {"jeanp413.open-remote-ssh": ["resolvers", "tunnels", "terminalDataWriteEvent", "contribRemoteHelp", "contribViewsRemote"]}' )
+APIS=$( echo "${APIS}" | jq '. += {"jeanp413.open-remote-wsl": ["resolvers", "contribRemoteHelp", "contribViewsRemote"]}' )
 
 jsonTmp=$( jq --argjson v "${APIS}" 'setpath(["extensionEnabledApiProposals"]; $v)' product.json )
 echo "${jsonTmp}" > product.json && unset jsonTmp

get_repo.sh

@@ -112,4 +112,4 @@ fi
 
 export MS_TAG
 export MS_COMMIT
-export RELEASE_VERSION
+export RELEASE_VERSION

insider.json

@@ -1 +1,4 @@
-
+{
+  "tag": "1.82.0",
+  "commit": "f1302be1e67e3af5fbeb8bbb2ea784de7bc96150"
+}

patches/fix-eol-banner.patch

@@ -48,21 +48,15 @@ index b120c94..1bb2b88 100644
 +
  	toJSON(): object {
 diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
-index cf6af9d..108ce8f 100644
+index 1efcf6b..b52830c 100644
 --- a/src/vs/workbench/electron-sandbox/window.ts
 +++ b/src/vs/workbench/electron-sandbox/window.ts
-@@ -725,3 +725,4 @@ export class NativeWindow extends Disposable {
- 					actions,
--					icon: Codicon.warning
-+					icon: Codicon.warning,
-+					neverShowAgain: { id: 'windowseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
- 				});
-@@ -764,3 +765,4 @@ export class NativeWindow extends Disposable {
- 					actions,
--					icon: Codicon.warning
-+					icon: Codicon.warning,
-+					neverShowAgain: { id: 'macoseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
- 				});
+@@ -738,3 +738,4 @@ export class NativeWindow extends Disposable {
+ 				actions,
+-				icon: Codicon.warning
++				icon: Codicon.warning,
++				neverShowAgain: { id: 'windowseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
+ 			});
 diff --git a/src/vs/workbench/services/banner/browser/bannerService.ts b/src/vs/workbench/services/banner/browser/bannerService.ts
 index 639b1b2..70e8847 100644
 --- a/src/vs/workbench/services/banner/browser/bannerService.ts

prepare_vscode.sh

@@ -58,6 +58,10 @@ set -x
 export ELECTRON_SKIP_BINARY_DOWNLOAD=1
 export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
+if [[ "${OS_NAME}" == "linux" ]]; then
+  export VSCODE_SKIP_NODE_VERSION_CHECK=1
+fi
+
 if [[ "${OS_NAME}" == "osx" ]]; then
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile --network-timeout 180000
 

product.json

@@ -89,7 +89,8 @@
       "envCollectionOptions"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
-      "notebookMessaging"
+      "notebookMessaging",
+      "languageConfigurationAutoClosingPairs"
     ],
     "GitHub.codespaces": [
       "contribEditSessions",
@@ -144,7 +145,9 @@
     ],
     "ms-vscode.remote-server": [
       "resolvers",
-      "tunnels"
+      "tunnels",
+      "tunnelFactory",
+      "contribViewsWelcome"
     ],
     "ms-vscode.remote-explorer": [
       "contribRemoteHelp",
@@ -179,30 +182,24 @@
       "diffCommand",
       "contribCommentEditorActionsMenu",
       "readonlyMessage",
+      "treeViewMarkdownMessage",
       "shareProvider",
-      "quickDiffProvider",
-      "quickPickItemIcon"
+      "quickDiffProvider"
     ],
     "GitHub.copilot": [
-      "inlineCompletionsAdditions",
-      "interactive",
-      "interactiveUserActions",
-      "semanticSimilarity",
-      "terminalDataWriteEvent"
+      "inlineCompletionsAdditions"
     ],
     "GitHub.copilot-nightly": [
-      "inlineCompletionsAdditions",
-      "interactive",
-      "interactiveUserActions",
-      "semanticSimilarity",
-      "terminalDataWriteEvent"
+      "inlineCompletionsAdditions"
     ],
     "GitHub.copilot-chat": [
       "handleIssueUri",
       "interactive",
       "interactiveUserActions",
       "semanticSimilarity",
-      "terminalDataWriteEvent"
+      "terminalDataWriteEvent",
+      "terminalSelection",
+      "terminalQuickFixProvider"
     ],
     "GitHub.remotehub": [
       "contribRemoteHelp",
@@ -269,9 +266,6 @@
     "ms-dotnettools.vscodeintellicode-csharp": [
       "inlineCompletionsAdditions"
     ],
-    "digitarald.chat-plugins": [
-      "interactiveSlashCommands"
-    ],
     "microsoft-IsvExpTools.powerplatform-vscode": [
       "fileSearchProvider",
       "textSearchProvider"
@@ -286,6 +280,11 @@
       "terminalDataWriteEvent",
       "contribRemoteHelp",
       "contribViewsRemote"
+    ],
+    "jeanp413.open-remote-wsl": [
+      "resolvers",
+      "contribRemoteHelp",
+      "contribViewsRemote"
     ]
   },
   "extensionKind": {

update_insider.sh

@@ -12,7 +12,7 @@ if [[ -z "${GITHUB_TOKEN}" ]]; then
   exit 0
 fi
 
-jsonTmp=$( jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. "insider.json" | .tag=$tag | .commit=$commit' )
+jsonTmp=$( cat "insider.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
 echo "${jsonTmp}" > "insider.json" && unset jsonTmp
 
 git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"