Skip to content

Commit cd9f756

Browse files
IvenBachIvenBach
committed
Merge remote-tracking branch 'upstream/next' into Issue5346_Extract_interface_creates_private_classes
2 parents 79540a4 + 5cc81de commit cd9f756

39 files changed

+983
-1650
lines changed

‎README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ If you like this project and would like to thank its contributors, you are welco
2020
[![Chat on stackexchange](https://img.shields.io/badge/chat-on%20stackexchange-blue.svg)](https://chat.stackexchange.com/rooms/14929/vba-rubberducking)
2121
[![License](https://img.shields.io/github/license/rubberduck-vba/Rubberduck.svg)](https://github.com/rubberduck-vba/Rubberduck/blob/next/LICENSE)
2222

23-
> **[rubberduckvba.com](http://rubberduckvba.com)** [Wiki](https://github.com/rubberduck-vba/Rubberduck/wiki) [Rubberduck News](https://rubberduckvba.wordpress.com/)
24-
> devs@rubberduckvba.com
25-
> Follow [@rubberduckvba](https://twitter.com/rubberduckvba) on Twitter
23+
> **[rubberduckvba.com](http://rubberduckvba.com)** | **[Rubberduck News](https://rubberduckvba.wordpress.com/)**
24+
| **[Twitter (@rubberduckvba)](https://twitter.com/rubberduckvba)** | **[Wiki](https://github.com/rubberduck-vba/Rubberduck/wiki)**
2625

2726
---
2827

‎Rubberduck.CodeAnalysis/Inspections/Concrete/FunctionReturnValueAlwaysDiscardedInspection.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,14 @@ private static bool IsCalledAsProcedure(ParserRuleContext context)
144144
? methodCall
145145
: context;
146146
var memberAccessParent = ownFunctionCallExpression.GetAncestor<VBAParser.MemberAccessExprContext>();
147-
return memberAccessParent == null;
147+
if (memberAccessParent != null)
148+
{
149+
return false;
150+
}
151+
152+
//If we are in an output list, the value is used somewhere in defining the argument.
153+
var outputListParent = context.GetAncestor<VBAParser.OutputListContext>();
154+
return outputListParent == null;
148155
}
149156

150157
protected override string ResultDescription(Declaration declaration)

‎Rubberduck.CodeAnalysis/Inspections/Concrete/FunctionReturnValueDiscardedInspection.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ private static bool IsCalledAsProcedure(ParserRuleContext context)
8282
return false;
8383
}
8484

85-
return true;
85+
//If we are in an output list, the value is used somewhere in defining the argument.
86+
var outputListParent = context.GetAncestor<VBAParser.OutputListContext>();
87+
return outputListParent == null;
8688
}
8789

8890
protected override string ResultDescription(IdentifierReference reference)

‎Rubberduck.Core/UI/About/AboutControl.xaml

Lines changed: 56 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,61 @@
88
d:DataContext="{d:DesignInstance {x:Type about:AboutControlViewModel}, IsDesignTimeCreatable=False}"
99
KeyDown="OnKeyDownHandler">
1010
<UserControl.Resources>
11-
<BitmapImage x:Key="RD" UriSource="pack://application:,,,/Rubberduck.Resources;component/Rubberduck.png" />
12-
<Style x:Key="NormalLabel" TargetType="TextBlock">
13-
<Style.Setters>
14-
<Setter Property="FontFamily" Value="Segoe UI" />
15-
<Setter Property="FontSize" Value="11" />
16-
<Setter Property="FontWeight" Value="Normal" />
17-
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
18-
</Style.Setters>
19-
</Style>
20-
<Style x:Key="SubtleLabel" TargetType="TextBlock">
21-
<Style.Setters>
22-
<Setter Property="FontFamily" Value="Segoe UI" />
23-
<Setter Property="FontSize" Value="11" />
24-
<Setter Property="FontWeight" Value="Thin" />
25-
<Setter Property="Foreground" Value="{x:Static SystemColors.GrayTextBrush}" />
26-
</Style.Setters>
27-
</Style>
28-
<Style x:Key="HeadingLabel" TargetType="TextBlock">
29-
<Style.Setters>
30-
<Setter Property="FontFamily" Value="Segoe UI" />
31-
<Setter Property="FontSize" Value="14" />
32-
<Setter Property="FontWeight" Value="Bold" />
33-
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
34-
</Style.Setters>
35-
</Style>
36-
<Style x:Key="SectionBorder" TargetType="Border">
37-
<Style.Setters>
38-
<Setter Property="Background" Value="{x:Static SystemColors.ControlBrush}" />
39-
<Setter Property="BorderBrush" Value="{x:Static SystemColors.HighlightBrush}" />
40-
<Setter Property="BorderThickness" Value="2" />
41-
<Setter Property="CornerRadius" Value="8" />
42-
<Setter Property="Margin" Value="8,8" />
43-
<Setter Property="Padding" Value="4" />
44-
</Style.Setters>
45-
</Style>
46-
<Style x:Key="ReportButtonBorder" TargetType="Border">
47-
<Style.Setters>
48-
<Setter Property="Margin" Value="10" />
49-
<Setter Property="CornerRadius" Value="6" />
50-
<Setter Property="BorderBrush" Value="Green" />
51-
<Setter Property="BorderThickness" Value="2" />
52-
<Setter Property="Background" Value="#FF40C954" />
53-
</Style.Setters>
54-
<Style.Triggers>
55-
<Trigger Property="IsMouseOver" Value="True">
56-
<Setter Property="Background" Value="#FF61D156" />
57-
</Trigger>
58-
</Style.Triggers>
59-
</Style>
60-
11+
<ResourceDictionary>
12+
<ResourceDictionary.MergedDictionaries>
13+
<ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
14+
</ResourceDictionary.MergedDictionaries>
15+
16+
<BitmapImage x:Key="RD" UriSource="pack://application:,,,/Rubberduck.Resources;component/Rubberduck.png" />
17+
<Style x:Key="NormalLabel" TargetType="TextBlock">
18+
<Style.Setters>
19+
<Setter Property="FontFamily" Value="Segoe UI" />
20+
<Setter Property="FontSize" Value="11" />
21+
<Setter Property="FontWeight" Value="Normal" />
22+
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
23+
</Style.Setters>
24+
</Style>
25+
<Style x:Key="SubtleLabel" TargetType="TextBlock">
26+
<Style.Setters>
27+
<Setter Property="FontFamily" Value="Segoe UI" />
28+
<Setter Property="FontSize" Value="11" />
29+
<Setter Property="FontWeight" Value="Thin" />
30+
<Setter Property="Foreground" Value="{x:Static SystemColors.GrayTextBrush}" />
31+
</Style.Setters>
32+
</Style>
33+
<Style x:Key="HeadingLabel" TargetType="TextBlock">
34+
<Style.Setters>
35+
<Setter Property="FontFamily" Value="Segoe UI" />
36+
<Setter Property="FontSize" Value="14" />
37+
<Setter Property="FontWeight" Value="Bold" />
38+
<Setter Property="Foreground" Value="{x:Static SystemColors.ControlTextBrush}" />
39+
</Style.Setters>
40+
</Style>
41+
<Style x:Key="SectionBorder" TargetType="Border">
42+
<Style.Setters>
43+
<Setter Property="Background" Value="{x:Static SystemColors.ControlBrush}" />
44+
<Setter Property="BorderBrush" Value="{x:Static SystemColors.HighlightBrush}" />
45+
<Setter Property="BorderThickness" Value="2" />
46+
<Setter Property="CornerRadius" Value="8" />
47+
<Setter Property="Margin" Value="8,8" />
48+
<Setter Property="Padding" Value="4" />
49+
</Style.Setters>
50+
</Style>
51+
<Style x:Key="ReportButtonBorder" TargetType="Border">
52+
<Style.Setters>
53+
<Setter Property="Margin" Value="10" />
54+
<Setter Property="CornerRadius" Value="6" />
55+
<Setter Property="BorderBrush" Value="{StaticResource GreenButtonBorderBrush}" />
56+
<Setter Property="BorderThickness" Value="2" />
57+
<Setter Property="Background" Value="{StaticResource GreenButtonBrush}" />
58+
</Style.Setters>
59+
<Style.Triggers>
60+
<Trigger Property="IsMouseOver" Value="True">
61+
<Setter Property="Background" Value="{StaticResource GreenButtonMouseOverBrush}" />
62+
</Trigger>
63+
</Style.Triggers>
64+
</Style>
65+
</ResourceDictionary>
6166
</UserControl.Resources>
6267
<Grid Background="{x:Static SystemColors.WindowBrush}">
6368
<Grid.ColumnDefinitions>
@@ -109,7 +114,7 @@
109114
NavigateUri="https://github.com/rubberduck-vba/Rubberduck/issues/new/choose"
110115
TextDecorations="{x:Null}"
111116
Command="{Binding UriCommand}" CommandParameter="{Binding ElementName=GitHubIssueUrl, Path=NavigateUri}">
112-
<Label Height="40" Foreground="White" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
117+
<Label Height="40" Foreground="{StaticResource CaptionLightBrush}" FontFamily="Segoe UI" FontSize="13" FontWeight="SemiBold"
113118
VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch"
114119
Content="{Resx ResxName=Rubberduck.Resources.About.AboutUI, Key=AboutWindow_ReportAnIssue}"/>
115120
</Hyperlink>

0 commit comments

Comments
 (0)