Merge remote-tracking branch 'upstream/main' into project_load_telemetry

Author: dibarbet

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
     "recommendations": [
         "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode"
+        "esbenp.prettier-vscode",
+        "orta.vscode-jest"
     ]
 }

.vscode/launch.json

@@ -286,8 +286,8 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/8c9c1628f3f28e5f64f372f626a439e2/razorlanguageserver-linux-arm64-7.0.0-preview.23421.4.zip,https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/6b6cbece19bb5ad0b600204331a198f4/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23421.4.zip,https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/2fb0c50bc18dd700f701038729819cdb/razorlanguageserver-linux-musl-x64-7.0.0-preview.23421.4.zip,https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/73fd71513d102f55a73a58cd0d4687a0/razorlanguageserver-linux-x64-7.0.0-preview.23421.4.zip,https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/17ec15d73d72e0422c25b24160790430/razorlanguageserver-osx-arm64-7.0.0-preview.23421.4.zip,https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/7c2ae5db88ce4bf2497cea5594309f00/razorlanguageserver-osx-x64-7.0.0-preview.23421.4.zip,https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/63f3cd0e2ceaa4e686657c7519a39a1f/razorlanguageserver-win-arm64-7.0.0-preview.23421.4.zip,https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/e3907604c19170097ba390f61c2cecfe/razorlanguageserver-win-x64-7.0.0-preview.23421.4.zip,https://download.visualstudio.microsoft.com/download/pr/881c5617-50b5-49fa-9075-2eadb1bb4a20/10de878742e068fda1f4c6afa05d023b/razorlanguageserver-win-x86-7.0.0-preview.23421.4.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.23421.4",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/4aca138f5c6299422e240dcc50689a67/razorlanguageserver-linux-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/eee386c129c18ba1705fe411cb981a20/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/7d1e4e0bf72de43dc272d22de2486633/razorlanguageserver-linux-musl-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/b9653cb6c40f965986266f70ae7dab25/razorlanguageserver-linux-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/679c6fe63c016298914264c33326f2ea/razorlanguageserver-osx-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/74f8a06bc496f54b37466c382c6744ee/razorlanguageserver-osx-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/695b332017bfa81af74787904979fde8/razorlanguageserver-win-arm64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/a48c3e83b44a34ddb295099c55e31e7e/razorlanguageserver-win-x64-7.0.0-preview.23423.3.zip,https://download.visualstudio.microsoft.com/download/pr/0b0d800b-570c-446a-8e29-4130bd68c63b/e188fa3cbd9a5601701d0f8de0705496/razorlanguageserver-win-x86-7.0.0-preview.23423.3.zip",
+              "NEW_DEPS_VERSION": "7.0.0-preview.23423.3",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"

__mocks__/vscode.ts

@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscodeAdapter from '../src/vscodeAdapter';
+import { getFakeVsCode } from '../test/unitTests/fakes';
+
+// This module creates a manual mock for the vscode module for running in unit tests.
+// Jest will automatically pick this up as it is in the __mocks__ directory next to node_modules.
+
+// We can consider switching to an actual jest mock (instead of this manual fake) once we entirely
+// remove the old test framework (mocha/chai).
+const vscode: vscodeAdapter.vscode = getFakeVsCode();
+module.exports = vscode;

azure-pipelines.yml

@@ -39,8 +39,25 @@ stages:
       matrix:
         linux:
           demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+        windows:
+          demandsName: ImageOverride -equals 1es-windows-2022-open
     pool:
       name: NetCore-Public
       demands: $(demandsName)
     steps:
     - template: azure-pipelines/test.yml
+
+- stage: Test_Omnisharp
+  displayName: Test Omnisharp
+  dependsOn: []
+  jobs:
+  - job: Test
+    strategy:
+      matrix:
+        linux:
+          demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
+    pool:
+      name: NetCore-Public
+      demands: $(demandsName)
+    steps:
+    - template: azure-pipelines/test-omnisharp.yml

azure-pipelines/test-omnisharp.yml

