Skip to content

Commit c4b31c3

Browse files
DustinCampbellDustinCampbell
committed
Apply suggestions from code review feedback
1 parent 46a0223 commit c4b31c3

File tree

4 files changed

+24
-33
lines changed

4 files changed

+24
-33
lines changed

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Opt-in arcade features -->
33
<PropertyGroup>
44
<UsingToolVSSDK>true</UsingToolVSSDK>
5-
<MicrosoftVSSDKBuildToolsVersion>17.3.2094</MicrosoftVSSDKBuildToolsVersion>
5+
<MicrosoftVSSDKBuildToolsVersion>17.9.201-preview1-g58652eded2</MicrosoftVSSDKBuildToolsVersion>
66
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
77
<!-- Use .NET Framework reference assemblies from a nuget package so machine-global targeting packs do not need to be installed. -->
88
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>

‎src/Razor/Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Project>
33
<!-- Only include .NET Framework files when building for .NET Framework -->
44
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
5-
<Compile Remove="**\*.NetFX.cs" />
5+
<Compile Remove="**\*.NetFx.cs" />
66
<Compile Remove="**\NetFx\**\*.*" />
77
<Compile Remove="**\*_NetFx\**\*.*" />
88

9-
<None Include="**\*.NetFX.cs" />
9+
<None Include="**\*.NetFx.cs" />
1010
<None Include="**\NetFx\**\*.*" />
1111
<None Include="**\*_NetFx\**\*.*" />
1212
</ItemGroup>

‎src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,9 @@ public async Task Handle_InCodeDirective_SupportsFileCreationTrue_ReturnsResult(
224224
Assert.NotNull(razorCodeActionResolutionParams);
225225
var actionParams = ((JObject)razorCodeActionResolutionParams.Data).ToObject<ExtractToCodeBehindCodeActionParams>();
226226
Assert.NotNull(actionParams);
227-
Assert.Equal(removeSpan.Start, actionParams.RemoveStart);
228-
Assert.Equal(extractSpan.Start, actionParams.ExtractStart);
229-
Assert.Equal(extractSpan.End, actionParams.ExtractEnd);
230-
Assert.Equal(removeSpan.End, actionParams.RemoveEnd);
227+
228+
Assert.Equal(removeSpan, TextSpan.FromBounds(actionParams.RemoveStart, actionParams.RemoveEnd));
229+
Assert.Equal(extractSpan, TextSpan.FromBounds(actionParams.ExtractStart, actionParams.ExtractEnd));
231230
}
232231

233232
[Fact]
@@ -270,10 +269,8 @@ public async Task Handle_AtEndOfCodeDirectiveWithNoSpace_ReturnsResult()
270269
var actionParams = ((JObject)razorCodeActionResolutionParams.Data).ToObject<ExtractToCodeBehindCodeActionParams>();
271270
Assert.NotNull(actionParams);
272271

273-
Assert.Equal(removeSpan.Start, actionParams.RemoveStart);
274-
Assert.Equal(extractSpan.Start, actionParams.ExtractStart);
275-
Assert.Equal(extractSpan.End, actionParams.ExtractEnd);
276-
Assert.Equal(removeSpan.End, actionParams.RemoveEnd);
272+
Assert.Equal(removeSpan, TextSpan.FromBounds(actionParams.RemoveStart, actionParams.RemoveEnd));
273+
Assert.Equal(extractSpan, TextSpan.FromBounds(actionParams.ExtractStart, actionParams.ExtractEnd));
277274
}
278275

279276
[Fact]
@@ -345,10 +342,9 @@ public async Task Handle_InFunctionsDirective_SupportsFileCreationTrue_ReturnsRe
345342
Assert.NotNull(razorCodeActionResolutionParams);
346343
var actionParams = ((JObject)razorCodeActionResolutionParams.Data).ToObject<ExtractToCodeBehindCodeActionParams>();
347344
Assert.NotNull(actionParams);
348-
Assert.Equal(removeSpan.Start, actionParams.RemoveStart);
349-
Assert.Equal(extractSpan.Start, actionParams.ExtractStart);
350-
Assert.Equal(extractSpan.End, actionParams.ExtractEnd);
351-
Assert.Equal(removeSpan.End, actionParams.RemoveEnd);
345+
346+
Assert.Equal(removeSpan, TextSpan.FromBounds(actionParams.RemoveStart, actionParams.RemoveEnd));
347+
Assert.Equal(extractSpan, TextSpan.FromBounds(actionParams.ExtractStart, actionParams.ExtractEnd));
352348
}
353349

354350
[Fact]

‎src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentContextFactoryTest.cs

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Test;
2020

