Skip to content

Simply cohosting generated document Uri code #11583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidwengier merged 2 commits into from
Mar 4, 2025
Merged

Simply cohosting generated document Uri code #11583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31ed7e0
Bump Roslyn and dependencies
davidwengier Mar 3, 2025
398c55e
Simplify code that deals with generated document Uris
davidwengier Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
-->
<PropertyGroup>
<_MicrosoftWebToolsPackageVersion>17.11.11-preview-0001</_MicrosoftWebToolsPackageVersion>
<_MicrosoftVisualStudioShellPackagesVersion>17.12.39557-preview.2.1</_MicrosoftVisualStudioShellPackagesVersion>
<_MicrosoftVisualStudioPackagesVersion>17.12.145-preview</_MicrosoftVisualStudioPackagesVersion>
<_MicrosoftVisualStudioShellPackagesVersion>17.13.40008</_MicrosoftVisualStudioShellPackagesVersion>
<_MicrosoftVisualStudioPackagesVersion>17.13.226</_MicrosoftVisualStudioPackagesVersion>
<_VisualStudioLanguageServerProtocolVersion>17.12.1-preview</_VisualStudioLanguageServerProtocolVersion>
<_MicrosoftExtensionsPackageVersion>8.0.0</_MicrosoftExtensionsPackageVersion>
<_BasicReferenceAssembliesVersion>1.7.2</_BasicReferenceAssembliesVersion>
Expand All @@ -17,7 +17,7 @@
<_RoslynDiagnosticAnalyzersPackageVersion>3.11.0-beta1.24508.2</_RoslynDiagnosticAnalyzersPackageVersion>
<_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</_MicrosoftVisualStudioLanguageServicesPackageVersion>
<_XunitPackageVersion>2.9.2</_XunitPackageVersion>
<_MicrosoftBuildPackageVersion>17.12.0-preview-24426-07</_MicrosoftBuildPackageVersion>
<_MicrosoftBuildPackageVersion>17.13.9</_MicrosoftBuildPackageVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -27,7 +27,7 @@
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(_BenchmarkDotNetPackageVersion)" />
<PackageVersion Include="DiffPlex" Version="1.7.2" />
<PackageVersion Include="FluentAssertions" Version="6.7.0" />
<PackageVersion Include="MessagePack" Version="2.5.187" />
<PackageVersion Include="MessagePack" Version="2.5.192" />
<PackageVersion Include="Microsoft.AspNetCore.App.Runtime.$(NetCoreSDKRuntimeIdentifier)" Version="8.0.2" />
<PackageVersion Include="Microsoft.Build.Framework" Version="$(_MicrosoftBuildPackageVersion)" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
Expand Down Expand Up @@ -84,14 +84,14 @@
<PackageVersion Include="Microsoft.VisualStudio.LanguageServices.Implementation.Symbols" Version="$(_MicrosoftVisualStudioLanguageServicesPackageVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.LiveShare" Version="0.3.1074" />
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.SDK" Version="17.7.294-pre" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.12.11-preview" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.13.7" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="$(_MicrosoftVisualStudioShellPackagesVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="$(_MicrosoftVisualStudioShellPackagesVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.2" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Implementation" Version="$(_MicrosoftVisualStudioPackagesVersion)" NoWarn="NU1701" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.13.2" />
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
<PackageVersion Include="Microsoft.VisualStudio.Web" Version="16.10.0-preview-1-31008-014" />
<PackageVersion Include="Microsoft.WebTools.Languages.Html" Version="$(_MicrosoftWebToolsPackageVersion)" />
Expand Down
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,82 +11,82 @@
<Sha>9c8e3885e783e984a48ed3585ff51d86b020d7ce</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-1.25071.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25128.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5970c1a8588cc6bac346d9ad3eebb41321713ab0</Sha>
<Sha>b531abfbc6e526397562a8d906087e1577f796a1</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
Expand Down
38 changes: 19 additions & 19 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,25 @@
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.25111.5</MicrosoftSourceBuildIntermediatearcadePackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.14.0-1.25071.1</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.14.0-1.25071.1</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-1.25071.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.14.0-1.25071.1</MicrosoftSourceBuildIntermediateroslynPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.14.0-1.25071.1</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.14.0-3.25128.2</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.14.0-3.25128.2</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25128.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.14.0-3.25128.2</MicrosoftSourceBuildIntermediateroslynPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.14.0-3.25128.2</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!--
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
Expand Down
13 changes: 8 additions & 5 deletions src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/ProjectExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,15 @@ public static bool TryGetCSharpDocument(this Project project, Uri csharpDocument
/// <summary>
/// Finds source generated documents by iterating through all of them. In OOP there are better options!
/// </summary>
public static async Task<string?> TryGetHintNameFromGeneratedDocumentUriAsync(this Project project, Uri generatedDocumentUri, CancellationToken cancellationToken)
public static bool TryGetHintNameFromGeneratedDocumentUri(this Project project, Uri generatedDocumentUri, [NotNullWhen(true)] out string? hintName)
{
// TODO: Call SourceGeneratedDocumentUri.DeserializeIdentity: https://github.com/dotnet/razor/issues/11557
if (!RazorUri.IsGeneratedDocumentUri(generatedDocumentUri))
{
hintName = null;
return false;
}

var generatedDocuments = await project.GetSourceGeneratedDocumentsAsync(cancellationToken).ConfigureAwait(false);
var document = generatedDocuments.SingleOrDefault(d => generatedDocumentUri.Equals(d.CreateUri()));
return document?.HintName;
hintName = RazorUri.GetHintNameFromGeneratedDocumentUri(project.Solution, generatedDocumentUri);
return true;
}
}
2 changes: 1 addition & 1 deletion src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public bool TryGetDocument(string filePath, [NotNullWhen(true)] out IDocumentSna

public async Task<RazorCodeDocument?> TryGetCodeDocumentFromGeneratedDocumentUriAsync(Uri generatedDocumentUri, CancellationToken cancellationToken)
{
if (await _project.TryGetHintNameFromGeneratedDocumentUriAsync(generatedDocumentUri, cancellationToken).ConfigureAwait(false) is not { } hintName)
if (!_project.TryGetHintNameFromGeneratedDocumentUri(generatedDocumentUri, out var hintName))
{
return null;
}
Expand Down
5 changes: 2 additions & 3 deletions src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteFilePathService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Composition;
using Microsoft.CodeAnalysis.ExternalAccess.Razor;
using Microsoft.CodeAnalysis.Razor.Workspaces;

namespace Microsoft.CodeAnalysis.Remote.Razor;
Expand All @@ -22,7 +23,5 @@ public override Uri GetRazorDocumentUri(Uri virtualDocumentUri)
}

public override bool IsVirtualCSharpFile(Uri uri)
{
return uri.Scheme == "roslyn-source-generated";
}
=> RazorUri.IsGeneratedDocumentUri(uri);
}