@@ -0,0 +1,26 @@
+steps:
+- checkout: self
+  clean: true
+  submodules: true
+  fetchTags: false
+  fetchDepth: 1
+
+- template: prereqs.yml
+
+- pwsh: |
+    if ($IsLinux) {
+      Write-Host "Activating screen emulation"
+      /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+      $env:DISPLAY=':99.0'
+      Write-Host "Now running tests"
+    }
+
+    npm run omnisharptest
+  displayName: 🧪 Run unit and integration tests
+
+- task: PublishPipelineArtifact@1
+  condition: failed()
+  displayName: 'Upload integration test logs'
+  inputs:
+    targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
+    artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'

azure-pipelines/test.yml

@@ -15,7 +15,7 @@ steps:
       Write-Host "Now running tests"
     }
 
-    npm run omnisharptest
+    npm run test
   displayName: 🧪 Run unit and integration tests
 
 - task: PublishPipelineArtifact@1

jest.config.ts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+
+const config: Config = {
+    verbose: true,
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    transformIgnorePatterns: ['/dist/.+\\.js'],
+    // We need to explicity ignore the out directory for modules - otherwise we'll get duplicate vscode module,
+    // the TS version from the __mocks__ directory and the compiled js version from the out directory.
+    modulePathIgnorePatterns: ['out'],
+    // Specify jest to only run tests in jest folders.
+    // We also have to include the __mocks__ folder.  That folder must be next to node_modules so we can't move it,
+    // but if we specify roots, jest won't automatically pick it up.  So we have to specify it here.
+    roots: ['<rootDir>/test/unitTests', '<rootDir>/omnisharptest/omnisharpJestTests', '<rootDir>/__mocks__'],
+};
+
+export default config;

l10n/bundle.l10n.cs.json

@@ -6,6 +6,8 @@
   "An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.": "Při instalaci ladicího programu .NET došlo k chybě. Rozšíření C# může být nutné přeinstalovat.",
   "Author": "Autor",
   "Bug": "Chyba",
+  "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# configuration has changed. Would you like to relaunch the Language Server with your changes?",
+  "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# configuration has changed. Would you like to reload the window to apply your changes?",
   "Can't parse envFile {0} because of {1}": "Nelze analyzovat envFile {0} z důvodu {1}",
   "Cancel": "Zrušit",
   "Cannot create .NET debug configurations. No workspace folder was selected.": "Nelze vytvořit konfigurace ladění .NET. Nebyla vybrána žádná složka pracovního prostoru.",
@@ -90,6 +92,7 @@
   "Razor issue data collection started. Reproduce the issue then press \"Stop\"": "Spustilo se shromažďování dat o problému Razor. Reprodukujte problém a stiskněte Zastavit.",
   "Razor issue data collection stopped. Copying issue content...": "Shromažďování dat o problému s Razorem se zastavilo. Kopíruje se obsah problému…",
   "Razor.VSCode version": "Verze Razor.VSCode",
+  "Reload Window": "Reload Window",
   "Replace existing build and debug assets?": "Nahradit existující prostředky sestavení a ladění?",
   "Report Razor Issue": "Nahlásit problém s Razorem",
   "Report a Razor issue": "Nahlásit problém s Razorem",
@@ -145,6 +148,7 @@
   "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[CHYBA] Ladicí program nelze nainstalovat. Ladicí program vyžaduje macOS 10.12 (Sierra) nebo novější.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[CHYBA] Ladicí program nelze nainstalovat. Neznámá platforma.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[CHYBA]: Rozšíření jazyka C# se nepodařilo nainstalovat balíček ladicího programu.",
+  "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
   "pipeArgs must be a string or a string array type": "pipeArgs musí být řetězec nebo typ pole řetězců",
   "{0} references": "Počet odkazů: {0}",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, vložte obsah problému jako text problému. Nezapomeňte vyplnit všechny podrobnosti, které ještě vyplněné nejsou."

l10n/bundle.l10n.de.json

@@ -6,6 +6,8 @@
   "An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.": "Fehler bei der Installation des .NET-Debuggers. Die C#-Erweiterung muss möglicherweise neu installiert werden.",
   "Author": "Autor",
   "Bug": "Fehler",
+  "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# configuration has changed. Would you like to relaunch the Language Server with your changes?",
+  "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# configuration has changed. Would you like to reload the window to apply your changes?",
   "Can't parse envFile {0} because of {1}": "envFile {0} kann aufgrund von {1} nicht analysiert werden.",
   "Cancel": "Abbrechen",
   "Cannot create .NET debug configurations. No workspace folder was selected.": ".NET-Debugkonfigurationen können nicht erstellt werden. Es wurde kein Arbeitsbereichsordner ausgewählt.",
