Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5c06585
Implemented Quantifiers and CharacterClasses. Tests for both, as well…
Vogel612 Jun 18, 2016
e2fb2bf
Minor Rework of interactions between Atoms and IRegularExpression. Ad…
Vogel612 Jun 19, 2016
6d93a67
Churned out the Group Atom
Vogel612 Jun 19, 2016
2c1a438
Churned out the Literal atom
Vogel612 Jun 19, 2016
500115b
Added basics to IRegularExpressions, Added Parser-Method (unimplemented)
Vogel612 Jun 19, 2016
f6d059a
Added test for Literals
Vogel612 Jun 19, 2016
e34eb2c
Rewrote Quantifier to use public pattern string, added outline for ac…
Vogel612 Jun 19, 2016
6448896
Implemented Parser for ConcatenatedExpressions and wrote a number of …
Vogel612 Jun 20, 2016
df05eb7
Added basic XML-Doc to the important methods
Vogel612 Jun 21, 2016
7b3bbd1
Implemented AlternativesExpression and added basic tests
Vogel612 Jun 21, 2016
975ac5b
Fixed simple problems pointed out in review
Vogel612 Jun 21, 2016
de001ef
Prevented incorrect parse for to be escaped characters as literals
Vogel612 Jun 25, 2016
6be77a3
Added Anchors to Pattern
Vogel612 Jun 25, 2016
bc289cc
Hid away as much of the implementation as possible. Removed unnecessa…
Vogel612 Jun 25, 2016
3c9977a
Added IDescribable to Pattern and implemented it
Vogel612 Jun 25, 2016
7939b69
Added RegexAssistantDialog and WPF Component associated with it
Vogel612 Jun 26, 2016
9231936
Wired the RegexAssistant as a MenuItem
Vogel612 Jun 26, 2016
bb2d0a8
Added RegexAssasitantMenuItem to Composition Root
Vogel612 Jun 26, 2016
127833d
Made the UI actually work
Vogel612 Jun 26, 2016
2468245
Corrected some bugs in the way Descriptions were displayed
Vogel612 Jun 26, 2016
b1a776e
Added GetHashCode implementations and suppressed warnings in testcode…
Vogel612 Jul 1, 2016
6e94c53
Fixed infinite loop when trying to parse an Atom, openend internals f…
Vogel612 Jul 6, 2016
bbcd278
Reimplemented Regex Description as TreeView
Vogel612 Jul 6, 2016
73341f6
Added ErrorExpression to provide feedback for malformed Expressions
Vogel612 Jul 9, 2016
68b2c2c
Made Anchors (and the 'Global' Flag) reflect in the UI
Vogel612 Jul 9, 2016
8ec9b6d
Minor and Major cleanup inside Rubberduck.RegexAssistant
Vogel612 Jul 9, 2016
7f02a33
Fixed compilation Errors after CommandBase was introduced in next
Vogel612 Jul 10, 2016
e125de8
UI Tweaks. Made the TreeView Panel grow if necessary and delegating s…
Vogel612 Jul 10, 2016
35c803c
Introduced Tools ParentMenu in Rubberduck and moved NavigateMenuItem …
Vogel612 Jul 13, 2016
f2cb417
i18n check and todo cleanup
Vogel612 Jul 13, 2016
04dd638
Fixed compilation errors
Vogel612 Jul 13, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions RetailCoder.VBE/Root/RubberduckModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ public override void Load()
ConfigureFormDesignerContextMenu();
ConfigureFormDesignerControlContextMenu();
ConfigureProjectExplorerContextMenu();


BindWindowsHooks();
}
Expand Down Expand Up @@ -383,9 +384,9 @@ private IEnumerable<IMenuItem> GetRubberduckMenuItems()
Kernel.Get<AboutCommandMenuItem>(),
Kernel.Get<SettingsCommandMenuItem>(),
Kernel.Get<InspectionResultsCommandMenuItem>(),
Kernel.Get<ShowSourceControlPanelCommandMenuItem>(),
GetUnitTestingParentMenu(),
GetSmartIndenterParentMenu(),
GetToolsParentMenu(),
GetRefactoringsParentMenu(),
GetNavigateParentMenu(),
};
Expand Down Expand Up @@ -427,7 +428,6 @@ private IMenuItem GetNavigateParentMenu()
var items = new IMenuItem[]
{
Kernel.Get<CodeExplorerCommandMenuItem>(),
Kernel.Get<ToDoExplorerCommandMenuItem>(),
//Kernel.Get<RegexSearchReplaceCommandMenuItem>(),
Kernel.Get<FindSymbolCommandMenuItem>(),
Kernel.Get<FindAllReferencesCommandMenuItem>(),
Expand All @@ -454,13 +454,24 @@ private IEnumerable<IMenuItem> GetCodePaneContextMenuItems()
{
GetRefactoringsParentMenu(),
GetSmartIndenterParentMenu(),
//Kernel.Get<RegexSearchReplaceCommandMenuItem>(),
Kernel.Get<FindSymbolCommandMenuItem>(),
Kernel.Get<FindAllReferencesCommandMenuItem>(),
Kernel.Get<FindAllImplementationsCommandMenuItem>(),
};
}

