Skip to content

Commit

Permalink
Merge branch 'next' of git://github.com/rubberduck-vba/Rubberduck int…
Browse files Browse the repository at this point in the history
…o fixStringSheet
  • Loading branch information
retailcoder committed Apr 19, 2021
2 parents 26a29f8 + edd5fb3 commit 9bdeb60
Show file tree
Hide file tree
Showing 15 changed files with 486 additions and 1,393 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ namespace Rubberduck.CodeAnalysis.Inspections.Concrete
/// a parameter that is passed by reference (implicitly, or explicitly ByRef) makes it ambiguous from the calling code's standpoint, whether the
/// procedure might re-assign these ByRef values and introduce a bug.
/// </why>
/// <remarks>For performance reasons, this inspection will not flag a parameter that is passed as an argument to a procedure that also accepts it ByRef.</remarks>
/// <example hasResult="true">
/// <module name="MyModule" type="Standard Module">
/// <![CDATA[
Expand All @@ -39,6 +40,21 @@ namespace Rubberduck.CodeAnalysis.Inspections.Concrete
/// ]]>
/// </module>
/// </example>
/// <example hasResult="false">
/// <module name="MyModule" type="Standard Module">
/// <![CDATA[
/// Option Explicit
/// Public Sub DoSomething(ByVal foo As long, ByRef bar As Long)
/// DoSomethingElse bar ' ByRef argument will not be flagged
/// Debug.Print foo, bar
/// End Sub
///
/// Private Sub DoSomethingElse(ByRef wouldNeedRecursiveLogic As Long)
/// Debug.Print wouldNeedRecursiveLogic
/// End Sub
/// ]]>
/// </module>
/// </example>
internal sealed class ParameterCanBeByValInspection : DeclarationInspectionBase
{
public ParameterCanBeByValInspection(IDeclarationFinderProvider declarationFinderProvider)
Expand Down
10 changes: 10 additions & 0 deletions Rubberduck.Core/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Rubberduck.Core/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,8 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Splash2021f" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Splash2021f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added Rubberduck.Core/Resources/Splash2021f.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion Rubberduck.Core/Rubberduck.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyName>Rubberduck.Core</AssemblyName>
<Title>Rubberduck.Core</Title>
<Product>Rubberduck.Core</Product>
<Copyright>Copyright © 2014-2019</Copyright>
<Copyright>Copyright © 2014-2021</Copyright>
<ProjectGuid>{A1587EAC-7B54-407E-853F-4C7493D0323E}</ProjectGuid>
<DocumentationFile>bin\Debug\Rubberduck.Core.xml</DocumentationFile>
<!-- Disable "Missing XML documentation" warning (CS1591) -->
Expand Down Expand Up @@ -91,4 +91,17 @@
<Version>2.0.20525</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
</Project>
18 changes: 0 additions & 18 deletions Rubberduck.Core/UI/Splash.cs

This file was deleted.

1,340 changes: 0 additions & 1,340 deletions Rubberduck.Core/UI/Splash.resx

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions Rubberduck.Core/UI/Splash2021.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Rubberduck.UI
{
public partial class Splash2021 : Form
{
public Splash2021()
{
InitializeComponent();
#if DEBUG
VersionLabel.Text = $"Version {GetType().Assembly.GetName().Version} (debug)";
#else
VersionLabel.Text = $"Version {GetType().Assembly.GetName().Version}";
#endif
VersionLabel.Parent = pictureBox1;
VersionLabel.BackColor = Color.Transparent;
}
}
}
Loading

0 comments on commit 9bdeb60

Please sign in to comment.