Skip to content

Commit 616caa5

Browse files
Pre-snap Code Clean Up (#11675)
This change moves types that were recently moved to `Microsoft.CodeAnalysis.Razor.Workspaces` to the appropriate namespaces. The intent is to get this in before the snap so that future cherry-picks are a bit easier. It's a big change, but it's almost completely mechanical. I recommend reviewing commit-by-commit, though there's a lot of commits too! Note that this PR doesn't actually require a review from @dotnet/razor-compiler. It seems that tweaks to the tooling-specific JSON serialization files are causing that reviewer to be included.
2 parents 25971c9 + 38b3d1b commit 616caa5

File tree

388 files changed

+458
-551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

388 files changed

+458
-551
lines changed

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/CommonResources.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Collections.Immutable;
55
using Microsoft.AspNetCore.Razor.Language;
6-
using Microsoft.AspNetCore.Razor.ProjectSystem;
76
using Microsoft.AspNetCore.Razor.Serialization.Json;
7+
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
88

99
namespace Microsoft.AspNetCore.Razor.Microbenchmarks;
1010

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCSharpFormattingBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010
using BenchmarkDotNet.Attributes;
11-
using Microsoft.AspNetCore.Razor.ProjectSystem;
1211
using Microsoft.CodeAnalysis.Razor.Formatting;
1312
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
1413
using Microsoft.CodeAnalysis.Text;

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCodeActionsBenchmark.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
1111
using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
1212
using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
13-
using Microsoft.AspNetCore.Razor.ProjectSystem;
14-
using Microsoft.AspNetCore.Razor.Telemetry;
1513
using Microsoft.CodeAnalysis.Razor.CodeActions;
1614
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
1715
using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
16+
using Microsoft.CodeAnalysis.Razor.Telemetry;
1817
using Microsoft.CodeAnalysis.Text;
1918
using Microsoft.CommonLanguageServerProtocol.Framework;
2019
using Microsoft.VisualStudio.LanguageServer.Protocol;

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
using Microsoft.AspNetCore.Razor.LanguageServer.Completion.Delegation;
1414
using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
1515
using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
16-
using Microsoft.AspNetCore.Razor.ProjectSystem;
17-
using Microsoft.AspNetCore.Razor.Telemetry;
1816
using Microsoft.CodeAnalysis.Razor.Completion;
1917
using Microsoft.CodeAnalysis.Razor.DocumentMapping;
2018
using Microsoft.CodeAnalysis.Razor.Logging;
2119
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
20+
using Microsoft.CodeAnalysis.Razor.Telemetry;
2221
using Microsoft.CodeAnalysis.Text;
2322
using Microsoft.CommonLanguageServerProtocol.Framework;
2423
using Microsoft.VisualStudio.LanguageServer.Protocol;

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDiagnosticsBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics;
1515
using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
1616
using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
17-
using Microsoft.AspNetCore.Razor.ProjectSystem;
1817
using Microsoft.CodeAnalysis.Razor.Diagnostics;
1918
using Microsoft.CodeAnalysis.Razor.DocumentMapping;
2019
using Microsoft.CodeAnalysis.Razor.Logging;

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDocumentMappingBenchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
using System.Threading.Tasks;
1111
using BenchmarkDotNet.Attributes;
1212
using Microsoft.AspNetCore.Razor.Language;
13-
using Microsoft.AspNetCore.Razor.ProjectSystem;
1413
using Microsoft.CodeAnalysis.Razor.DocumentMapping;
14+
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
1515
using Microsoft.CodeAnalysis.Text;
1616

1717
namespace Microsoft.AspNetCore.Razor.Microbenchmarks.LanguageServer;

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorLanguageServerBenchmarkBase.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
using Microsoft.AspNetCore.Razor.Language;
1212
using Microsoft.AspNetCore.Razor.LanguageServer;
1313
using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
14-
using Microsoft.AspNetCore.Razor.ProjectSystem;
15-
using Microsoft.AspNetCore.Razor.Telemetry;
1614
using Microsoft.CodeAnalysis;
1715
using Microsoft.CodeAnalysis.Razor.Logging;
1816
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
17+
using Microsoft.CodeAnalysis.Razor.Telemetry;
1918
using Microsoft.CodeAnalysis.Razor.Workspaces;
2019
using Microsoft.CodeAnalysis.Text;
2120
using Microsoft.CommonLanguageServerProtocol.Framework;

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using BenchmarkDotNet.Attributes;
1212
using Microsoft.AspNetCore.Razor.Language;
1313
using Microsoft.AspNetCore.Razor.LanguageServer.Semantic;
14-
using Microsoft.AspNetCore.Razor.ProjectSystem;
1514
using Microsoft.CodeAnalysis.Razor.DocumentMapping;
1615
using Microsoft.CodeAnalysis.Razor.Logging;
1716
using Microsoft.CodeAnalysis.Razor.ProjectSystem;

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensScrollingBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010
using BenchmarkDotNet.Attributes;
11-
using Microsoft.AspNetCore.Razor.ProjectSystem;
1211
using Microsoft.CodeAnalysis.Razor.ProjectSystem;
1312
using Microsoft.CodeAnalysis.Razor.SemanticTokens;
1413
using Microsoft.CodeAnalysis.Text;

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.StaticProjectSnapshotProjectEngineFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using Microsoft.AspNetCore.Mvc.Razor.Extensions;
66
using Microsoft.AspNetCore.Razor.Language;
7-
using Microsoft.AspNetCore.Razor.ProjectSystem;
7+
using Microsoft.CodeAnalysis.Razor.ProjectEngineHost;
88

99
namespace Microsoft.AspNetCore.Razor.Microbenchmarks;
1010

0 commit comments

Comments
 (0)