Skip to content

Commit

Permalink
return null insead of throw
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinrrm
martinrrm committed Aug 24, 2022
1 parent 6704035 commit 0c8d5c6
Showing 1 changed file with 52 additions and 43 deletions.
95 changes: 52 additions & 43 deletions src/NuGet.Clients/NuGet.VisualStudio.Implementation/Extensibility/VsPathContextProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using System.Threading;
using System.Threading.Tasks;
using EnvDTE;
using Microsoft.Build.Tasks;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Threading;
using NuGet.Common;
Expand Down Expand Up @@ -148,22 +147,31 @@ public bool TryCreateContext(string projectUniqueName, out IVsPathContext output
throw new ArgumentNullException(nameof(projectUniqueName));
}

// invoke async operation from within synchronous method
outputPathContext = NuGetUIThreadHelper.JoinableTaskFactory.Run(
async () =>
{
var nuGetProject = await CreateNuGetProjectAsync(projectUniqueName);
// It's possible the project isn't a NuGet-compatible project at all.
if (nuGetProject == null)
try
{
// invoke async operation from within synchronous method
outputPathContext = NuGetUIThreadHelper.JoinableTaskFactory.Run(
async () =>
{
return null;
}
var nuGetProject = await CreateNuGetProjectAsync(projectUniqueName);
// It's possible the project isn't a NuGet-compatible project at all.
if (nuGetProject == null)
{
return null;
}
return await CreatePathContextAsync(nuGetProject, CancellationToken.None);
});
return await CreatePathContextAsync(nuGetProject, CancellationToken.None);
});

return outputPathContext != null;
return outputPathContext != null;
}
catch (Exception exception)
{
_telemetryProvider.PostFault(exception, typeof(VsPathContextProvider).FullName);
outputPathContext = null;
return false;
}
}

public bool TryCreateSolutionContext(out IVsPathContext2 outputPathContext)
Expand Down Expand Up @@ -236,30 +244,40 @@ internal async Task<IVsPathContext> CreatePathContextAsync(NuGetProject nuGetPro
{
IVsPathContext context;

var buildIntegratedProject = nuGetProject as BuildIntegratedNuGetProject;

if (buildIntegratedProject != null)
{
// if project is build integrated, then read it from assets file.
context = await GetPathContextFromAssetsFileAsync(
buildIntegratedProject, token);
}
else
try
{
var msbuildNuGetProject = nuGetProject as MSBuildNuGetProject;
if (msbuildNuGetProject != null)
var buildIntegratedProject = nuGetProject as BuildIntegratedNuGetProject;

if (buildIntegratedProject != null)
{
// when a msbuild project, then read it from packages.config file.
context = await GetPathContextFromPackagesConfigAsync(
msbuildNuGetProject, token);
// if project is build integrated, then read it from assets file.
context = await GetPathContextFromAssetsFileAsync(
buildIntegratedProject, token);
}
else
{
// Fallback to reading the path context from the solution's settings. Note that project level settings in
// VS are not currently supported.
context = GetSolutionPathContext();
var msbuildNuGetProject = nuGetProject as MSBuildNuGetProject;
if (msbuildNuGetProject != null)
{
// when a msbuild project, then read it from packages.config file.
context = await GetPathContextFromPackagesConfigAsync(
msbuildNuGetProject, token);
}
else
{
// Fallback to reading the path context from the solution's settings. Note that project level settings in
// VS are not currently supported.
context = GetSolutionPathContext();
}
}
}
catch (Exception e) when (e is KeyNotFoundException || e is InvalidOperationException)
{
var projectUniqueName = NuGetProject.GetUniqueNameOrName(nuGetProject);
var errorMessage = string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_CreateContextError, projectUniqueName, e.Message);
_logger.Value.LogError(errorMessage);
throw new InvalidOperationException(errorMessage, e);
}

return context;
}
Expand All @@ -278,11 +296,7 @@ private async Task<IVsPathContext> GetPathContextFromAssetsFileAsync(

if ((lockFile?.PackageFolders?.Count ?? 0) == 0)
{
var projectUniqueName = NuGetProject.GetUniqueNameOrName(buildIntegratedProject);
var message = string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_LockFileError);
var errorMessage = string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_CreateContextError, projectUniqueName, message);
_logger.Value.LogError(errorMessage);
return null;
throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_LockFileError));
}

// The user packages folder is always the first package folder. Subsequent package folders are always
Expand Down Expand Up @@ -313,8 +327,7 @@ private async Task<IVsPathContext> GetPathContextFromAssetsFileAsync(
var packageInstallPath = fppr.GetPackageDirectory(pid.Id, pid.Version);
if (string.IsNullOrEmpty(packageInstallPath))
{
_logger.Value.LogError(string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_PackageDirectoryNotFound, pid));
return null;
throw new KeyNotFoundException(string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_PackageDirectoryNotFound, pid));
}

trie[packageInstallPath] = packageInstallPath;
Expand Down Expand Up @@ -342,11 +355,7 @@ private async Task<IVsPathContext> GetPathContextFromPackagesConfigAsync(
var packageInstallPath = msbuildNuGetProject.FolderNuGetProject.GetInstalledPath(pid);
if (string.IsNullOrEmpty(packageInstallPath))
{
var projectUniqueName = NuGetProject.GetUniqueNameOrName(msbuildNuGetProject);
var message = string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_PackageDirectoryNotFound, pid);
var errorMessage = string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_CreateContextError, projectUniqueName, message);
_logger.Value.LogError(errorMessage);
return null;
throw new KeyNotFoundException(string.Format(CultureInfo.CurrentCulture, VsResources.PathContext_PackageDirectoryNotFound, pid));
}

trie[packageInstallPath] = packageInstallPath;
Expand Down

0 comments on commit 0c8d5c6

Please sign in to comment.