Skip to content

Commit 1c5acd8

Browse files
committed
Merge patches
2 parents dabd691 + 0bbf876 commit 1c5acd8

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

AxoCover/ViewModels/CoverageExplorerViewModel.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,11 @@ public ICommand NavigateToCoverageItemCommand
7575
p =>
7676
{
7777
var coverageItem = p as CoverageItem;
78-
if (coverageItem.SourceFile != null)
78+
if (coverageItem != null && (coverageItem.Kind == CodeItemKind.Class || coverageItem.Kind == CodeItemKind.Method) && coverageItem.SourceFile != null)
7979
{
8080
_editorContext.NavigateToFile(coverageItem.SourceFile, coverageItem.SourceLine);
8181
}
82-
},
83-
p => p.CheckAs<CoverageItem>(q => q.Kind == CodeItemKind.Class || q.Kind == CodeItemKind.Method));
82+
});
8483
}
8584
}
8685

AxoCover/Views/CoverageExplorerView.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888

8989
<ContextMenu x:Key="ResultItemMenu" x:Shared="False" DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
9090
<MenuItem Header="{x:Static res:Resources.GoToSource}" IsEnabled="{Binding CanGoToSource}"
91-
Command="{Binding DataContext.NavigateToCoverageItemCommand, Source={x:Reference _dataContextSource}}"
92-
CommandParameter="{Binding CodeItem}">
91+
CommandParameter="{Binding CodeItem}"
92+
Command="{Binding DataContext.NavigateToCoverageItemCommand, Source={x:Reference _dataContextSource}}">
9393
<MenuItem.Icon>
9494
<Image Source="/AxoCover;component/Resources/source.png"/>
9595
</MenuItem.Icon>

AxoCover/changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
- Prevent double build when cover after build and auto build is enabled at the same time
2929
- Fix regression of test states
3030
- Fix issue when code coverage was shown while it was disabled
31+
- Fix issue that report items cannot be navigated to from context menu
3132

3233
1.1.5
3334
- Use named pipes to communicate with test runner (optionally)

AxoCover/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="26901782-38e1-48d4-94e9-557d44db052e" Version="1.1.6.10" Language="en-US" Publisher="Péter Major" />
4+
<Identity Id="26901782-38e1-48d4-94e9-557d44db052e" Version="1.1.6.11" Language="en-US" Publisher="Péter Major" />
55
<DisplayName>AxoCover</DisplayName>
66
<Description xml:space="preserve">Nice and free .Net code coverage support for Visual Studio with OpenCover.</Description>
77
<MoreInfo>https://marketplace.visualstudio.com/items?itemName=axodox1.AxoCover</MoreInfo>

0 commit comments

Comments
 (0)