Skip to content

Commit e4fb035

Browse files
author
Andrew Hall
authored
Fix cases where there is a space in the URI (#11745)
Getting a TextDocument from Roslyn uses ProtocolConversions.GetDocumentFilePathFromUri so we have to match with the file name when returning DynamicFileInfo
2 parents 7fb62fb + ccc3723 commit e4fb035

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Microsoft.VisualStudioCode.RazorExtension.csproj

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<PackageReference Include="Microsoft.Extensions.ObjectPool" />
2626
<PackageReference Include="Microsoft.Extensions.Logging" />
2727
<PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
28-
29-
<!-- Roslyn does not use Microsoft.VisualStudio.LanguageServer.Protocol so we have to pack it -->
30-
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" GeneratePathProperty="True" />
3128
</ItemGroup>
3229

3330
<ItemGroup>
@@ -59,13 +56,13 @@
5956
<Content Include="$(PublishDir)\fr\**\*.*" Pack="true" PackagePath="content\fr\" CopyToOutputDirectory="PreserveNewest" />
6057
<Content Include="$(PublishDir)\it\**\*.*" Pack="true" PackagePath="content\it\" CopyToOutputDirectory="PreserveNewest" />
6158
<Content Include="$(PublishDir)\ja\**\*.*" Pack="true" PackagePath="content\ja\" CopyToOutputDirectory="PreserveNewest" />
62-
<Content Include="$(PublishDir)\ko\**\*.*" Pack="true" PackagePath="content\ko\" CopyToOutputDirectory="false" />
63-
<Content Include="$(PublishDir)\pl\**\*.*" Pack="true" PackagePath="content\pl\" CopyToOutputDirectory="false" />
64-
<Content Include="$(PublishDir)\pt-BR\**\*.*" Pack="true" PackagePath="content\pt-BR\" CopyToOutputDirectory="false" />
65-
<Content Include="$(PublishDir)\ru\**\*.*" Pack="true" PackagePath="content\ru\" CopyToOutputDirectory="false" />
66-
<Content Include="$(PublishDir)\tr\**\*.*" Pack="true" PackagePath="content\tr\" CopyToOutputDirectory="false" />
67-
<Content Include="$(PublishDir)\zh-Hans\**\*.*" Pack="true" PackagePath="content\zh-Hans\" CopyToOutputDirectory="false" />
68-
<Content Include="$(PublishDir)\zh-Hant\**\*.*" Pack="true" PackagePath="content\zh-Hant\" CopyToOutputDirectory="false" />
59+
<Content Include="$(PublishDir)\ko\**\*.*" Pack="true" PackagePath="content\ko\" CopyToOutputDirectory="PreserveNewest" />
60+
<Content Include="$(PublishDir)\pl\**\*.*" Pack="true" PackagePath="content\pl\" CopyToOutputDirectory="PreserveNewest" />
61+
<Content Include="$(PublishDir)\pt-BR\**\*.*" Pack="true" PackagePath="content\pt-BR\" CopyToOutputDirectory="PreserveNewest" />
62+
<Content Include="$(PublishDir)\ru\**\*.*" Pack="true" PackagePath="content\ru\" CopyToOutputDirectory="PreserveNewest" />
63+
<Content Include="$(PublishDir)\tr\**\*.*" Pack="true" PackagePath="content\tr\" CopyToOutputDirectory="PreserveNewest" />
64+
<Content Include="$(PublishDir)\zh-Hans\**\*.*" Pack="true" PackagePath="content\zh-Hans\" CopyToOutputDirectory="PreserveNewest" />
65+
<Content Include="$(PublishDir)\zh-Hant\**\*.*" Pack="true" PackagePath="content\zh-Hant\" CopyToOutputDirectory="PreserveNewest" />
6966
</ItemGroup>
7067
</Target>
7168
</Project>

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/DynamicFileInfoProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ internal sealed partial class LspDynamicFileProvider(IRazorClientLanguageServerM
4848
_clientLanguageServerManager);
4949

5050
return new RazorDynamicFileInfo(
51-
response.CSharpDocument.Uri.ToString(),
51+
RazorUri.GetDocumentFilePathFromUri(response.CSharpDocument.Uri),
5252
SourceCodeKind.Regular,
5353
textLoader,
5454
documentServiceProvider: EmptyServiceProvider.Instance);

0 commit comments

Comments
 (0)