Add and fix nullability annotations in Microsoft.CodeAnalysis.Razor.Workspaces #8115
Conversation
src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/BackgroundDocumentGenerator.cs
Show resolved
Hide resolved
...or/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultRazorProjectService.cs
Outdated
Show resolved
Hide resolved
...or/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultRazorProjectService.cs
Outdated
Show resolved
Hide resolved
...r/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultImportDocumentSnapshot.cs
Outdated
Show resolved
Hide resolved
src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
Show resolved
Hide resolved
src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/EphemeralProjectSnapshot.cs
Outdated
Show resolved
Hide resolved
DustinCampbell
force-pushed
the
nullability
branch
3 times, most recently
from
2e01990
to
25745dd
Compare
DustinCampbell
force-pushed
the
nullability
branch
from
25745dd
to
739e344
Compare
DustinCampbell
force-pushed
the
nullability
branch
5 times, most recently
from
63688e8
to
a25548d
Compare
DustinCampbell
force-pushed
the
nullability
branch
from
a25548d
to
d56debd
Compare
DustinCampbell
force-pushed
the
nullability
branch
from
b77e326
to
78b6760
Compare
DustinCampbell
force-pushed
the
nullability
branch
from
78b6760
to
e5db5d5
Compare
src/Razor/src/Microsoft.AspNetCore.Razor.Common/NullableExtensions.cs
Outdated
Show resolved
Hide resolved
| private class DefaultElementCompletionResult : ElementCompletionResult | ||
| { | ||
| private readonly IReadOnlyDictionary<string, IEnumerable<TagHelperDescriptor>> _completions; | ||
| var readonlyCompletions = new Dictionary<string, IEnumerable<TagHelperDescriptor>>( |
There was a problem hiding this comment.
This is the second method I've seen that converts a dictionary from something to something very very similar. I have nothing but questions, but I don't expect you to answer them. In fact, I admire your restraint in leaving them here :)
There was a problem hiding this comment.
To be honest, I tried to remove them but then I saw that this is public and used by Web Tools. So, I left it mostly in place and just removed the gratuitous inheritance.
| @@ -384,12 +393,16 @@ private void UpdateProjectDocuments(IReadOnlyList<DocumentSnapshotHandle> docume | |||
| } | |||
| } | |||
|
|
|||
| private void MoveDocument(string documentFilePath, DefaultProjectSnapshot fromProject, DefaultProjectSnapshot toProject) | |||
| private void MoveDocument(string documentFilePath, ProjectSnapshot fromProject, ProjectSnapshot toProject) | |||
There was a problem hiding this comment.
Curious if this makes more sense as IProjectSnapshot?
There was a problem hiding this comment.
It might, but understanding the impact of that is a bit beyond the scope of this PR. This change is just the result of a rename.
| Task<RazorCodeDocument> GetGeneratedOutputAsync(); | ||
|
|
||
| bool TryGetText([NotNullWhen(true)] out SourceText? result); | ||
| bool TryGetTextVersion(out VersionStamp result); |
There was a problem hiding this comment.
What happens if we fail to get the VersionStamp?
There was a problem hiding this comment.
It's default. This is a struct, not a reference type, and it's not necessary to lift structs to nullable value types in TryGet methods.
|
Thanks very much for the reviews! |
Fixes #7945
This starts the work of updating
Microsoft.CodeAnalysis.Razor.Workspaceswith nullable annotations, making some largish refactorings, and generally cleaning up.Here are a few highlights:
AssumesNotNull()extension methods that can be used to verify that an expression is non-null. This is similar to theAssume.NotNull(...)methods from theMicrosoft.VisualStudio.Validationlibrary. The advantage to the extension method forms is that they can be used at an expression level, which makes them simpler to use thanAssume.NotNull(...), which often requires requiring expressions into statements in order to validate.DocumentSnapshotto an interface:IDocumentSnapshot. The oldDefaultDocumentSnapshothas been renamed toDocumentSnapshot.ProjectSnapshotto an interface:IProjectSnapshot. The oldDefaultProjectSnapshothas been renamed toProjectSnapshot.ErrorReporterto an interface:IErrorReporter. The oldDefaultErrorReporterhas been renamed toErrorReporter. In addition, I've updated the test infrastructure and all tests to use a test-onlyIErrorReporterthat logs exceptions to the test output.There is more to come, but this PR is already large enough, so I'm submitting it for review.