Skip to content

Commit 1f4dcb5

Browse files
Merge branch 'next' into next
2 parents f7c2fe7 + 0984312 commit 1f4dcb5

File tree

97 files changed

+4343
-3031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+4343
-3031
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<img src="http://i.stack.imgur.com/jnBEp.jpg" width=100% />
22

3+
### Donate!
4+
5+
If you like this project and would like to thank its contributors, you are welcome to support our GoFundMe campaign to finance Rubberduck swag and international shipping - contributors will be getting t-shirts, mugs, and other cool things.
6+
7+
[![GoFundMe campaign](https://user-images.githubusercontent.com/5751684/29191799-e3d20b72-7dec-11e7-8ec6-0c69da4a3135.png)](https://www.gofundme.com/rubberduckvba)
8+
39
Branch | Description | Build Status |
410
|------------|---|--------------|
511
| **master** | The last released build | ![master branch build status][masterBuildStatus] |

RetailCoder.VBE/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("Rubberduck")]
1111
[assembly: AssemblyProduct("Rubberduck")]
12-
[assembly: AssemblyCopyright("Copyright © 2014-2016")]
12+
[assembly: AssemblyCopyright("Copyright © 2014-2017")]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("2.0.14.*")]
35-
[assembly: AssemblyFileVersion("2.0.14.0")]
34+
[assembly: AssemblyVersion("2.1.0.*")]
35+
[assembly: AssemblyFileVersion("2.1.0.0")]

RetailCoder.VBE/UI/About/AboutControl.xaml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,20 @@
3737
HorizontalAlignment="Left"
3838
VerticalAlignment="Top"
3939
Margin="5,0,0,5" Height="316" Width="175">
40-
<Image Source="{StaticResource Ducky}" Stretch="UniformToFill" Height="292" />
41-
<TextBlock HorizontalAlignment="Center" Margin="0,5,0,0">
40+
<Image Source="{StaticResource Ducky}" Stretch="UniformToFill" Height="250" />
41+
<TextBlock HorizontalAlignment="Center" Margin="0,30,0,0">
4242
<Hyperlink Name="WebpageHyperlink"
4343
NavigateUri="http://rubberduckvba.com/"
4444
FontWeight="Bold"
4545
Command="{Binding UriCommand}"
4646
CommandParameter="{Binding ElementName=WebpageHyperlink, Path=NavigateUri}">rubberduckvba.com</Hyperlink>
4747
</TextBlock>
48+
<TextBlock HorizontalAlignment="Center" Margin="0">
49+
<Hyperlink Name="GoFundMeHyperlink"
50+
NavigateUri="http://gofundme.com/rubberduckvba/"
51+
Command="{Binding UriCommand}"
52+
CommandParameter="{Binding ElementName=GoFundMeHyperlink, Path=NavigateUri}">gofundme.com/rubberduckvba</Hyperlink>
53+
</TextBlock>
4854
</StackPanel>
4955
<StackPanel Grid.Column="1"
5056
Grid.Row="1"
@@ -81,10 +87,13 @@ Stack Overflow
8187
<TextBlock FontSize="10"
8288
xml:space="preserve">Abraham Hosch
8389
Andrew Jackson
90+
Andrew Zschetzsche
8491
Andrin Meier
92+
Brandon Barney
93+
Brian Zenger
8594
Bruno Costa
86-
BZngr
8795
Carlos J. Quintero (MZ-Tools)
96+
Clemens Lieb
8897
@Comintern
8998
@daFreeMan
9099
@Duga SE chat bot
@@ -93,11 +102,13 @@ Frank Van Heeswijk
93102
Gareth Leachman
94103
@Heslacher
95104
INOPIAE
105+
@IvenBach
96106
Jeroen Vannevel
97107
Max Dörner
98108
Michal Krzych
99109
@mjolka
100110
Philip Wales
111+
Radosław Kapka
101112
Rob Bovey (Smart Indenter)
102113
Ross McLean
103114
Ross Knudsen
@@ -118,7 +129,7 @@ Stephen Bullen (Smart Indenter)
118129
<!-- Circle logos created with Ai->XAML Export Plug-In Version 0.2 (PC/64) -->
119130
<!-- By Mike Swanson (http://blog.mikeswanson.com/) -->
120131

121-
<StackPanel Margin="2,0,20,0" HorizontalAlignment="Center">
132+
<StackPanel Margin="2,5,10,0" HorizontalAlignment="Center">
122133
<TextBlock TextAlignment="Center" HorizontalAlignment="Center">
123134
<Hyperlink Name="GitHubUrl"
124135
NavigateUri="https://github.com/rubberduck-vba/Rubberduck"
@@ -136,9 +147,9 @@ Stephen Bullen (Smart Indenter)
136147
</Viewbox>
137148
</Hyperlink>
138149
</TextBlock>
139-
<TextBlock Text="GitHub" FontSize="9" TextAlignment="Center" />
150+
<!--<TextBlock Text="GitHub" FontSize="9" TextAlignment="Center" />-->
140151
</StackPanel>
141-
<StackPanel Margin="25,0,0,0" HorizontalAlignment="Center">
152+
<StackPanel Margin="25,5,0,0" HorizontalAlignment="Center">
142153
<TextBlock TextAlignment="Center" HorizontalAlignment="Center">
143154
<Hyperlink Name="TwitterUrl"
144155
NavigateUri="http://www.twitter.com/rubberduckvba"
@@ -156,7 +167,7 @@ Stephen Bullen (Smart Indenter)
156167
</Viewbox>
157168
</Hyperlink>
158169
</TextBlock>
159-
<TextBlock Text="Twitter" FontSize="9" TextAlignment="Center" />
170+
<!--<TextBlock Text="Twitter" FontSize="9" TextAlignment="Center" />-->
160171
</StackPanel>
161172
</StackPanel>
162173
</Border>

Rubberduck.Inspections/Abstract/InspectionBase.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity def
2424
Name = GetType().Name;
2525
}
2626

