Merge main to tokenizer branch #10872

…ence-packages build 20240805.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24374.1 -> To Version 9.0.0-alpha.1.24405.2

…812.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24376.1 -> To Version 8.0.0-beta.24412.1

…814.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24408.2 -> To Version 9.0.0-beta.24414.3

…813.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24412.1 -> To Version 8.0.0-beta.24413.2

…cally

fixup semantic tokens tweask

…816.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24414.3 -> To Version 9.0.0-beta.24416.2

…ence-packages build 20240815.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24405.2 -> To Version 10.0.0-alpha.1.24415.3

…nOptionsBuilder

This change stops pushing the SuppressUniqueIds value into RazorCodeDocument.Items.

This change stops pushing the NewLine value into RazorCodeDocument.Items.

…odeDocument

…ocumentWriter

…rsionedDocumentSnapshots

…sions

This commit is just moves, no functionality changes. Minor tweaks to method visibility, and one rename of a static field :)

This probably looks like overkill, but hopefully the next commit will help explain a little about what is going on.

…rsionedDocumentSnapshots # Conflicts: # src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/DocumentContextExtensions.cs

…n't need LSP client dependencies

…820.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24416.2 -> To Version 9.0.0-beta.24420.6

…ence-packages build 20240819.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24415.3 -> To Version 10.0.0-alpha.1.24419.1

…821.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24420.6 -> To Version 9.0.0-beta.24421.2

…ttingPass

Always felt like a huge potential bug farm. eg, if Html ended up not being first we'd have bugs, working out the Order property (which was weirdly backwards?) was a pain, and the entire formatting engine produces horrible results if the ordering changes anyway.

…flag

Doing this separately, and purely mechanically, so make review easier

This was only used for validation as edits pass through the pipeline, but since we now tightly control the pipeline its unnecessary

…use only we understand our version numbers

…821.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24421.2 -> To Version 9.0.0-beta.24421.7

…821.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24413.2 -> To Version 8.0.0-beta.24421.4

@333fred

Because of a dare from @333fred, I'm currently on a crusade to remove `ItemCollection` from the Razor Compiler completely. Previously, I removed `ItemCollection` from `TagHelperDescriptorProviderContext` (dotnet#10720). This time, I'm removing it from `CodeRenderingContext`. It turns out that every `CodeRenderingContext` greedily creates an `ItemCollection`, though there are only ever two things stored there: 1. A string to use for new lines in `CodeWriter`. 2. A string representing "suppress IDs", which is already specified in `RazorCodeGenerationOptions`. These two items were really present as a hook that compiler tests could set. However, it's much easier and less wasteful to elevate both items to `RazorCodeGenerationOptions` and make tests set the options directly. I made a few other refactorings as part of this change: - I merged several abstract base classes with their single default concrete type: - `CodeRenderingContext` and `DefaultCodeRenderingContext` - `RazorCSharpDocument` and `DefaultRazorCSharpDocument`, - `RazorCodeGenerationOptions` and `DefaultRazorCodeGenerationOptions` - `RazorCodeGenerationOptionsBuilder` and `DefaultRazorCodeGenerationOptionsBuilder`. - Reworked `RazorCodeGenerationOptions` and introduced `RazorCodeGenerationOptionsFlags` to track its boolean fields. - Cleaned up `RazorCSharpDocument` and unified its collections on `ImmutableArray<>` rather than `IReadOnlyList<>`. - Enabled nullability annotations for several types. - Used more pooled collections in `CodeRenderingContext`. Note: I was careful with my commit history, and it should be clean enough to review commit-by-commit if that's your preference.

This pull request updates the following dependencies [marker]: <> (Begin:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2) ## From https://github.com/dotnet/arcade - **Subscription**: aa7f5ce7-ed24-46a1-195c-08dc952fc8a2 - **Build**: 20240821.4 - **Date Produced**: August 21, 2024 6:41:26 PM UTC - **Commit**: 4460b755f3c7c89e9660d9580ff79afc4218dd85 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24413.2 to 8.0.0-beta.24421.4][44] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24413.2 to 8.0.0-beta.24421.4][44] [44]: dotnet/arcade@51321b7...4460b75 [DependencyUpdate]: <> (End) [marker]: <> (End:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)

…823.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24421.7 -> To Version 9.0.0-beta.24423.2

…ence-packages build 20240821.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24419.1 -> To Version 10.0.0-alpha.1.24421.1

