Skip to content

Commit

Permalink
merge with conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@retailcoder
retailcoder committed May 11, 2018
2 parents 5e9de50 + 6804894 commit d99129b
Show file tree
Hide file tree
Showing 105 changed files with 11,824 additions and 5,434 deletions.
711 changes: 385 additions & 326 deletions Rubberduck.Core/NLog.xsd
View file

Large diffs are not rendered by default.

17 changes: 11 additions & 6 deletions Rubberduck.Core/Rubberduck.Core.csproj
View file
Expand Up @@ -230,20 +230,20 @@
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\packages\Antlr4.Runtime.4.6.4\lib\net45\Antlr4.Runtime.dll</HintPath>
</Reference>
<Reference Include="Castle.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
</Reference>
<Reference Include="EasyHook, Version=2.7.6270.0, Culture=neutral, PublicKeyToken=4b580fca19d0b0c5, processorArchitecture=MSIL">
<HintPath>..\packages\EasyHook.2.7.6270\lib\net40\EasyHook.dll</HintPath>
</Reference>
<Reference Include="extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
<Reference Include="HtmlAgilityPack, Version=1.8.1.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlAgilityPack.1.8.1\lib\Net45\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
<HintPath>..\packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
Expand All @@ -256,7 +256,7 @@
<Private>True</Private>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.5.4\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
Expand All @@ -266,16 +266,21 @@
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Printing" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
Expand Down
249 changes: 125 additions & 124 deletions Rubberduck.Core/UI/About/AboutControl.xaml
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Rubberduck.Core/UI/About/AboutDialog.Designer.cs
View file

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

18 changes: 9 additions & 9 deletions Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml
View file
Expand Up @@ -346,7 +346,7 @@
<ToolBar Style="{DynamicResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">

<Button Command="{Binding RefreshCommand}">
<Image Height="16" Source="../../Resources/arrow-circle-double.png">
<Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png">
<Image.Style>
<Style TargetType="Image">
<Style.Triggers>
Expand All @@ -365,9 +365,9 @@
<Separator />

<Menu>
<MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Add}">
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Add}" VerticalAlignment="Center">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/plus-circle.png" />
<Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/plus-circle.png" />
</MenuItem.Icon>
<MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_AddTestModuleText}"
Command="{Binding AddTestModuleCommand}"
Expand Down Expand Up @@ -404,9 +404,9 @@
<Separator />

<Menu Margin="0,0,2,0">
<MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_Sort}">
<MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeExplorer_Sort}" VerticalAlignment="Center">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/edit-list-order.png" />
<Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/edit-list-order.png" />
</MenuItem.Icon>

<MenuItem Name="SortByName"
Expand All @@ -433,14 +433,14 @@
</MenuItem>
</Menu>

<ToggleButton Name="DisplaySignatures" ToolTip="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ShowSignaturesToolTip}" IsChecked="True">
<Image Height="16" Source="../../Resources/Custom/PNG/DisplayFullSignature.png" />
<ToggleButton Name="DisplaySignatures" ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeExplorer_ShowSignaturesToolTip}" IsChecked="True">
<Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/DisplayFullSignature.png" />
</ToggleButton>

<Separator />

<Button Command="{Binding OpenDesignerCommand}" CommandParameter="{Binding SelectedItem}">
<Image Height="16" Source="../../Resources/Custom/PNG/ProjectForm.png">
<Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Custom/PNG/ProjectForm.png">
<Image.Style>
<Style TargetType="Image">
<Style.Triggers>
Expand All @@ -459,7 +459,7 @@
<Separator />

<Button Command="{Binding CopyResultsCommand}" CommandParameter="{Binding ElementName=ProjectTree}">
<Image Height="16" Source="../../Resources/document-copy.png">
<Image Height="16" Source="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/document-copy.png">
<Image.Style>
<Style TargetType="Image">
<Style.Triggers>
Expand Down
28 changes: 14 additions & 14 deletions Rubberduck.Core/UI/CodeMetrics/CodeMetricsControl.xaml
View file
Expand Up @@ -17,12 +17,12 @@
<ResourceDictionary Source="../Controls/ToolBar.xaml"/>
</ResourceDictionary.MergedDictionaries>

<BitmapImage x:Key="RefreshImage" UriSource="../../Resources/arrow-circle-double.png" />
<BitmapImage x:Key="CollaseNodesImage" UriSource="../../Resources/folder.png" />
<BitmapImage x:Key="ExpandNodesImage" UriSource="../../Resources/folder-open.png" />
<BitmapImage x:Key="UndoImage" UriSource="../../Resources/arrow-circle-left.png" />
<BitmapImage x:Key="PrintImage" UriSource="../../Resources/printer.png" />
<BitmapImage x:Key="SearchImage" UriSource="../../Resources/magnifier-medium.png" />
<BitmapImage x:Key="RefreshImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-double.png" />
<BitmapImage x:Key="CollaseNodesImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/folder.png" />
<BitmapImage x:Key="ExpandNodesImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/folder-open.png" />
<BitmapImage x:Key="UndoImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-circle-left.png" />
<BitmapImage x:Key="PrintImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/printer.png" />
<BitmapImage x:Key="SearchImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/magnifier-medium.png" />

