Skip to content

Commit 79668be

Browse files
committed
Merge remote-tracking branch 'upstream/next' into MoreTestsForSymbols
merging recent changes
2 parents 28685d1 + 56cc4be commit 79668be

File tree

240 files changed

+2627
-1091
lines changed

Some content is hidden

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

240 files changed

+2627
-1091
lines changed

Installer Build Script.iss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ Filename: "{dotnet4064}\RegAsm.exe"; Parameters: "/codebase {#AddinDLL}"; Workin
5252
Filename: "{dotnet4032}\RegAsm.exe"; Parameters: "/u {#AddinDLL}"; WorkingDir: "{app}"; StatusMsg: "Unregistering Controls..."; Flags: runascurrentuser runminimized; Check: Is32BitOfficeInstalled
5353
Filename: "{dotnet4064}\RegAsm.exe"; Parameters: "/u {#AddinDLL}"; WorkingDir: "{app}"; StatusMsg: "Unregistering Controls..."; Flags: runascurrentuser runminimized; Check: Is64BitOfficeInstalled
5454

55+
[UninstallDelete]
56+
Type: filesandordirs; Name: "{localappdata}\{#AppName}"
57+
5558
[CustomMessages]
5659
; TODO add additional languages here.
5760
English.NETFramework40NotInstalled=Microsoft .NET Framework 4.0 installation was not detected.

RetailCoder.VBE/API/ParserState.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
using Rubberduck.Parsing.Preprocessing;
1010
using System.Globalization;
1111
using Rubberduck.Parsing.Symbols;
12-
using Rubberduck.VBEditor;
13-
using Rubberduck.VBEditor.Events;
1412
using Rubberduck.VBEditor.SafeComWrappers.VBA;
1513

1614
namespace Rubberduck.API

RetailCoder.VBE/App.cs

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
using System.IO;
1+
using System.Collections.Generic;
2+
using System.IO;
3+
using System.Reflection;
24
using Infralution.Localization.Wpf;
35
using NLog;
6+
using NLog.Fluent;
47
using Rubberduck.Common;
58
using Rubberduck.Parsing;
69
using Rubberduck.Parsing.Symbols;
@@ -145,6 +148,7 @@ private void UpdateLoggingLevel()
145148
public void Startup()
146149
{
147150
EnsureLogFolderPathExists();
151+
LogRubberduckSart();
148152
LoadConfig();
149153
CheckForLegacyIndenterSettings();
150154
_appMenus.Initialize();
@@ -223,6 +227,21 @@ private void CheckForLegacyIndenterSettings()
223227
}
224228
}
225229

230+
private void LogRubberduckSart()
231+
{
232+
var version = GetType().Assembly.GetName().Version.ToString();
233+
GlobalDiagnosticsContext.Set("RubberduckVersion", version);
234+
var headers = new List<string>
235+
{
236+
string.Format("Rubberduck version {0} loading:", version),
237+
string.Format("\tOperating System: {0} {1}", Environment.OSVersion.VersionString, Environment.Is64BitOperatingSystem ? "x64" : "x86"),
238+
string.Format("\tHost Product: {0} {1}", Application.ProductName, Environment.Is64BitProcess ? "x64" : "x86"),
239+
string.Format("\tHost Version: {0}", Application.ProductVersion),
240+
string.Format("\tHost Executable: {0}", Path.GetFileName(Application.ExecutablePath)),
241+
};
242+
Logger.Log(LogLevel.Info, string.Join(Environment.NewLine, headers));
243+
}
244+
226245
private bool _disposed;
227246
public void Dispose()
228247
{

RetailCoder.VBE/Common/Hotkeys/Hotkey.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Windows.Forms;
4-
using System.Windows.Input;
54
using Rubberduck.Common.WinAPI;
65
using NLog;
76
using Rubberduck.UI;

RetailCoder.VBE/Common/Hotkeys/IHotkey.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Windows.Forms;
2-
using System.Windows.Input;
32
using Rubberduck.UI.Command;
43

54
namespace Rubberduck.Common.Hotkeys

RetailCoder.VBE/Common/StringExtensions.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Globalization;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Threading.Tasks;
73

84
namespace Rubberduck.Common
95
{

RetailCoder.VBE/Inspections/Concrete/Inspector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private void UpdateInspectionSeverity(Configuration config)
4343
{
4444
foreach (var setting in config.UserSettings.CodeInspectionSettings.CodeInspections)
4545
{
46-
if (inspection.Description == setting.Description)
46+
if (inspection.Name == setting.Name)
4747
{
4848
inspection.Severity = setting.Severity;
4949
}

RetailCoder.VBE/Inspections/EmptyStringLiteralInspection.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Collections.Generic;
22
using System.Linq;
3-
using Antlr4.Runtime;
43
using Rubberduck.Inspections.Abstract;
54
using Rubberduck.Inspections.Resources;
65
using Rubberduck.Inspections.Results;
@@ -20,7 +19,7 @@ public EmptyStringLiteralInspection(RubberduckParserState state)
2019
}
2120

2221
public override string Meta { get { return InspectionsUI.EmptyStringLiteralInspectionMeta; } }
23-
public override string Description { get { return InspectionsUI.EmptyStringLiteralInspection; } }
22+
public override string Description { get { return InspectionsUI.EmptyStringLiteralInspectionName; } }
2423
public override CodeInspectionType InspectionType { get { return CodeInspectionType.LanguageOpportunities; } }
2524

2625
public IEnumerable<QualifiedContext<VBAParser.LiteralExpressionContext>> ParseTreeResults { get { return _parseTreeResults.OfType<QualifiedContext<VBAParser.LiteralExpressionContext>>(); } }

RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public ImplicitActiveSheetReferenceInspection(IVBE vbe, RubberduckParserState st
2121
}
2222

2323
public override string Meta { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionMeta; } }
24-
public override string Description { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionResultFormat; } }
24+
public override string Description { get { return InspectionsUI.ImplicitActiveSheetReferenceInspectionName; } }
2525
public override CodeInspectionType InspectionType { get { return CodeInspectionType.MaintainabilityAndReadabilityIssues; } }
2626

2727
private static readonly string[] Targets =

RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public ImplicitActiveWorkbookReferenceInspection(IVBE vbe, RubberduckParserState
2121
}
2222

2323
public override string Meta { get { return InspectionsUI.ImplicitActiveWorkbookReferenceInspectionMeta; } }
24-
public override string Description { get { return InspectionsUI.ImplicitActiveWorkbookReferenceInspectionResultFormat; } }
24+
public override string Description { get { return InspectionsUI.ImplicitActiveWorkbookReferenceInspectionName; } }
2525
public override CodeInspectionType InspectionType { get { return CodeInspectionType.MaintainabilityAndReadabilityIssues; } }
2626

2727
private static readonly string[] Targets =

0 commit comments

Comments
 (0)