Skip to content

Commit c004068

Browse files
Remove IErrorReporter from VisualStudioRazorParser
1 parent 10c41a9 commit c004068

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Parsing/VisualStudioRazorParser.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Microsoft.AspNetCore.Razor.Language.Legacy;
1414
using Microsoft.AspNetCore.Razor.ProjectEngineHost;
1515
using Microsoft.CodeAnalysis.Razor;
16+
using Microsoft.CodeAnalysis.Razor.Logging;
1617
using Microsoft.CodeAnalysis.Razor.Settings;
1718
using Microsoft.Extensions.Internal;
1819
using Microsoft.VisualStudio.Language.Intellisense;
@@ -40,7 +41,7 @@ internal class VisualStudioRazorParser : IVisualStudioRazorParser, IDisposable
4041
private readonly IVisualStudioDocumentTracker _documentTracker;
4142
private readonly JoinableTaskContext _joinableTaskContext;
4243
private readonly IProjectEngineFactoryProvider _projectEngineFactoryProvider;
43-
private readonly IErrorReporter _errorReporter;
44+
private readonly ILogger _logger;
4445
private readonly List<CodeDocumentRequest> _codeDocumentRequests;
4546
private readonly TaskScheduler _uiThreadScheduler;
4647
private RazorProjectEngine? _projectEngine;
@@ -55,12 +56,12 @@ public VisualStudioRazorParser(
5556
IVisualStudioDocumentTracker documentTracker,
5657
IProjectEngineFactoryProvider projectEngineFactoryProvider,
5758
ICompletionBroker completionBroker,
58-
IErrorReporter errorReporter,
59+
ILoggerFactory loggerFactory,
5960
JoinableTaskContext joinableTaskContext)
6061
{
6162
_joinableTaskContext = joinableTaskContext;
6263
_projectEngineFactoryProvider = projectEngineFactoryProvider;
63-
_errorReporter = errorReporter;
64+
_logger = loggerFactory.GetOrCreateLogger<VisualStudioRazorParser>();
6465
_completionBroker = completionBroker;
6566
_documentTracker = documentTracker;
6667
_codeDocumentRequests = new List<CodeDocumentRequest>();
@@ -413,7 +414,7 @@ private void Timer_Tick()
413414
catch (Exception ex)
414415
{
415416
// This is something totally unexpected, let's just send it over to the workspace.
416-
_errorReporter.ReportError(ex);
417+
_logger.LogError(ex);
417418
}
418419

419420
async Task OnIdle_QueueOnUIThreadAsync()

src/Razor/src/Microsoft.VisualStudio.LegacyEditor.Razor/Parsing/VisualStudioRazorParserFactory.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.ComponentModel.Composition;
55
using Microsoft.AspNetCore.Razor.ProjectEngineHost;
6-
using Microsoft.CodeAnalysis.Razor;
6+
using Microsoft.CodeAnalysis.Razor.Logging;
77
using Microsoft.VisualStudio.Language.Intellisense;
88
using Microsoft.VisualStudio.Razor.Extensions;
99
using Microsoft.VisualStudio.Threading;
@@ -15,12 +15,12 @@ namespace Microsoft.VisualStudio.LegacyEditor.Razor.Parsing;
1515
internal sealed class VisualStudioRazorParserFactory(
1616
IProjectEngineFactoryProvider projectEngineFactoryProvider,
1717
ICompletionBroker completionBroker,
18-
IErrorReporter errorReporter,
18+
ILoggerFactory loggerFactory,
1919
JoinableTaskContext joinableTaskContext) : IVisualStudioRazorParserFactory
2020
{
2121
private readonly IProjectEngineFactoryProvider _projectEngineFactoryProvider = projectEngineFactoryProvider;
2222
private readonly ICompletionBroker _completionBroker = completionBroker;
23-
private readonly IErrorReporter _errorReporter = errorReporter;
23+
private readonly ILoggerFactory _loggerFactory = loggerFactory;
2424
private readonly JoinableTaskContext _joinableTaskContext = joinableTaskContext;
2525

2626
public IVisualStudioRazorParser Create(IVisualStudioDocumentTracker documentTracker)
@@ -31,7 +31,7 @@ public IVisualStudioRazorParser Create(IVisualStudioDocumentTracker documentTrac
3131
documentTracker,
3232
_projectEngineFactoryProvider,
3333
_completionBroker,
34-
_errorReporter,
34+
_loggerFactory,
3535
_joinableTaskContext);
3636
}
3737
}

src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Parsing/VisualStudioRazorParserIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ private TestParserManager CreateParserManager(IVisualStudioDocumentTracker docum
566566
documentTracker,
567567
_projectEngineFactoryProvider,
568568
new TestCompletionBroker(),
569-
ErrorReporter,
569+
LoggerFactory,
570570
JoinableTaskFactory.Context)
571571
{
572572
// We block idle work with the below reset events. Therefore, make tests fast and have the idle timer fire as soon as possible.

src/Razor/test/Microsoft.VisualStudio.LegacyEditor.Razor.Test/Parsing/VisualStudioRazorParserTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private VisualStudioRazorParser CreateParser(IVisualStudioDocumentTracker docume
6060
documentTracker,
6161
_projectEngineFactoryProvider,
6262
StrictMock.Of<ICompletionBroker>(),
63-
ErrorReporter,
63+
LoggerFactory,
6464
JoinableTaskContext);
6565

6666
[UIFact]

0 commit comments

Comments
 (0)