Skip to content

Catch exceptions from user code #1139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmeschter merged 2 commits into from
Mar 10, 2015
Merged

Catch exceptions from user code #1139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7340766
Catch exceptions from user code
tmeschter Mar 6, 2015
c8c9465
Add a method to `IDiagnosticAnalyzerService`
tmeschter Mar 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.ComponentModel.Composition;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.Internal.VisualStudio.PlatformUI;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Utilities;
Expand All @@ -15,11 +16,14 @@ internal sealed class DiagnosticItemProvider : AttachedCollectionSourceProvider<
[Import(typeof(AnalyzersCommandHandler))]
private IAnalyzersCommandHandler _commandHandler = null;

[Import]
private IDiagnosticAnalyzerService _diagnosticAnalyzerService = null;

@msJohnHamby msJohnHamby Mar 9, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this field ever get a value other than null? I'm guessing the [Import] does something magic.

@tmeschter tmeschter Mar 9, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is MEF magic.


protected override IAttachedCollectionSource CreateCollectionSource(AnalyzerItem item, string relationshipName)
{
if (relationshipName == KnownRelationships.Contains)
{
return new DiagnosticItemSource(item, _commandHandler);
return new DiagnosticItemSource(item, _commandHandler, (DiagnosticAnalyzerService)_diagnosticAnalyzerService);

@msJohnHamby msJohnHamby Mar 9, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this cast is safe, why isn't the type of the field DiagnosticAnalyzerService?

@mavasani mavasani Mar 9, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should also consider just adding the GetDiagnosticDescriptors(Analyzer) method to IDiagnosticAnalyzerService interface.

@heejaechang heejaechang Mar 9, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tmeschter can we just do that as part of this change?

}

return null;
Expand Down
7 changes: 5 additions & 2 deletions src/VisualStudio/Core/SolutionExplorerShim/DiagnosticItem/DiagnosticItemSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Microsoft.CodeAnalysis.Internal.Log;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Shell;
using Roslyn.Utilities;

namespace Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplorer
{
Expand All @@ -19,16 +20,18 @@ internal partial class DiagnosticItemSource : IAttachedCollectionSource

private readonly AnalyzerItem _item;
private readonly IAnalyzersCommandHandler _commandHandler;
private readonly DiagnosticAnalyzerService _diagnosticAnalyzerService;
private BulkObservableCollection<DiagnosticItem> _diagnosticItems;
private Workspace _workspace;
private ProjectId _projectId;
private ReportDiagnostic _generalDiagnosticOption;
private ImmutableDictionary<string, ReportDiagnostic> _specificDiagnosticOptions;

public DiagnosticItemSource(AnalyzerItem item, IAnalyzersCommandHandler commandHandler)
public DiagnosticItemSource(AnalyzerItem item, IAnalyzersCommandHandler commandHandler, DiagnosticAnalyzerService diagnosticAnalyzerService)
{
_item = item;
_commandHandler = commandHandler;
_diagnosticAnalyzerService = diagnosticAnalyzerService;
}

public object SourceItem
Expand Down Expand Up @@ -90,7 +93,7 @@ private IEnumerable<DiagnosticItem> GetDiagnosticItems(string language)
// one.

return _item.AnalyzerReference.GetAnalyzers(language)
.SelectMany(a => a.SupportedDiagnostics)
.SelectMany(a => _diagnosticAnalyzerService.GetDiagnosticDescriptors(a))
.GroupBy(d => d.Id)
.OrderBy(g => g.Key, StringComparer.CurrentCulture)
.Select(g =>
Expand Down