@Inject

* When @Inject is missing the member name, generate a syntactically valid c# identifier so we get intellisense * Emit an empty section when there is no typename * Add tests and update baselines

… Build ID 2524412

Since the end of last week, these tests have been failing. Seems like something changed on the platform side, perhaps a default value of a setting. Have started a thread with the editor team to see if we need to do more.

Draft until snap time.

merge main into release/dev17.12 to update for 17.12 P2. Main is 17.12 P3.

This is an automatically generated pull request from release/dev17.12 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.12 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

… Build ID 2524803 (dotnet#10790) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.

A few integration tests to investigate, but the guts are here. I'm _slightly_ worried this might cause us to recompile files more often, but there is also the chance this fixes a bunch of bugs by recompiling files more often :) Commit-at-a-time review is highly recommended, as there are lots of flow on effects of API changes

…826.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24423.2 -> To Version 9.0.0-beta.24426.3

* Use more obvious SuppressUniqueIds value * Update baselines

- Use pooled `ImmutableArray<RazorDiagnostic>.Builder` internally - Don't request pooled builder until first error is added - Make ErrorSink disposable to return builder to pool - Add GetErrorsAndClear() method to returns an `ImmutableArray<RazorDiagnostic>` and clears out the sink. - Add 'ParserContext.PushNewErrorScope(...)` to handle the temporary ErrorSinks used by CSharpCodeParser

This change cleans up ParserContext a bit and uses pooled collections within it.

Coherency update: Failed to perform coherency update for one or more dependencies. Please review the GitHub checks or run `darc update-dependencies --coherency-only` locally against darc-main-a20bf2b8-a79a-4f26-a141-1afa2bfa58d0 for more information. [marker]: <> (Begin:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d) ## From https://github.com/dotnet/arcade - **Subscription**: 2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d - **Build**: 20240826.3 - **Date Produced**: August 26, 2024 5:01:25 PM UTC - **Commit**: e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 9.0.0-beta.24423.2 to 9.0.0-beta.24426.3][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24423.2 to 9.0.0-beta.24426.3][1] [1]: dotnet/arcade@9159926...e3bdd9a [DependencyUpdate]: <> (End) [marker]: <> (End:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d)

…826.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24352.2 -> To Version 9.0.0-beta.24426.3

This pull request updates the following dependencies [marker]: <> (Begin:761d0bec-2526-451d-fdf9-08dcc6cdae74) ## From https://github.com/dotnet/arcade - **Subscription**: 761d0bec-2526-451d-fdf9-08dcc6cdae74 - **Build**: 20240826.3 - **Date Produced**: August 26, 2024 5:01:25 PM UTC - **Commit**: e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 9.0.0-beta.24352.2 to 9.0.0-beta.24426.3][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24352.2 to 9.0.0-beta.24426.3][1] [1]: dotnet/arcade@4a7d983...e3bdd9a [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates sdk.version to 9.0.100-preview.7.24407.12 - Updates tools.dotnet to 9.0.100-preview.7.24407.12 [marker]: <> (End:761d0bec-2526-451d-fdf9-08dcc6cdae74)

…release/dev17.11-to-release/dev17.12

This is an automatically generated pull request from release/dev17.12 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.12 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

This is an automatically generated pull request from release/dev17.11 into release/dev17.12. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.11 - https://github.com/dotnet/razor/find/release/dev17.12 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```

This is an automatically generated pull request from release/dev17.12 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.12 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

… large chunk of the generated file

…ing engine has known issues

…10806) Fixes dotnet#10759 Initially when investigating this I was digging into buffer versions and race conditions, but now that the editor fix is in, and we are self versioned, the bug stood out much more obviously: A character offset was being passed in to a parameter that expected a length 🤦‍♂️ Sadly none of the `RazorCustomMessageTarget` code is testable. Cohosting will make this trivial though, as we would simply create a new `Document` with the provisional change, and drop it on the floor when we're finished.

* Change UseConsolidatedMvcViews to default to true * Update baselines * Update LSP test

Fixes integration test failures in Find All References. Roslyns LSP types got much more spec compliant in dotnet/roslyn#73911 and we were never sending the `Context` property in our request, so deserialization failed on their end.

* Don't create a taghelper with no matching rules * Add test --------- Co-authored-by: Jan Jones <[email protected]>