2121
public class DefaultDocumentContextFactoryTest : LanguageServerTestBase
2222
{
23+
private static readonly string s_baseDirectory = PathUtilities.CreateRootedPath("path", "to");
24+
2325
private readonly DocumentVersionCache _documentVersionCache;
2426
private readonly TestProjectSnapshotManager _projectSnapshotManagerBase;
2527
private readonly TestProjectSnapshotManagerAccessor _projectSnapshotManagerAccessor;
@@ -37,8 +39,7 @@ public DefaultDocumentContextFactoryTest(ITestOutputHelper testOutput)
3739
public void TryCreateAsync_CanNotResolveDocument_ReturnsNull()
3840
{
3941
// Arrange
40-
var baseDirectory = PathUtilities.CreateRootedPath("path", "to");
41-
var filePath = FilePathNormalizer.Normalize(Path.Combine(baseDirectory, "file.cshtml"));
42+
var filePath = FilePathNormalizer.Normalize(Path.Combine(s_baseDirectory, "file.cshtml"));
4243
var uri = new Uri(filePath);
4344

4445
var factory = new DefaultDocumentContextFactory(_projectSnapshotManagerAccessor, new TestDocumentResolver(), _documentVersionCache, LoggerFactory);
@@ -54,8 +55,7 @@ public void TryCreateAsync_CanNotResolveDocument_ReturnsNull()
5455
public void TryCreateForOpenDocumentAsync_CanNotResolveDocument_ReturnsNull()
5556
{
5657
// Arrange
57-
var baseDirectory = PathUtilities.CreateRootedPath("path", "to");
58-
var filePath = FilePathNormalizer.Normalize(Path.Combine(baseDirectory, "file.cshtml"));
58+
var filePath = FilePathNormalizer.Normalize(Path.Combine(s_baseDirectory, "file.cshtml"));
5959
var uri = new Uri(filePath);
6060

6161
var factory = new DefaultDocumentContextFactory(_projectSnapshotManagerAccessor, new TestDocumentResolver(), _documentVersionCache, LoggerFactory);
@@ -71,8 +71,7 @@ public void TryCreateForOpenDocumentAsync_CanNotResolveDocument_ReturnsNull()
7171
public void TryCreateForOpenDocumentAsync_CanNotResolveVersion_ReturnsNull()
7272
{
7373
// Arrange
74-
var baseDirectory = PathUtilities.CreateRootedPath("path", "to");
75-
var filePath = FilePathNormalizer.Normalize(Path.Combine(baseDirectory, "file.cshtml"));
74+
var filePath = FilePathNormalizer.Normalize(Path.Combine(s_baseDirectory, "file.cshtml"));
7675
var uri = new Uri(filePath);
7776

7877
var documentSnapshot = TestDocumentSnapshot.Create(filePath);
@@ -90,8 +89,7 @@ public void TryCreateForOpenDocumentAsync_CanNotResolveVersion_ReturnsNull()
9089
public void TryCreateAsync_ResolvesContent()
9190
{
9291
// Arrange
93-
var baseDirectory = PathUtilities.CreateRootedPath("path", "to");
94-
var filePath = FilePathNormalizer.Normalize(Path.Combine(baseDirectory, "file.cshtml"));
92+
var filePath = FilePathNormalizer.Normalize(Path.Combine(s_baseDirectory, "file.cshtml"));
9593
var uri = new Uri(filePath);
9694

9795
var documentSnapshot = TestDocumentSnapshot.Create(filePath);
@@ -113,10 +111,9 @@ public void TryCreateAsync_ResolvesContent()
113111
public void TryCreateAsync_WithProjectContext_Resolves()
114112
{
115113
// Arrange
116-
var baseDirectory = PathUtilities.CreateRootedPath("path", "to");
117-
var filePath = FilePathNormalizer.Normalize(Path.Combine(baseDirectory, "file.cshtml"));
118-
var intermediateOutputPath = Path.Combine(baseDirectory, "obj");
119-
var projectFilePath = Path.Combine(baseDirectory, "project.csproj");
114+
var filePath = FilePathNormalizer.Normalize(Path.Combine(s_baseDirectory, "file.cshtml"));
115+
var intermediateOutputPath = Path.Combine(s_baseDirectory, "obj");
116+
var projectFilePath = Path.Combine(s_baseDirectory, "project.csproj");
120117
var uri = new Uri(filePath);
121118

122119
var documentSnapshot = TestDocumentSnapshot.Create(filePath);
@@ -142,10 +139,9 @@ public void TryCreateAsync_WithProjectContext_Resolves()
142139
public void TryCreateAsync_WithProjectContext_DoesntUseSnapshotResolver()
143140
{
144141
// Arrange
145-
var baseDirectory = PathUtilities.CreateRootedPath("path", "to");
146-
var filePath = FilePathNormalizer.Normalize(Path.Combine(baseDirectory, "file.cshtml"));
147-
var intermediateOutputPath = Path.Combine(baseDirectory, "obj");
148-
var projectFilePath = Path.Combine(baseDirectory, "project.csproj");
142+
var filePath = FilePathNormalizer.Normalize(Path.Combine(s_baseDirectory, "file.cshtml"));
143+
var intermediateOutputPath = Path.Combine(s_baseDirectory, "obj");
144+
var projectFilePath = Path.Combine(s_baseDirectory, "project.csproj");
149145
var uri = new Uri(filePath);
150146

151147
var documentSnapshot = TestDocumentSnapshot.Create(filePath);
@@ -172,8 +168,7 @@ public void TryCreateAsync_WithProjectContext_DoesntUseSnapshotResolver()
172168
public async Task TryCreateForOpenDocumentAsync_ResolvesContent()
173169
{
174170
// Arrange
175-
var baseDirectory = PathUtilities.CreateRootedPath("path", "to");
176-
var filePath = FilePathNormalizer.Normalize(Path.Combine(baseDirectory, "file.cshtml"));
171+
var filePath = FilePathNormalizer.Normalize(Path.Combine(s_baseDirectory, "file.cshtml"));
177172
var uri = new Uri(filePath);
178173

179174
var documentSnapshot = TestDocumentSnapshot.Create(filePath);

0 commit comments

Comments
 (0)