<BooleanToVisibilityConverter x:Key="BoolToVisibility"/>
<converters:BoolToHiddenVisibilityConverter x:Key="BoolToHiddenVisibility" />
Expand Down Expand Up @@ -52,19 +52,19 @@

<DataGrid Grid.Row="1" ItemsSource="{Binding ModuleMetrics}" AutoGenerateColumns="False" IsReadOnly="True">
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Path=ModuleName}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SearchResults_ModuleName}" Width="*"/>
<DataGridTextColumn Binding="{Binding Path=Result.Lines}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeMetrics_Lines}" Width="Auto" x:Name="LinesColumn"/>
<DataGridTextColumn Binding="{Binding Path=Result.CyclomaticComplexity}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeMetrics_Complexity}" Width="Auto" x:Name="CCColumn"/>
<DataGridTextColumn Binding="{Binding Path=Result.MaximumNesting}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeMetrics_Nesting}" Width="Auto" x:Name="NestingColumn"/>
<DataGridTextColumn Binding="{Binding Path=ModuleName}" Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_ModuleName}" Width="*"/>
<DataGridTextColumn Binding="{Binding Path=Result.Lines}" Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeMetrics_Lines}" Width="Auto" x:Name="LinesColumn"/>
<DataGridTextColumn Binding="{Binding Path=Result.CyclomaticComplexity}" Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeMetrics_Complexity}" Width="Auto" x:Name="CCColumn"/>
<DataGridTextColumn Binding="{Binding Path=Result.MaximumNesting}" Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeMetrics_Nesting}" Width="Auto" x:Name="NestingColumn"/>
</DataGrid.Columns>
<DataGrid.RowDetailsTemplate>
<DataTemplate>
<DataGrid ItemsSource="{Binding Path=MemberResults}" AutoGenerateColumns="False" IsReadOnly="True" Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid,AncestorLevel=1}, Converter={StaticResource SubtractionConverter},ConverterParameter=25}">
<DataGrid.Columns>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SearchResults_MemberName}" Binding="{Binding Path=Key.IdentifierName}" Width="*"/>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeMetrics_Lines}" Binding="{Binding Path=Value.Lines}" Width="{Binding Path=ActualWidth, Source={x:Reference LinesColumn}}"/>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeMetrics_Complexity}" Binding="{Binding Path=Value.CyclomaticComplexity}" Width="{Binding Path=ActualWidth, Source={x:Reference CCColumn}}"/>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeMetrics_Nesting}" Binding="{Binding Path=Value.MaximumNesting}" Width="{Binding Path=ActualWidth, Source={x:Reference NestingColumn}}"/>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=SearchResults_MemberName}" Binding="{Binding Path=Key.IdentifierName}" Width="*"/>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeMetrics_Lines}" Binding="{Binding Path=Value.Lines}" Width="{Binding Path=ActualWidth, Source={x:Reference LinesColumn}}"/>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeMetrics_Complexity}" Binding="{Binding Path=Value.CyclomaticComplexity}" Width="{Binding Path=ActualWidth, Source={x:Reference CCColumn}}"/>
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeMetrics_Nesting}" Binding="{Binding Path=Value.MaximumNesting}" Width="{Binding Path=ActualWidth, Source={x:Reference NestingColumn}}"/>
</DataGrid.Columns>
</DataGrid>
</DataTemplate>
Expand Down
6 changes: 3 additions & 3 deletions Rubberduck.Core/UI/Command/AddTestMethodCommand.cs
View file
Expand Up @@ -4,8 +4,8 @@
using Rubberduck.Parsing.Annotations;
using Rubberduck.Parsing.Symbols;
using Rubberduck.Parsing.VBA;
using Rubberduck.Resources.UnitTesting;
using Rubberduck.UnitTesting;
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.Extensions;
using Rubberduck.VBEditor.SafeComWrappers.Abstract;