27+
/// <summary>
28+
/// Gets the type of the inspection class. GetType() returns an interceptor proxy type.
29+
/// </summary>
30+
public abstract Type Type { get; }
31+
2732
/// <summary>
2833
/// Gets a value the severity level to reset to, the "factory default" setting.
2934
/// </summary>

Rubberduck.Inspections/Concrete/ApplicationWorksheetFunctionInspection.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Linq;
34
using Rubberduck.Inspections.Abstract;
45
using Rubberduck.Inspections.Results;
6+
using Rubberduck.Parsing.Inspections;
57
using Rubberduck.Parsing.Inspections.Abstract;
68
using Rubberduck.Parsing.Inspections.Resources;
79
using Rubberduck.Parsing.Symbols;
@@ -10,11 +12,14 @@
1012

1113
namespace Rubberduck.Inspections.Concrete
1214
{
15+
[RequiredLibrary("Excel")]
1316
public class ApplicationWorksheetFunctionInspection : InspectionBase
1417
{
1518
public ApplicationWorksheetFunctionInspection(RubberduckParserState state)
1619
: base(state, CodeInspectionSeverity.Suggestion) { }
1720

21+
public override Type Type => typeof(ApplicationWorksheetFunctionInspection);
22+
1823
public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
1924

2025
public override IEnumerable<IInspectionResult> GetInspectionResults()

Rubberduck.Inspections/Concrete/AssignedByValParameterInspection.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections.Generic;
23
using System.Linq;
34
using Rubberduck.Inspections.Abstract;
@@ -17,6 +18,8 @@ public AssignedByValParameterInspection(RubberduckParserState state)
1718
Severity = DefaultSeverity;
1819
}
1920

21+
public override Type Type => typeof(AssignedByValParameterInspection);
22+
2023
public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
2124

2225
public override IEnumerable<IInspectionResult> GetInspectionResults()

Rubberduck.Inspections/Concrete/ConstantNotUsedInspection.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections.Generic;
23
using System.Linq;
34
using Antlr4.Runtime;
@@ -17,6 +18,8 @@ public sealed class ConstantNotUsedInspection : InspectionBase
1718
public ConstantNotUsedInspection(RubberduckParserState state)
1819
: base(state) { }
1920

21+
public override Type Type => typeof(ConstantNotUsedInspection);
22+
2023
public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
2124

2225
public override IEnumerable<IInspectionResult> GetInspectionResults()

Rubberduck.Inspections/Concrete/DefaultProjectNameInspection.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Linq;
34
using Rubberduck.Inspections.Abstract;
45
using Rubberduck.Inspections.Results;
6+
using Rubberduck.Parsing.Inspections;
57
using Rubberduck.Parsing.Inspections.Abstract;
68
using Rubberduck.Parsing.Inspections.Resources;
79
using Rubberduck.Parsing.Symbols;
810
using Rubberduck.Parsing.VBA;
911

1012
namespace Rubberduck.Inspections.Concrete
1113
{
14+
[CannotAnnotate]
1215
public sealed class DefaultProjectNameInspection : InspectionBase
1316
{
1417
public DefaultProjectNameInspection(RubberduckParserState state)
1518
: base(state, CodeInspectionSeverity.Suggestion) { }
1619

20+
public override Type Type => typeof(DefaultProjectNameInspection);
21+
1722
public override CodeInspectionType InspectionType => CodeInspectionType.MaintainabilityAndReadabilityIssues;
1823

1924
public override IEnumerable<IInspectionResult> GetInspectionResults()

Rubberduck.Inspections/Concrete/EmptyElseBlockInspection.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Linq;
34
using Antlr4.Runtime;
45
using Rubberduck.Parsing.Grammar;
@@ -18,6 +19,8 @@ internal class EmptyElseBlockInspection : ParseTreeInspectionBase
1819
{
1920
public EmptyElseBlockInspection(RubberduckParserState state) : base(state, CodeInspectionSeverity.Suggestion) { }
2021

22+
public override Type Type => typeof(EmptyElseBlockInspection);
23+
2124
public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
2225

2326
public override IInspectionListener Listener { get; } = new EmptyElseBlockListener();
@@ -28,7 +31,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
2831
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
2932
.Select(result => new QualifiedContextInspectionResult(this,
3033
InspectionsUI.EmptyElseBlockInspectionResultFormat,
31-
State,
3234
result));
3335
}
3436

Rubberduck.Inspections/Concrete/EmptyIfBlockInspection.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Diagnostics;
34
using System.Linq;
45
using Antlr4.Runtime;
@@ -19,6 +20,8 @@ internal class EmptyIfBlockInspection : ParseTreeInspectionBase
1920
public EmptyIfBlockInspection(RubberduckParserState state)
2021
: base(state) { }
2122

23+
public override Type Type => typeof(EmptyIfBlockInspection);
24+
2225
public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
2326

2427
public override IInspectionListener Listener { get; } =
@@ -30,7 +33,6 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
3033
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line))
3134
.Select(result => new QualifiedContextInspectionResult(this,
3235
InspectionsUI.EmptyIfBlockInspectionResultFormat,
33-
State,
3436
result));
3537
}
3638

0 commit comments

Comments
 (0)