@@ -90,6 +92,7 @@
   "Razor issue data collection started. Reproduce the issue then press \"Stop\"": "Die Sammlung von Razor-Problemdaten wurde gestartet. Reproduzieren Sie das Problem, und drücken Sie dann \"Beenden\".",
   "Razor issue data collection stopped. Copying issue content...": "Die Sammlung von Razor-Problemdaten wurde beendet. Probleminhalt wird kopiert...",
   "Razor.VSCode version": "Razor.VSCode-Version",
+  "Reload Window": "Reload Window",
   "Replace existing build and debug assets?": "Vorhandene Build- und Debugressourcen ersetzen?",
   "Report Razor Issue": "Razor-Problem melden",
   "Report a Razor issue": "Razor-Problem melden",
@@ -145,6 +148,7 @@
   "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[FEHLER] Der Debugger kann nicht installiert werden. Der Debugger erfordert macOS 10.12 (Sierra) oder höher.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[FEHLER] Der Debugger kann nicht installiert werden. Unbekannte Plattform.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[FEHLER]: Fehler beim Installieren des Debuggerpakets durch die C#-Erweiterung.",
+  "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
   "pipeArgs must be a string or a string array type": "pipeArgs muss eine Zeichenfolge oder ein Zeichenfolgenarraytyp sein.",
   "{0} references": "{0} Verweise",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, fügen Sie den Inhalt des Problems als Textkörper des Problems ein. Vergessen Sie nicht, alle nicht ausgefüllten Details auszufüllen."

l10n/bundle.l10n.es.json

@@ -6,6 +6,8 @@
   "An error occurred during installation of the .NET Debugger. The C# extension may need to be reinstalled.": "Error durante la instalación del depurador de .NET. Es posible que sea necesario reinstalar la extensión de C#.",
   "Author": "Autor",
   "Bug": "Error",
+  "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# configuration has changed. Would you like to relaunch the Language Server with your changes?",
+  "C# configuration has changed. Would you like to reload the window to apply your changes?": "C# configuration has changed. Would you like to reload the window to apply your changes?",
   "Can't parse envFile {0} because of {1}": "No se puede analizar envFile {0} debido a {1}",
   "Cancel": "Cancelar",
   "Cannot create .NET debug configurations. No workspace folder was selected.": "No se pueden crear configuraciones de depuración de .NET. No se seleccionó ninguna carpeta del área de trabajo.",
@@ -90,6 +92,7 @@
   "Razor issue data collection started. Reproduce the issue then press \"Stop\"": "Se inició la recopilación de datos de problemas de Razor. Reproduzca el problema y, a continuación, presione \"Detener\".",
   "Razor issue data collection stopped. Copying issue content...": "Se detuvo la recopilación de datos de problemas de Razor. Copiando el contenido del problema...",
   "Razor.VSCode version": "Versión de Razor.VSCode",
+  "Reload Window": "Reload Window",
   "Replace existing build and debug assets?": "¿Quiere reemplazar los recursos de compilación y depuración existentes?",
   "Report Razor Issue": "Notificar problema de Razor",
   "Report a Razor issue": "Notificar un problema de Razor",
@@ -145,6 +148,7 @@
   "[ERROR] The debugger cannot be installed. The debugger requires macOS 10.12 (Sierra) or newer.": "[ERROR] No se puede instalar el depurador. El depurador requiere macOS 10.12 (Sierra) o posterior.",
   "[ERROR] The debugger cannot be installed. Unknown platform.": "[ERROR] No se puede instalar el depurador. Plataforma desconocida.",
   "[ERROR]: C# Extension failed to install the debugger package.": "[ERROR]: la extensión de C# no pudo instalar el paquete del depurador.",
+  "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
   "pipeArgs must be a string or a string array type": "pipeArgs debe ser una cadena o un tipo de matriz de cadena",
   "{0} references": "{0} referencias",
   "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, pegue el contenido del problema como el cuerpo del problema. No olvide rellenar los detalles que no se han rellenado."