Expand All @@ -31,7 +31,7 @@ public AddTestMethodCommand(IVBE vbe, RubberduckParserState state) : base(LogMan

public static readonly string TestMethodTemplate = string.Concat(
"'@TestMethod\r\n",
"Public Sub ", NamePlaceholder, "() 'TODO ", RubberduckUI.UnitTest_NewMethod_Rename, "\r\n",
"Public Sub ", NamePlaceholder, "() 'TODO ", TestExplorer.UnitTest_NewMethod_Rename, "\r\n",
" On Error GoTo TestFail\r\n",
" \r\n",
" 'Arrange:\r\n\r\n",
Expand All @@ -41,7 +41,7 @@ public AddTestMethodCommand(IVBE vbe, RubberduckParserState state) : base(LogMan
"TestExit:\r\n",
" Exit Sub\r\n",
"TestFail:\r\n",
" Assert.Fail \"", RubberduckUI.UnitTest_NewMethod_RaisedTestError, ": #\" & Err.Number & \" - \" & Err.Description\r\n",
" Assert.Fail \"", TestExplorer.UnitTest_NewMethod_RaisedTestError, ": #\" & Err.Number & \" - \" & Err.Description\r\n",
"End Sub\r\n"
);

Expand Down
8 changes: 4 additions & 4 deletions Rubberduck.Core/UI/Command/AddTestMethodExpectedErrorCommand.cs
View file
Expand Up @@ -4,8 +4,8 @@
using Rubberduck.Parsing.Annotations;
using Rubberduck.Parsing.Symbols;
using Rubberduck.Parsing.VBA;
using Rubberduck.Resources.UnitTesting;
using Rubberduck.UnitTesting;
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.Extensions;
using Rubberduck.VBEditor.SafeComWrappers.Abstract;

Expand All @@ -31,14 +31,14 @@ public AddTestMethodExpectedErrorCommand(IVBE vbe, RubberduckParserState state)

public static readonly string TestMethodExpectedErrorTemplate = string.Concat(
"'@TestMethod\r\n",
"Public Sub ", NamePlaceholder, "() 'TODO ", RubberduckUI.UnitTest_NewMethod_Rename, "\r\n",
" Const ExpectedError As Long = 0 'TODO ", RubberduckUI.UnitTest_NewMethod_ChangeErrorNo, "\r\n",
"Public Sub ", NamePlaceholder, "() 'TODO ", TestExplorer.UnitTest_NewMethod_Rename, "\r\n",
" Const ExpectedError As Long = 0 'TODO ", TestExplorer.UnitTest_NewMethod_ChangeErrorNo, "\r\n",
" On Error GoTo TestFail\r\n",
" \r\n",
" 'Arrange:\r\n\r\n",
" 'Act:\r\n\r\n",
"Assert:\r\n",
" Assert.Fail \"", RubberduckUI.UnitTest_NewMethod_ErrorNotRaised, ".\"\r\n\r\n",
" Assert.Fail \"", TestExplorer.UnitTest_NewMethod_ErrorNotRaised, ".\"\r\n\r\n",
"TestExit:\r\n",
" Exit Sub\r\n",
"TestFail:\r\n",
Expand Down
11 changes: 6 additions & 5 deletions Rubberduck.Core/UI/Command/AddTestModuleCommand.cs
View file
Expand Up @@ -10,6 +10,7 @@
using System.Text;
using Rubberduck.Parsing.Symbols;
using System;
using Rubberduck.Resources.UnitTesting;

namespace Rubberduck.UI.Command
{
Expand Down Expand Up @@ -45,14 +46,14 @@ public AddTestModuleCommand(IVBE vbe, RubberduckParserState state, IGeneralConfi
private readonly string _moduleInit = new StringBuilder()
.AppendLine("'@ModuleInitialize")
.AppendLine("Public Sub ModuleInitialize()")
.AppendLine($" '{RubberduckUI.UnitTest_NewModule_RunOnce}.")
.AppendLine($" '{TestExplorer.UnitTest_NewModule_RunOnce}.")
.AppendLine(" {0}")
.AppendLine(" {1}")
.AppendLine("End Sub")
.AppendLine()
.AppendLine("'@ModuleCleanup")
.AppendLine("Public Sub ModuleCleanup()")
.AppendLine($" '{RubberduckUI.UnitTest_NewModule_RunOnce}.")
.AppendLine($" '{TestExplorer.UnitTest_NewModule_RunOnce}.")
.AppendLine(" Set Assert = Nothing")
.AppendLine(" Set Fakes = Nothing")
.AppendLine("End Sub")
Expand All @@ -62,12 +63,12 @@ public AddTestModuleCommand(IVBE vbe, RubberduckParserState state, IGeneralConfi
private readonly string _methodInit = new StringBuilder()
.AppendLine("'@TestInitialize")
.AppendLine("Public Sub TestInitialize()")
.AppendLine($" '{RubberduckUI.UnitTest_NewModule_RunBeforeTest}.")
.AppendLine($" '{TestExplorer.UnitTest_NewModule_RunBeforeTest}.")
.AppendLine("End Sub")
.AppendLine()
.AppendLine("'@TestCleanup")
.AppendLine("Public Sub TestCleanup()")
.AppendLine($" '{RubberduckUI.UnitTest_NewModule_RunAfterTest}.")
.AppendLine($" '{TestExplorer.UnitTest_NewModule_RunAfterTest}.")
.AppendLine("End Sub")
.AppendLine()
.ToString();
Expand Down Expand Up @@ -235,7 +236,7 @@ protected override void OnExecute(object parameter)
}
catch (Exception ex)
{
_messageBox.Show(RubberduckUI.Command_AddTestModule_Error);
_messageBox.Show(TestExplorer.Command_AddTestModule_Error);
Logger.Warn("Unable to add test module. An exception was thrown.");
Logger.Warn(ex);
}
Expand Down

0 comments on commit d99129b

Please sign in to comment.