Add more VS Code config

Author: ndabas

build.ps1

@@ -509,9 +509,10 @@ Section "-Pico environment" SecPico
   SetOutPath "`${PICO_REPOS_DIR}\pico-examples"
   File /r "build\pico-examples\*.*"
   SetOutPath "`${PICO_REPOS_DIR}\pico-examples\.vscode"
-  File /oname=cmake-kits.json "packages\pico-examples\vscode-cmake-kits.json"
-  File /oname=launch.json "packages\pico-examples\vscode-launch.json"
-  File /oname=settings.json "packages\pico-examples\vscode-settings.json"
+  File "packages\pico-examples\ide\vscode\cmake-kits.json"
+  File "packages\pico-examples\ide\vscode\extensions.json"
+  File "packages\pico-examples\ide\vscode\launch.json"
+  File "packages\pico-examples\ide\vscode\settings.json"
 
   SetOutPath "`$INSTDIR\pico-sdk-tools"
   File "build\pico-sdk-tools\mingw$bitness\*.*"
@@ -539,8 +540,7 @@ Section "-Pico environment" SecPico
   WriteRegStr `${PICO_REG_ROOT} "`${UNINSTALL_KEY}" "Publisher" "$company"
 
   # Find Visual Studio Code, so we can point our shortcut icon to code.exe
-  ReadEnvStr `$0 COMSPEC
-  nsExec::ExecToStack '$('"$0" /c call "$TEMP\RefreshEnv.cmd" && where code.cmd' -replace '"', ('"' * 3))'
+  nsExec::ExecToStack 'cmd.exe /c call "`$TEMP\RefreshEnv.cmd" && where code.cmd'
   Pop `$0 # return value/error/timeout
   Pop `$1 # stdout
   # Get the last line of output
@@ -549,6 +549,11 @@ Section "-Pico environment" SecPico
   `${GetParent} "`$1" `$1
   StrCpy `$1 "`$1\Code.exe"
 
+  `${IfNot} `${FileExists} "`$1"
+    # Just use the default install location for the icon, in case the user installs VS Code later
+    StrCpy `$1 "%LOCALAPPDATA%\Programs\Microsoft VS Code\Code.exe"
+    MessageBox MB_OK|MB_ICONEXCLAMATION "Installation of Visual Studio Code failed. Please install it manually by downloading the installer from:${endl}${endl}https://code.visualstudio.com/" /SD IDOK
+  `${EndIf}
 
   ; Set the working directory for our terminals to the repos directory
   SetOutPath "`${PICO_REPOS_DIR}"

config/x64-standalone.json

@@ -5,8 +5,12 @@
     {
       "name": "Visual Studio Code",
       "file": "Install-VSCode.ps1",
-      "execToLog": "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command & \"$0\" -BuildEdition Stable-User -AdditionalExtensions marus25.cortex-debug,ms-vscode.cmake-tools,ms-vscode.cpptools,ms-vscode.cpptools-extension-pack,ms-vscode.vscode-serial-monitor; & \"$${env:LocalAppData}\\Programs\\Microsoft VS Code\\bin\\code.cmd\" --version",
-      "href": "https://raw.githubusercontent.com/PowerShell/vscode-powershell/main/scripts/Install-VSCode.ps1"
+      "execToLog": "cmd.exe /c call \"$PLUGINSDIR\\install-vscode.cmd\" \"$0\"",
+      "href": "https://raw.githubusercontent.com/PowerShell/vscode-powershell/main/scripts/Install-VSCode.ps1",
+      "additionalFiles": [
+        "packages\\pico-setup-windows\\install-vscode.cmd",
+        "packages\\pico-examples\\ide\\vscode\\extensions.json"
+      ]
     },
     {
       "name": "GNU Arm Embedded Toolchain",

config/x64.json

@@ -6,8 +6,12 @@
     {
       "name": "Visual Studio Code",
       "file": "Install-VSCode.ps1",
-      "execToLog": "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command \"$0\" -BuildEdition Stable-User -AdditionalExtensions 'marus25.cortex-debug','ms-vscode.cmake-tools','ms-vscode.cpptools','ms-vscode.cpptools-extension-pack','ms-vscode.vscode-serial-monitor'",
-      "href": "https://raw.githubusercontent.com/PowerShell/vscode-powershell/main/scripts/Install-VSCode.ps1"
+      "execToLog": "cmd.exe /c call \"$PLUGINSDIR\\install-vscode.cmd\" \"$0\"",
+      "href": "https://raw.githubusercontent.com/PowerShell/vscode-powershell/main/scripts/Install-VSCode.ps1",
+      "additionalFiles": [
+        "packages\\pico-setup-windows\\install-vscode.cmd",
+        "packages\\pico-examples\\ide\\vscode\\extensions.json"
+      ]
     },
     {
       "name": "GNU Arm Embedded Toolchain",

config/x86.json

@@ -6,8 +6,12 @@
     {
       "name": "Visual Studio Code",
       "file": "Install-VSCode.ps1",
-      "execToLog": "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command \"$0\" -BuildEdition Stable-User -AdditionalExtensions 'marus25.cortex-debug','ms-vscode.cmake-tools','ms-vscode.cpptools','ms-vscode.cpptools-extension-pack','ms-vscode.vscode-serial-monitor'",
-      "href": "https://raw.githubusercontent.com/PowerShell/vscode-powershell/main/scripts/Install-VSCode.ps1"
+      "execToLog": "cmd.exe /c call \"$PLUGINSDIR\\install-vscode.cmd\" \"$0\"",
+      "href": "https://raw.githubusercontent.com/PowerShell/vscode-powershell/main/scripts/Install-VSCode.ps1",
+      "additionalFiles": [
+        "packages\\pico-setup-windows\\install-vscode.cmd",
+        "packages\\pico-examples\\ide\\vscode\\extensions.json"
+      ]
     },
     {
       "name": "GNU Arm Embedded Toolchain",

packages/pico-examples/vscode-cmake-kits.json renamed to packages/pico-examples/ide/vscode/cmake-kits.json

@@ -0,0 +1,9 @@
+{
+  "recommendations": [
+    "marus25.cortex-debug",
+    "ms-vscode.cmake-tools",
+    "ms-vscode.cpptools",
+    "ms-vscode.cpptools-extension-pack",
+    "ms-vscode.vscode-serial-monitor"
+  ]
+}

packages/pico-examples/ide/vscode/extensions.json

@@ -0,0 +1,10 @@
+@if not defined _echo echo off
+
+rem We don't want to fail and stop the installer if the Visual Studio Code installation fails.
+rem So we use a cmd script instead of a PowerShell one, just in case executing PowerShell fails.
+
+setlocal
+set "vscode_exts=(Get-Content '%~dp0extensions.json' | ConvertFrom-Json).recommendations"
+powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "& '%1' -BuildEdition Stable-User -AdditionalExtensions %vscode_exts%"
+
+exit /b 0