Merge pull request #6247 from dotnet/main

Snap main to release

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/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/6af168a6bc5f391916eda953ecfffe03/razorlanguageserver-linux-arm64-7.0.0-preview.23417.3.zip,https://download.visualstudio.microsoft.com/download/pr/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/712bc293d3f23c38cb2eca7f70389f31/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23417.3.zip,https://download.visualstudio.microsoft.com/download/pr/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/8cc51022f22558dfcc797d90377d755b/razorlanguageserver-linux-musl-x64-7.0.0-preview.23417.3.zip,https://download.visualstudio.microsoft.com/download/pr/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/4712fdd6db13650f6ee0f11fc5257cb8/razorlanguageserver-linux-x64-7.0.0-preview.23417.3.zip,https://download.visualstudio.microsoft.com/download/pr/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/c5f27010eea4f3a7cadd4f1b958cfa0b/razorlanguageserver-osx-arm64-7.0.0-preview.23417.3.zip,https://download.visualstudio.microsoft.com/download/pr/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/fd17eb523bbfae1d220df0d39fb920b3/razorlanguageserver-osx-x64-7.0.0-preview.23417.3.zip,https://download.visualstudio.microsoft.com/download/pr/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/f77c9a7fe37f6bb0513c2d07a312a40b/razorlanguageserver-win-arm64-7.0.0-preview.23417.3.zip,https://download.visualstudio.microsoft.com/download/pr/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/a2990f27c6d80d21fd1b643f10f713da/razorlanguageserver-win-x64-7.0.0-preview.23417.3.zip,https://download.visualstudio.microsoft.com/download/pr/ee26f9c8-c001-4bf9-8f2d-28399d3f8681/105f6bc9d733d2face4b4be6d518385e/razorlanguageserver-win-x86-7.0.0-preview.23417.3.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.23417.3",
+              "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}"

CHANGELOG.md

@@ -9,11 +9,27 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 ## Latest
+* Update Roslyn version (PR: [#6245](https://github.com/dotnet/vscode-csharp/pull/6245))
+  * Fix import completion (PR: [#69691](https://github.com/dotnet/roslyn/pull/69691))
+  * Reduce overhead on semantic token refresh requests (PR: [#69690](https://github.com/dotnet/roslyn/pull/69690))
+* Localization additions (PR: [#6233](https://github.com/dotnet/vscode-csharp/pull/6233), [#6233](https://github.com/dotnet/vscode-csharp/pull/6233), [#6206](https://github.com/dotnet/vscode-csharp/pull/6206), [#6196](https://github.com/dotnet/vscode-csharp/pull/6196))
+* Fix specific case where razor formatting no longer worked (PR: [#6195](https://github.com/dotnet/vscode-csharp/pull/6236))
+* Fix quoting bug in extension paths (PR: [#6228](https://github.com/dotnet/vscode-csharp/pull/6228))
+* Fix Razor mapping errors in the log (PR: [#6209](https://github.com/dotnet/vscode-csharp/pull/6209))
+* Add the configuration option for creating binlogs (PR: [#6155](https://github.com/dotnet/vscode-csharp/pull/6155))
+* Update option changes toast to reload window (PR: [#6174](https://github.com/dotnet/vscode-csharp/pull/6174))
+* Update Roslyn version (PR: [#6205](https://github.com/dotnet/vscode-csharp/pull/6205))
+  * Add option to capture binlogs for design time builds (PR: [#69572](https://github.com/dotnet/roslyn/pull/69572))
+  * Enable decompilation support (PR: [#69501](https://github.com/dotnet/roslyn/pull/69501))
+  * Fix move type adding to the root folder (PR: [#68995](https://github.com/dotnet/roslyn/pull/68995))
+  * Add support for compilation end diagnostics (PR: [#69541](https://github.com/dotnet/roslyn/pull/69541))
+* Bump Razor to 7.0.0-preview.23421.4 (PR: [#6195](https://github.com/dotnet/vscode-csharp/pull/6195))
+
+## 2.0.416
 * Fix UriFormatException during dotnet SDK resolution when symlinks are involved (PR: [#6230](https://github.com/dotnet/vscode-csharp/pull/6230))
 
 ## 2.0.413
 * Update Roslyn version (PR: [#6192](https://github.com/dotnet/vscode-csharp/pull/6192))
-  * Add support for compilation end diagnostics (PR: [#69541](https://github.com/dotnet/roslyn/pull/69541))
   * Include CodeLens on more types and members (PR: [#69608](https://github.com/dotnet/roslyn/pull/69608))
   * Improve performance when computing colorization (PR: [#69496](https://github.com/dotnet/roslyn/pull/69496))
 * Fix dotnet resolver returning incorrect runtime in certain scenarios (PR: [#6180](https://github.com/dotnet/vscode-csharp/pull/6180))

__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?": "Konfigurace jazyka C# se změnila. Chcete znovu spustit jazykový server se změnami?",
+  "C# configuration has changed. Would you like to reload the window to apply your changes?": "Konfigurace jazyka C# se změnila. Chcete znovu načíst okno, aby se změny použily?",
   "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": "Znovu načíst okno",
   "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": "Možnost dotnet.server.useOmharharp se změnila. Pokud chcete změnu použít, načtěte prosím znovu okno.",
   "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?": "Die C#-Konfiguration wurde geändert. Möchten Sie den Sprachserver mit Ihren Änderungen neu starten?",
+  "C# configuration has changed. Would you like to reload the window to apply your changes?": "Die C#-Konfiguration wurde geändert. Möchten Sie das Fenster neu laden, um Ihre Änderungen anzuwenden?",
   "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": "Fenster neu laden",
   "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": "Die Option \"dotnet.server.useOmnisharp\" wurde geändert. Laden Sie das Fenster neu, um die Änderung anzuwenden.",
   "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."