huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tolerate null returns from OOP methods 

See #1023
This commit is contained in:
Ryan Nowak 2017-02-23 15:15:56 -08:00
parent f177648c88
commit 550283957a
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
View File

@ -28,26 +28,40 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
{ {
try try
{ {
TagHelperResolutionResult result;
// We're being overly defensive here because the OOP host can return null for the client/session/operation
// when it's disconnected (user stops the process).
//
// This will change in the future to an easier to consume API but for VS RTM this is what we have.
var client = await RazorLanguageServiceClientFactory.CreateAsync(Workspace, CancellationToken.None); var client = await RazorLanguageServiceClientFactory.CreateAsync(Workspace, CancellationToken.None);
if (client == null) if (client != null)
{ {
// The OOP host is turned off, so let's do this in process. using (var session = await client.CreateSessionAsync(project.Solution))
var resolver = new CodeAnalysis.Razor.DefaultTagHelperResolver(designTime: true); {
var result = await resolver.GetTagHelpersAsync(project, assemblyNameFilters, CancellationToken.None).ConfigureAwait(false); if (session != null)
return result; {
result = await session.InvokeAsync<TagHelperResolutionResult>(
"GetTagHelpersAsync",
new object[] { project.Id.Id, "Foo", assemblyNameFilters, }).ConfigureAwait(false);
if (result != null)
{
// Per https://github.com/dotnet/roslyn/issues/12770 - there's currently no support for documentation in the OOP host
// until that's available we add the documentation on the VS side by looking up each symbol again.
var compilation = await project.GetCompilationAsync().ConfigureAwait(false);
AddXmlDocumentation(compilation, result.Descriptors);
return result;
}
}
}
} }
using (var session = await client.CreateSessionAsync(project.Solution)) // The OOP host is turned off, so let's do this in process.
{ var resolver = new CodeAnalysis.Razor.DefaultTagHelperResolver(designTime: true);
var result = await session.InvokeAsync<TagHelperResolutionResult>("GetTagHelpersAsync", new object[] { project.Id.Id, "Foo", assemblyNameFilters, }).ConfigureAwait(false); result = await resolver.GetTagHelpersAsync(project, assemblyNameFilters, CancellationToken.None).ConfigureAwait(false);
return result;
// Per https://github.com/dotnet/roslyn/issues/12770 - there's currently no support for documentation in the OOP host
// until that's available we add the documentation on the VS side by looking up each symbol again.
var compilation = await project.GetCompilationAsync().ConfigureAwait(false);
AddXmlDocumentation(compilation, result.Descriptors);
return result;
}
} }
catch (Exception exception) catch (Exception exception)
{ {