This is an automatically generated pull request from release/dev17.12 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.12 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

Purely mechanical changes here - using primary constructors, interfaces over abstract classes, etc.

…s in generated Html (dotnet#10805) Fixes https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2222322 Our use of tildes as replacement characters for C# in Html documents has never been great, and has caused issues with JS/TS and Html tooling in the past, but it seems there are scenarios where large/complicated/specifically formed Razor documents can actually crash the JS compiler. Seems it has a perf issue where lots of unary negation (ie, `~`) causes stack size issues. This PR mitigates the issue by encoding any stretch of C# characters that are 4 characters or longer as a JS comment (`/*~~~*/`) so that the compiler will ignore some of the more problematic chunks of Razor files. There is one case where we couldn't do that, but any pressure relief should help even if it's not 100%.

* Factoring out AutoInsertService * Switch non-cohost endpoint to use new AutoInsertService * Adding Remote and OOB AutoInsertService classes and OnAutoInsertProviders * Add common code for capabilities * Add cohost OnAutoInsert endpoint * Parameter rename * Update src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/AutoInsert/AutoClosingTagOnAutoInsertProvider.cs Co-authored-by: David Wengier <[email protected]> * Update src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/AutoInsert/IAutoInsertService.cs Co-authored-by: David Wengier <[email protected]> * Update src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/AutoInsert/InsertTextEdit.cs Co-authored-by: David Wengier <[email protected]> * Fixup after rebase * More post-build cleanup * Move common HTML and C# auto-insert trigger chars per CR suggestion * More cleanup after rebase * Add IOnAutoInsertTiggerCharacterProvider per CR suggestion * Removing trigger characters property from RemoteAutoInsertService per CR suggestion * Switch to using RemoteResponse * Fixup bad resolve after rebase, and extra whitespace in RazorLangaugeServer * Complete capabilities check in CohostingOnAutoInsertEndpoing registration * Change input position type to serializable :LinePosition * Fixing RemoteInsertTextEdit to use properly annotated (for serialization) types only * Support for delegating auto-insert to C# * Fixup after rebase * Fixup AutoClosingTagOnAutoInsertProviderTest tests * Fixinfg up CloseTextTagOnAutoInsertProviderTest tests * Fixing up OnAutoInsertEndpointTest (which also tests the new AutoInsertService) * Fixing duplicate OnAutoInsert handler registration (bad merge after rebate) * Fixes to MEF composition issue and capabilities check - IDocumentMappingService was not needed (and not available via MEF), so removed that - TextDocument does not implmement VSInternalTextDocumentClientCapabilities * Fixing incorrect export type * Minor cleanup per CR suggestions * Switching parameters to RazorCodeDocument and removing async in a lot of places per CR suggestion * Fixing build - removing unneeded using * Fix RemoteAutoInsertService logic to follow existing code (always prefer our own AutoInsertService first) * Check allowed trigger characters before delegating to other languages/servers * Plumbing through actual option values we need and using them * Fixup After Rebase * Consuming RazorFormattingService in remote OnAutoInsert service * Fixing exception in RemoteProjectSnapshot.Configuration Moving GetFormatterCodeDocumentAsync() into IDocumentSnapshot (and implementations of that) to allow eaiser differentiation of behavior in remote (cohosting) case where we don't need to check the flag on Project.Configuration. Also AddUsingStatementsIfNeeded *always* gets called, even in cases when they are not actually needed, so we can't Debug.Fail there. * Switch to PreferHtmlInAttributeValuesDocumentPositionInfoStrategy as the original code does That allows the code insert double-quotes by delegating to HTML language server after attribute name and equals. * Cleanup usings * More usings cleanup * PR feedback - minor cleanup and removal of InsertTextEdit type in favor of VSInternalDocumentOnAutoInsertResponseItem * PR feedback - removing MEF usage from RemoteAdhocWorkspaceFactory, minor cleanup * PR feedback * Type and method renames, minor cleanup per PR feedback * Renaming interface methods, removing unnecessary usage of FrozenSet * Use ImmutableArray to store providers * Switching to bool and out on IAutoInsertService and implementation * Cleaned up document position info calculation per PR feedback * Minor cleanup in RemoteAutoInsertService * Cleanup trigger character calculation in CohostOnAutoInsertEndpoint * Formatting changes, VsLspFactory usage * Revert to MEF DI in RemoteAdhocWorkspaceFactory/RemoteRazorFormattingService * Removing Rolsyn to VS LSP extension methods * Switch to raw strings in tests and minor whitespace cleanup * Rename per PR feedback suggestion to better indicate the purpose * Cleanup formatting code document acquisition per PR feedback Creating IFormattingCodeDocumentProvider service with seprate LSP and Remote implementations to provide code document appropriate for formatting. * Removing redundant assert as compiler is already doing the check * Unnecessary assignment cleanup * Misc PR feedback cleanup * Made GetGeneratedOutputAsync an extension method per PR feedback * Remaining MEF parameter attrivute formatting changes * Last of the PR feedback. * Fixing most unit test failures. Extension methods can't be used for Mock setups, so since I made GetGeneratedOutputAsync() with no parameter an extension method, I had to switch unit tests to use GeGeneratedOutputAsync(It.Any<bool>()) * Fixing last 4 unit test failures We still had non-parameter GetGeneratedOutputAsycnc in DocumentSnapshot (even though it wasn't in IDocumentSnapshot) which was getting called internally. That was both messy (since there is now no-parameter extension method on IDocumentSnapshot) and was causing issues in tests --------- Co-authored-by: David Wengier <[email protected]>

@phil-allen-msft

Fixes an issue found in app building. Thanks @phil-allen-msft! Also fixes dotnet#9161 To make reviewing easier: * First commit is entirely mechanical cleanup, renames, etc. and can be skipped. * Second commit is the fix. * Third commit is tests. * Fourth commit is updating more tests because these days when you ask VS to build things it doesn't build all of it and I need to get into the habit of doing a command line build before pushing Because of the type and file renames, looking at the PR as a whole is inadvised.

# Conflicts: # src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCSharpFormattingBenchmark.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/OnAutoInsertEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormatter.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlineCompletion/InlineCompletionEndPoint.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/FormattingContext.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/IRazorFormattingService.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/FormattingContentValidationPass.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/FormattingDiagnosticValidationPass.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/HtmlFormattingPassBase.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs # src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Formatting/RemoteCSharpOnTypeFormattingPass.cs # src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Formatting/RemoteRazorFormattingPass.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/RazorOnAutoInsertProviderTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/DelegatedCompletionItemResolverTest.NetFx.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingLanguageServerTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/TestRazorFormattingService.cs

…et#10778) I nerd sniped myself thinking about how to get formatting into cohosting, given the limitations Alex ran into doing the relayering for auto insert, and this is the result. I was going to go further and port the actual formatting endpoint to cohosting, but that would have ran into the same issue that Alex did with auto insert, so I figured I'd wait for that to merge, and put this up in the meantime. This unblocks the formatting, code action and completion end points from being ported. Part of dotnet#10743 Part of dotnet#9519 I **strongly** recommend reviewing commit-at-a-time, as I did this deliberately in an order, and in order to (hopefully) make reviewing easier. Though granted, there are a lot of commits.

Fixes dotnet#10160

### Summary of the changes - Fixes:

So it can be shared

…ng service

These don't test the full capabilities of the formatting engine, just that it runs in cohosting

…ence-packages build 20240828.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24421.1 -> To Version 10.0.0-alpha.1.24428.1

It is perfectly legal for a PooledArrayBuilder<T> to be drained via one of the DrainToImmutable* methods and then continue adding items to the builder. However, if the inner ImmutableArray<T>.Builder's capacity was set to 0 during the drain, its capacity will not be reset to any specified value when adding new items. This change fixes that.

@tmat

…dotnet#10828) This fixes an issue that @tmat pointed out to me over email. In a recent change (dotnet#10720), I added a call to `Assumed.Unreachable()` when `[EventHandler]` tag helper discovery encounters an attribute with invalid constructor attributes. However, throwing an exception during tag helper discovery is usually the wrong approach. Normally, if Roslyn symbols aren't in the proper shape during tag helper discovery, Razor will simply not produce a tag helper. (We _do_ support diagnostics for tag helpers, but those are usually reserved for warnings and errors that are related to a tag helper's data that would make it unusable, such as a name containing whitespace.) It turns out that the "unreachable" condition wasn't actually all that unreachable and @tmat was hitting it while working on hot reload tests. So, I've changed the code to make the success conditions clearer, i.e., the attribute data must match one of the two constructor calls. And, I changed the logic to simply skip `[EventHandler]` attributes that don't meet the success conditions.

Fixes dotnet#10823

Was only used in one place, and that place could never have any result except false due to a FileKind check above

This is only called from the LSP server, and shouldn't be called from cohosting, so now it can't be!

* Update dependencies from https://github.com/dotnet/arcade build 20240829.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24426.3 -> To Version 9.0.0-beta.24429.3 * Update dependencies from https://github.com/dotnet/arcade build 20240829.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24429.3 -> To Version 9.0.0-beta.24429.5 * Failed to perform coherency update for one or more dependencies. --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…826.2 (dotnet#10808) Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24421.4 -> To Version 8.0.0-beta.24426.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/arcade build 20240624.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.1 * Update dependencies from https://github.com/dotnet/arcade build 20240624.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.7 * Update dependencies from https://github.com/dotnet/arcade build 20240624.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.7 * Update dependencies from https://github.com/dotnet/arcade build 20240624.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.7 * Update dependencies from https://github.com/dotnet/arcade build 20240624.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.7 * Update dependencies from https://github.com/dotnet/arcade build 20240626.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24326.4 * Update dependencies from https://github.com/dotnet/arcade build 20240626.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24326.4 * Update dependencies from https://github.com/dotnet/arcade build 20240628.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24328.2 * Update dependencies from https://github.com/dotnet/arcade build 20240628.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24328.2 * Update dependencies from https://github.com/dotnet/arcade build 20240702.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1 * Update dependencies from https://github.com/dotnet/arcade build 20240702.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1 * Update dependencies from https://github.com/dotnet/arcade build 20240702.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1 * Update dependencies from https://github.com/dotnet/arcade build 20240702.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1 * Update dependencies from https://github.com/dotnet/arcade build 20240702.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1 * Update dependencies from https://github.com/dotnet/arcade build 20240702.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1 * Update dependencies from https://github.com/dotnet/arcade build 20240702.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24352.1 * Update dependencies from https://github.com/dotnet/arcade build 20240709.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24359.3 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5 * Update dependencies from https://github.com/dotnet/arcade build 20240710.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24360.5 * Update dependencies from https://github.com/dotnet/arcade build 20240716.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24366.7 * Update dependencies from https://github.com/dotnet/arcade build 20240717.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1 * Update dependencies from https://github.com/dotnet/arcade build 20240717.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1 * Update dependencies from https://github.com/dotnet/arcade build 20240717.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1 * Update dependencies from https://github.com/dotnet/arcade build 20240717.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1 * Update dependencies from https://github.com/dotnet/arcade build 20240717.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24367.1 * Update dependencies from https://github.com/dotnet/arcade build 20240722.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24372.3 * Update dependencies from https://github.com/dotnet/arcade build 20240722.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24372.3 * Update dependencies from https://github.com/dotnet/arcade build 20240722.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24372.3 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24376.1 * Update dependencies from https://github.com/dotnet/arcade build 20240812.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24376.1 -> To Version 8.0.0-beta.24412.1 * Update dependencies from https://github.com/dotnet/arcade build 20240813.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24412.1 -> To Version 8.0.0-beta.24413.2 * Update dependencies from https://github.com/dotnet/arcade build 20240821.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24413.2 -> To Version 8.0.0-beta.24421.4 * Update dependencies from https://github.com/dotnet/arcade build 20240826.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24421.4 -> To Version 8.0.0-beta.24426.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…tic> to an ImmutableArray<RazorDiagnostic> (dotnet#10797) This pull request represents several changes with the ultimate goal of exposing `RazorSyntaxTree.Diagnostics` as an `ImmutableArray<RazorDiagnostic>` rather than an `IReadOnlyList<RazorDiagnostic>`: - Clean up `RazorSyntaxTree` and get rid of `DefaultRazorSyntaxTree`. - Add `(Drain)ToImmutableOrdered*` methods to `PooledArrayBuilder<T>`. Note that this change also includes a refactoring to the various unit tests for ordering to share test data that I've isolated to a single commit. - Clean up and improve `ErrorSink` to no longer greedily create a new `List<T>` before any errors are encountered. - Clean up `ParserContext` and make it used pooled collections. - Use pooled collections when computing and caching the result of `RazorSyntaxTree.Diagnostics`.

…903.1 (dotnet#10835) Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.24429.5 -> To Version 9.0.0-beta.24453.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…se/dev17.11

…se/dev17.12

This is an automatically generated pull request from release/dev17.11 into release/dev17.12. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.11 - https://github.com/dotnet/razor/find/release/dev17.12 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```

* Implemented a line normalization function that prevents the language server from sending /r to LF line ending docs * check if indentation location has been processed * added LF line ending document to all previous razor formatting test cases * skipping some LF line ending formatting tests. Created an issue to track the progress

dotnet#10562) This pull request updates the following dependencies [marker]: <> (Begin:011df26a-fbd1-45b0-94b9-08db3601dcca) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 011df26a-fbd1-45b0-94b9-08db3601dcca - **Build**: 20240828.1 - **Date Produced**: August 28, 2024 4:47:08 PM UTC - **Commit**: 6bcf90f99d13da86c5e9753a6f34b6484673d0a0 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.0-alpha.1.24421.1 to 10.0.0-alpha.1.24428.1][10] [10]: dotnet/source-build-reference-packages@bdd6987...6bcf90f [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)

This is an automatically generated pull request from release/dev17.10 into release/dev17.11. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.10 - https://github.com/dotnet/razor/find/release/dev17.11 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```

…tnet#10831) Chris found these to be problematic in his branch where he enabled the source generator, but fortunately they're simply unnecessary in cohosting.

# Conflicts: # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs

This is an automatically generated pull request from release/dev17.11 into release/dev17.12. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.11 - https://github.com/dotnet/razor/find/release/dev17.12 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```

Fixes dotnet#10743 Part of dotnet#9519 Brings formatting to cohosting. Relatively simple because of previous PRs. Have left sharing full test coverage of the formatting engine for later

* Add a test * Use fully globally qualified type name * Update baselines * Fix delegates and child content * Update baselines * Fix other child content scenarios * Update baselines * Encapsulate shared code

This is an automatically generated pull request from release/dev17.12 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.12 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

…ation # Conflicts: # eng/targets/Services.props

This should have been fixed with dotnet#10807 but without the Roslyn bump I guess I didn't realise. Oops!

Needs dotnet/roslyn#74978 Fixes dotnet#10695 Part of dotnet#9519 Pretty straightforward. A tiny bit of code moved to be shared with Go To Def, but that's it.

# Conflicts: # eng/targets/Services.props # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs

This is an automatically generated pull request from release/dev17.12 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.12 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```

Needs dotnet/roslyn#74978 Fixes dotnet#10746 Part of dotnet#9519

* OnAutoInsert Cohosting Tests * Fixing C# case (and correcting others) All text should already be in the document/buffer when OnAutoInsert is being executed. Tigger character is not being added to the buffer, it should already be in the buffer. * PR feedback Switching to applying edit instead of verifying edit contents and range. Switching from Theories to separate Facts where input was complex. Other misc cleanup. * Fixing options source and adding options tests * Tests for all options * Switching to use TestCode class * Create options object for cohost OnAutoInsert to combined individual options passed to the remove service. * More PR feedback * Switching to nested RazorFormattingOptions

This keeps failing, and formatting it doesn't add any value to our integration tests IMO

This commit wasn't purely mechanical, but it was close. Just making things mostly compile, no optimizations or anything yet, and probably still a bunch more renames to come.

Haven't run the tests yet :)

All tests pass!

Most places already passed an ImmutableArray here. I left the method itself being an iterator, as 50% of callers need an ImmutableArray result, but the other 50% need an array, so no clear winner.

All callers did the conversion anyway

A clean error list is a good error list.

…ence-packages build 20240905.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24428.1 -> To Version 10.0.0-alpha.1.24455.1

…tension method on RazorCodeDocument (dotnet#10851) For a long while, the `GetLanguageKind(...)` method that determines whether an index into a document falls within Razor, C# or HTML has been a bit of a wart on the `IDocumentMappingService`. It really isn't part of document mapping, and its implementation is completely distinct. In fact, making the actual change is quite simple, so why hadn't it been done yet? The answer is mocking. There are several tests that mock `IDocumentMappingService.GetLanguageKind(...)` to lie about test inputs. In my not-so-humble opinion, this represents an abuse of mocking. Instead of setting up tests to have the necessary inputs that ensure `GetLanguageKind(...)` would return a real and correct result, the inputs would often be garbage and an `IDocumentMappingService` mock would lie about the `GetLanguageKind(...)` result at a particular location. This makes moving `GetLanguageKind(...)` off of `IDocumentMappingService` a much larger change than it needs to be. This is why there are substantial test changes in this PR. Don't misunderstand me as a mocking hater! Mocking libraries are definitely useful! In fact, there are new mocks used in this very PR! However, mocks should be used judiciously and thoughtfully, and in this case, a mock was used to write lazy tests. Fixes dotnet#8774

dotnet#10858) This pull request updates the following dependencies [marker]: <> (Begin:011df26a-fbd1-45b0-94b9-08db3601dcca) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 011df26a-fbd1-45b0-94b9-08db3601dcca - **Build**: 20240905.1 - **Date Produced**: September 5, 2024 10:13:43 PM UTC - **Commit**: ad3c9aa85596f42c6a483233c50fab8cee8c412a - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 10.0.0-alpha.1.24428.1 to 10.0.0-alpha.1.24455.1][1] [1]: dotnet/source-build-reference-packages@6bcf90f...ad3c9aa [DependencyUpdate]: <> (End) [marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)

…dit` (dotnet#10855) Fixes dotnet#10842 The formatting self-nerd-sniping continues. The formatting engine was written to use the LSP `TextEdit` class, which makes some sense, but also uses Roslyn APIs like `SourceText` a lot, which uses the `TextChange` struct instead. This meant lots of code to convert to and from the two types. Changing the whole formatting engine over to `TextChange`, and using more `TextSpan`, `LinePositionSpan` etc. removes a lot of this code. It also makes a lot more sense in cohosting, to boot. I wouldn't claim that I've gone through and improved the perf of the formatting engine, but rather I've use the changes to lead me to things that need fixing. ie, I started out moving from `TextEdit[]` to `ImmutableArray<TextChange>`, and this let me to places where pooled array builders could be used, and places where `Range` and `Position` were used which didn't make much sense, and then the constructor for `LinePosition` threw at one point because it turns out we were only using the `Line` property from the `Position` that used to be used, and so never validated the characters, so that API moved to `int`, etc. TL;DR the commits tell the story, and there could well be something I missed, if it never came across my plate for another reason.

…enizer * upstream/main: (270 commits) Fix after merge PR Feedback Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240905.1 Fix auto insert service after merge from main PR Feedback Use ImmutableArray in SourceTextDiffer too Create a helper method and revert change to shared code, just in case Convert HtmlFormatter to ImmutableArray<TextChange> IEnumarable to ImmutableArray Remove some more usage of LSP types, and simplify ranges to line numbers Use pooled collections in a few more spots Extract common code to helper method Rename some methods to Try... pattern Rename some variables etc. Fix broken tests Get all consuming code compiling again Convert TextEdit to TextChange Remove flaky test OnAutoInsert Cohosting Tests (dotnet#10829) Update GetLanguageKind(...) tests and move to Workspaces.Test ...

Commits on Sep 1, 2024

Skip flaky test

davidwengier authored Sep 1, 2024

Configuration menu

View commit details

Copy full SHA for 18c3107

Browse repository at this point

Copy the full SHA

18c3107 View commit details

Browse the repository at this point in the history

Commits on Sep 7, 2024

Remove flaky test

davidwengier committed Sep 7, 2024

Configuration menu

View commit details

Copy full SHA for 6186646

Browse repository at this point

Copy the full SHA

6186646 View commit details

Browse the repository at this point in the history

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main to tokenizer branch #10872

Merge main to tokenizer branch #10872

Commits on Aug 12, 2024

Commits on Aug 14, 2024

Commits on Aug 15, 2024

Commits on Aug 16, 2024

Commits on Aug 17, 2024

Commits on Aug 18, 2024

Commits on Aug 19, 2024

Commits on Aug 20, 2024

Commits on Aug 21, 2024

Commits on Aug 22, 2024

Commits on Aug 23, 2024

Commits on Aug 24, 2024

Commits on Aug 25, 2024

Commits on Aug 26, 2024

Commits on Aug 27, 2024

Commits on Aug 28, 2024

Commits on Aug 29, 2024

Commits on Aug 30, 2024

Commits on Sep 1, 2024

Commits on Sep 2, 2024

Commits on Sep 3, 2024

Commits on Sep 4, 2024

Commits on Sep 5, 2024

Commits on Sep 6, 2024

Commits on Sep 7, 2024

Commits on Sep 9, 2024

Commits on Sep 10, 2024