private IMenuItem GetToolsParentMenu()
{
var items = new IMenuItem[]
{
Kernel.Get<ShowSourceControlPanelCommandMenuItem>(),
Kernel.Get<RegexAssistantCommandMenuItem>(),
Kernel.Get<ToDoExplorerCommandMenuItem>(),
};

return new ToolsParentMenu(items);
}

private IEnumerable<IMenuItem> GetFormDesignerContextMenuItems()
{
return new IMenuItem[]
Expand Down
35 changes: 29 additions & 6 deletions RetailCoder.VBE/Rubberduck.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,9 @@
<Compile Include="UI\CodeExplorer\Commands\AddClassModuleCommand.cs" />
<Compile Include="UI\CodeExplorer\Commands\AddStdModuleCommand.cs" />
<Compile Include="UI\CodeExplorer\Commands\AddTestModuleCommand.cs" />
<Compile Include="UI\Command\MenuItems\RegexAssistantCommand.cs" />
<Compile Include="UI\Command\MenuItems\RegexAssistantCommandMenuItem.cs" />
<Compile Include="UI\Command\MenuItems\ToolsParentMenu.cs" />
<Compile Include="UI\Controls\LinkButton.xaml.cs">
<DependentUpon>LinkButton.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -618,7 +621,6 @@
<Compile Include="UI\Command\FindSymbolCommand.cs" />
<Compile Include="UI\Command\FindAllReferencesCommand.cs" />
<Compile Include="UI\Command\MenuItems\ParentMenus\NavigateParentMenu.cs" />
<Compile Include="UI\Command\MenuItems\ParentMenus\NavigationMenuItemDisplayOrder.cs" />
<Compile Include="UI\Command\MenuItems\ParentMenus\SmartIndenterParentMenu.cs" />
<Compile Include="UI\Command\MenuItems\RubberduckCommandBar.cs" />
<Compile Include="UI\Command\MenuItems\RefactorEncapsulateFieldCommandMenuItem.cs" />
Expand Down Expand Up @@ -691,11 +693,26 @@
<Compile Include="UI\Refactorings\ExtractInterfaceDialog.Designer.cs">
<DependentUpon>ExtractInterfaceDialog.cs</DependentUpon>
</Compile>
<Compile Include="UI\RegexAssistant\RegexAssistant.xaml.cs">
<DependentUpon>RegexAssistant.xaml</DependentUpon>
</Compile>
<Compile Include="UI\RegexAssistant\RegexAssistantDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\RegexAssistant\RegexAssistantDialog.Designer.cs">
<DependentUpon>RegexAssistantDialog.cs</DependentUpon>
</Compile>
<Compile Include="UI\RegexAssistant\RegexAssistantViewModel.cs" />
<Compile Include="UI\RubberduckUI.de.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>RubberduckUI.de.resx</DependentUpon>
</Compile>
<Compile Include="UI\RubberduckUI.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>RubberduckUI.resx</DependentUpon>
</Compile>
<Compile Include="UI\RubberduckUI.ja.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
Expand Down Expand Up @@ -820,11 +837,6 @@
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="UI\RubberduckUI.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>RubberduckUI.resx</DependentUpon>
</Compile>
<Compile Include="UI\SourceControl\BranchesView.xaml.cs">
<DependentUpon>BranchesView.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -1031,6 +1043,9 @@
<EmbeddedResource Include="UI\Refactorings\ExtractInterfaceDialog.resx">
<DependentUpon>ExtractInterfaceDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\RegexAssistant\RegexAssistantDialog.resx">
<DependentUpon>RegexAssistantDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\RubberduckUI.de.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>RubberduckUI.de.Designer.cs</LastGenOutput>
Expand Down Expand Up @@ -1352,6 +1367,10 @@
<Project>{A4A618E1-CBCA-435F-9C6C-5181E030ADFC}</Project>
<Name>Rubberduck.Parsing</Name>
</ProjectReference>
<ProjectReference Include="..\Rubberduck.RegexAssistant\Rubberduck.RegexAssistant.csproj">
<Project>{40cc03e3-756c-4674-af07-384115deaee2}</Project>
<Name>Rubberduck.RegexAssistant</Name>
</ProjectReference>
<ProjectReference Include="..\Rubberduck.SettingsProvider\Rubberduck.SettingsProvider.csproj">
<Project>{e85e1253-86d6-45ee-968b-f37348d44132}</Project>
<Name>Rubberduck.SettingsProvider</Name>
Expand Down Expand Up @@ -1406,6 +1425,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\RegexAssistant\RegexAssistant.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UI\Settings\GeneralSettings.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,13 @@ public NavigateParentMenu(IEnumerable<IMenuItem> items)

public override int DisplayOrder { get { return (int)RubberduckMenuItemDisplayOrder.Navigate; } }
}

