Merge pull request #6939 from davidwengier/CodeBlockFormattingOption

Add option for formatting code block open braces
dotnet · Mar 5, 2024 · 091ed53 · 091ed53
2 parents 7ffeed4 + ed94a24
commit 091ed53
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 47 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -169,8 +169,8 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/df5123052f373f09ea917bfe3eed062a/razorlanguageserver-linux-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/d824625f4579e30e8db44d60321063ec/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/eec1d3a9302ee33a4cb0e204174d649f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/7bc6da40ca09c2afb6e83631297e2d33/razorlanguageserver-linux-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/f59f943afd1164f1241c052f51dcfac5/razorlanguageserver-osx-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/18f1f526b2f4d34c0972022aa300a577/razorlanguageserver-osx-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/d3836b547c605fbe7b2d414e990285b8/razorlanguageserver-platformagnostic-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/b07322d606733c7ec0ca7211d7761a08/razorlanguageserver-win-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/6fef4d9f617dd94342383f96cc28e6dd/razorlanguageserver-win-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/5557c0738b48d4fbc040317033b82346/razorlanguageserver-win-x86-7.0.0-preview.24151.1.zip",
-              "NEW_DEPS_VERSION": "7.0.0-preview.24151.1",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4b87ad9c650d1a126028ddf321ceb414/razorlanguageserver-linux-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/800035f453a9940e55d8ae7d809e17cb/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/ed8daaefd18671d15ea5e8c7443be63e/razorlanguageserver-linux-musl-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/b22635192b6ec100594d9cb43714d9a1/razorlanguageserver-linux-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0fa0001436d8d25e8f280e00fef66f39/razorlanguageserver-osx-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0dbaf11941ee43e084794fa342ee4988/razorlanguageserver-osx-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/9464bb3e526dc42e36558275a02eb723/razorlanguageserver-platformagnostic-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/c4313f9a64c8f0cfc017bf3fc14e1d41/razorlanguageserver-win-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/041b809043c733b8f5948a148488f1c1/razorlanguageserver-win-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/5adbc50be4338beeeb83777f9b00903f/razorlanguageserver-win-x86-7.0.0-preview.24154.7.zip",
+              "NEW_DEPS_VERSION": "7.0.0-preview.24154.7",
               "NEW_DEPS_ID": "Razor"
           },
           "cwd": "${workspaceFolder}"
@@ -185,8 +185,8 @@
             "updatePackageDependencies"
         ],
         "env": {
-            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/335a13de31886ca24ea4b5e4c3747a3e/devkittelemetry-linux-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/fe4c910f2ee9de76b73346d4cbfca01f/devkittelemetry-linux-musl-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/cd6e7fbec886daa7cba58220498652ef/devkittelemetry-linux-musl-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/6f6b95c75f659e53fc771653f10a34fe/devkittelemetry-linux-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/82723fee5a3b1cdff8e07f9d968abb82/devkittelemetry-osx-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/186727cce33fcb6dad9b4872a3b49f2b/devkittelemetry-osx-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/de0ddda3b603f8c1c2d97358b91f3efc/devkittelemetry-platformagnostic-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/3441e44f0e7558691fbad5cf89b4b34f/devkittelemetry-win-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/baa44b197ca0b0d372fe93de5cd90248/devkittelemetry-win-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/852d5c6eaa576d5c65a25af8b8a1cea6/devkittelemetry-win-x86-7.0.0-preview.24151.1.zip",
-            "NEW_DEPS_VERSION": "7.0.0-preview.24151.1",
+            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/8a2ecaefa3a40739894c902e6a2864d8/devkittelemetry-linux-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/32f28eb9d870a91dc2b36b2557371501/devkittelemetry-linux-musl-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/846487d0048f3fe00ea88f3800cf5f89/devkittelemetry-linux-musl-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/1460a276de692bdcad14313d26e8b38d/devkittelemetry-linux-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/d41e665b57cb8fd50909b3e4349c6842/devkittelemetry-osx-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/64efd8e7029567ffc0997d8ae7e11c54/devkittelemetry-osx-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/a2f7d9d5a9aa2c2af9a305c654ae284b/devkittelemetry-platformagnostic-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/2dc101f74e9f3547698f6e211ac87071/devkittelemetry-win-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4aa2c18116fdc4c8bfa6e8dd11787949/devkittelemetry-win-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/826f6210f23a3bac8f05e599da1c0145/devkittelemetry-win-x86-7.0.0-preview.24154.7.zip",
+            "NEW_DEPS_VERSION": "7.0.0-preview.24154.7",
             "NEW_DEPS_ID": "RazorTelemetry"
         },
         "cwd": "${workspaceFolder}"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,11 +8,12 @@
   * Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247))
   * Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862))
   * Report better warnings and errors if build hosts exit abnormally (PR: [#71909](https://github.com/dotnet/roslyn/pull/71909))
-* Update Razor to 7.0.0-preview.24151.1 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
+- Update Razor to 7.0.0-preview.24154.7 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
   - Upgrade language server to run on .NET 8 (PR: [#9981](https://github.com/dotnet/razor/pull/9981))
   - Support inlay hints (PR: [#9904](https://github.com/dotnet/razor/pull/9904) and [#6857](https://github.com/dotnet/vscode-csharp/pull/6857))
   - Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891))
   - Better using directive completiong (PR: [#9982](https://github.com/dotnet/razor/pull/9982))
+  - Add option to format code block open brace on new line (PR: [#10018](https://github.com/dotnet/razor/pull/10018) and [#6939](https://github.com/dotnet/vscode-csharp/pull/6939))
 
 ## 2.19.13
 * Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879))