Skip to content

Commit bf39ae7

Browse files
Remove RazorLogger from VisualStudioProjectCapabilityResolver
1 parent 2369059 commit bf39ae7

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/VisualStudioProjectCapabilityResolver.cs

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,17 @@
33

44
using System;
55
using System.ComponentModel.Composition;
6-
using Microsoft.CodeAnalysis.Razor;
6+
using Microsoft.CodeAnalysis.Razor.Logging;
77
using Microsoft.VisualStudio.Shell;
88
using Microsoft.VisualStudio.Shell.Interop;
99

1010
namespace Microsoft.VisualStudio.Razor;
1111

1212
[Export(typeof(ProjectCapabilityResolver))]
13-
internal class VisualStudioProjectCapabilityResolver : ProjectCapabilityResolver
13+
[method: ImportingConstructor]
14+
internal class VisualStudioProjectCapabilityResolver(ILoggerFactory loggerFactory) : ProjectCapabilityResolver
1415
{
15-
private readonly RazorLogger _razorLogger;
16-
17-
[ImportingConstructor]
18-
public VisualStudioProjectCapabilityResolver(RazorLogger razorLogger)
19-
{
20-
if (razorLogger is null)
21-
{
22-
throw new ArgumentNullException(nameof(razorLogger));
23-
}
24-
25-
_razorLogger = razorLogger;
26-
}
16+
private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<VisualStudioProjectCapabilityResolver>();
2717

2818
public override bool HasCapability(object project, string capability)
2919
{
@@ -49,13 +39,13 @@ private bool LocalHasCapability(IVsHierarchy hierarchy, string capability)
4939
{
5040
// IsCapabilityMatch throws a NotSupportedException if it can't create a
5141
// BooleanSymbolExpressionEvaluator COM object
52-
_razorLogger.LogWarning("Could not resolve project capability for hierarchy due to NotSupportedException.");
42+
_logger.LogWarning($"Could not resolve project capability for hierarchy due to NotSupportedException.");
5343
return false;
5444
}
5545
catch (ObjectDisposedException)
5646
{
5747
// IsCapabilityMatch throws an ObjectDisposedException if the underlying hierarchy has been disposed
58-
_razorLogger.LogWarning("Could not resolve project capability for hierarchy due to hierarchy being disposed.");
48+
_logger.LogWarning($"Could not resolve project capability for hierarchy due to hierarchy being disposed.");
5949
return false;
6050
}
6151
}

0 commit comments

Comments
 (0)