public enum NavigationMenuItemDisplayOrder
{
CodeExplorer,
RegexSearchReplace,
FindSymbol,
FindAllReferences,
FindImplementations
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ public enum RubberduckMenuItemDisplayOrder
UnitTesting,
Refactorings,
Navigate,
Tools,
CodeInspections,
SourceControl,
Settings,
About
About,
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System.Collections.Generic;

namespace Rubberduck.UI.Command.MenuItems.ParentMenus
{
public class ToolsParentMenu : ParentMenuItemBase
{
public ToolsParentMenu(IEnumerable<IMenuItem> items)
: base("ToolsMenu", items)
{
}

public override int DisplayOrder
{
get
{
return (int)RubberduckMenuItemDisplayOrder.Tools;
}
}


}

public enum ToolsMenuItemDisplayOrder
{
SourceControl,
ToDoExplorer,
RegexAssistant,
}
}
25 changes: 25 additions & 0 deletions RetailCoder.VBE/UI/Command/MenuItems/RegexAssistantCommand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using NLog;
using Rubberduck.UI.RegexAssistant;
using System.Runtime.InteropServices;

namespace Rubberduck.UI.Command
{
/// <summary>
/// A command that displays the RegexAssistantDialog
/// </summary>
[ComVisible(false)]
class RegexAssistantCommand : CommandBase
{
public RegexAssistantCommand() : base (LogManager.GetCurrentClassLogger())
{
}

protected override void ExecuteImpl(object parameter)
{
using (var window = new RegexAssistantDialog())
{
window.ShowDialog();
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using Rubberduck.UI.Command.MenuItems.ParentMenus;
using System.Windows.Input;

namespace Rubberduck.UI.Command.MenuItems
{
class RegexAssistantCommandMenuItem : CommandMenuItemBase
{
public RegexAssistantCommandMenuItem(CommandBase command) : base(command)
{
}

public override string Key { get { return "ToolsMenu_RegexAssistant"; } }

public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.RegexAssistant; } }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public ShowSourceControlPanelCommandMenuItem(CommandBase command)
{
}

public override string Key { get { return "RubberduckMenu_SourceControl"; } }
public override int DisplayOrder { get { return (int)RubberduckMenuItemDisplayOrder.SourceControl; } }
public override string Key { get { return "ToolsMenu_SourceControl"; } }
public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.SourceControl; } }
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Windows.Input;
using Rubberduck.UI.Command.MenuItems.ParentMenus;
using Rubberduck.UI.Command.MenuItems.ParentMenus;

namespace Rubberduck.UI.Command.MenuItems
{
Expand All @@ -10,7 +9,7 @@ public ToDoExplorerCommandMenuItem(CommandBase command)
{
}

public override string Key { get { return "RubberduckMenu_TodoItems"; } }
public override int DisplayOrder { get { return (int)NavigationMenuItemDisplayOrder.ToDoExplorer; } }
public override string Key { get { return "ToolsMenu_TodoItems"; } }
public override int DisplayOrder { get { return (int)ToolsMenuItemDisplayOrder.ToDoExplorer; } }
}
}
29 changes: 29 additions & 0 deletions RetailCoder.VBE/UI/Command/MenuItems/ToolsParentMenu.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System.Collections.Generic;

namespace Rubberduck.UI.Command.MenuItems.ParentMenus
{
public class ToolsParentMenu : ParentMenuItemBase
{
public ToolsParentMenu(IEnumerable<IMenuItem> items)
: base("ToolsMenu", items)
{
}

public override int DisplayOrder
{
get
{
return (int)RubberduckMenuItemDisplayOrder.Tools;
}
}


}

public enum ToolsMenuItemDisplayOrder
{
SourceControl,
ToDoExplorer,
RegexAssistant,
}
}
25 changes: 25 additions & 0 deletions RetailCoder.VBE/UI/Command/RegexAssistantCommand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using NLog;
using Rubberduck.UI.RegexAssistant;
using System.Runtime.InteropServices;

namespace Rubberduck.UI.Command
{
/// <summary>
/// A command that displays the RegexAssistantDialog
/// </summary>
[ComVisible(false)]
class RegexAssistantCommand : CommandBase
{
public RegexAssistantCommand() : base (LogManager.GetCurrentClassLogger())
{
}

protected override void ExecuteImpl(object parameter)
{
using (var window = new RegexAssistantDialog())
{
window.ShowDialog();
}
}
}
}
Loading