Skip to content

Commit f677d60

Browse files
retailcoderretailcoder
authored
Merge pull request #2329 from retailcoder/next
test project builds
2 parents 2a5c14d + 57d88ff commit f677d60

File tree

92 files changed

+2244
-2313
lines changed

Some content is hidden

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

92 files changed

+2244
-2313
lines changed

‎RetailCoder.VBE/UI/Command/CommandBase.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Reflection;
44
using System.Runtime.InteropServices;
5-
using System.Windows.Forms;
65
using System.Windows.Input;
76
using NLog;
87
using Rubberduck.Settings;
@@ -42,11 +41,6 @@ public bool CanExecute(object parameter)
4241
if (!ExceptionTargetSites.Contains(exception.TargetSite))
4342
{
4443
ExceptionTargetSites.Add(exception.TargetSite);
45-
46-
var messageBox = new MessageBox();
47-
messageBox.Show(
48-
RubberduckUI.RubberduckFatalError, RubberduckUI.Rubberduck,
49-
MessageBoxButtons.OK, MessageBoxIcon.Error);
5044
}
5145

5246
return false;
@@ -66,11 +60,6 @@ public void Execute(object parameter)
6660
if (!ExceptionTargetSites.Contains(exception.TargetSite))
6761
{
6862
ExceptionTargetSites.Add(exception.TargetSite);
69-
70-
var messageBox = new MessageBox();
71-
messageBox.Show(
72-
RubberduckUI.RubberduckFatalError, RubberduckUI.Rubberduck,
73-
MessageBoxButtons.OK, MessageBoxIcon.Error);
7463
}
7564
}
7665
}

‎RetailCoder.VBE/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ namespace Rubberduck.UI.Command.Refactorings
1212
public class CodePaneRefactorRenameCommand : RefactorCommandBase
1313
{
1414
private readonly RubberduckParserState _state;
15+
private readonly IMessageBox _messageBox;
1516

16-
public CodePaneRefactorRenameCommand(IVBE vbe, RubberduckParserState state)
17+
public CodePaneRefactorRenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
1718
: base (vbe)
1819
{
1920
_state = state;
21+
_messageBox = messageBox;
2022
}
2123

2224
public override RubberduckHotkey Hotkey
@@ -56,8 +58,8 @@ protected override void ExecuteImpl(object parameter)
5658

5759
using (var view = new RenameDialog())
5860
{
59-
var factory = new RenamePresenterFactory(Vbe, view, _state, new MessageBox());
60-
var refactoring = new RenameRefactoring(Vbe, factory, new MessageBox(), _state);
61+
var factory = new RenamePresenterFactory(Vbe, view, _state, _messageBox);
62+
var refactoring = new RenameRefactoring(Vbe, factory, _messageBox, _state);
6163

6264
refactoring.Refactor(target);
6365
}

‎RetailCoder.VBE/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ public class FormDesignerRefactorRenameCommand : RefactorCommandBase
1313
{
1414
private readonly IVBE _vbe;
1515
private readonly RubberduckParserState _state;
16+
private readonly IMessageBox _messageBox;
1617

17-
public FormDesignerRefactorRenameCommand(IVBE vbe, RubberduckParserState state)
18+
public FormDesignerRefactorRenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
1819
: base (vbe)
1920
{
2021
_vbe = vbe;
2122
_state = state;
23+
_messageBox = messageBox;
2224
}
2325

2426
protected override bool CanExecuteImpl(object parameter)
@@ -30,8 +32,8 @@ protected override void ExecuteImpl(object parameter)
3032
{
3133
using (var view = new RenameDialog())
3234
{
33-
var factory = new RenamePresenterFactory(Vbe, view, _state, new MessageBox());
34-
var refactoring = new RenameRefactoring(Vbe, factory, new MessageBox(), _state);
35+
var factory = new RenamePresenterFactory(Vbe, view, _state, _messageBox);
36+
var refactoring = new RenameRefactoring(Vbe, factory, _messageBox, _state);
3537

3638
var target = GetTarget();
3739

‎RetailCoder.VBE/UI/Command/Refactorings/RefactorIntroduceFieldCommand.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ namespace Rubberduck.UI.Command.Refactorings
99
public class RefactorIntroduceFieldCommand : RefactorCommandBase
1010
{
1111
private readonly RubberduckParserState _state;
12+
private readonly IMessageBox _messageBox;
1213

13-
public RefactorIntroduceFieldCommand (IVBE vbe, RubberduckParserState state)
14+
public RefactorIntroduceFieldCommand (IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
1415
:base(vbe)
1516
{
1617
_state = state;
18+
_messageBox = messageBox;
1719
}
1820

1921
protected override bool CanExecuteImpl(object parameter)
@@ -52,7 +54,7 @@ protected override void ExecuteImpl(object parameter)
5254
return;
5355
}
5456

55-
var refactoring = new IntroduceFieldRefactoring(Vbe, _state, new MessageBox());
57+
var refactoring = new IntroduceFieldRefactoring(Vbe, _state, _messageBox);
5658
refactoring.Refactor(selection.Value);
5759
}
5860
}

‎RetailCoder.VBE/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ namespace Rubberduck.UI.Command.Refactorings
99
public class RefactorIntroduceParameterCommand : RefactorCommandBase
1010
{
1111
private readonly RubberduckParserState _state;
12+
private readonly IMessageBox _messageBox;
1213

13-
public RefactorIntroduceParameterCommand (IVBE vbe, RubberduckParserState state)
14+
public RefactorIntroduceParameterCommand (IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
1415
:base(vbe)
1516
{
1617
_state = state;
18+
_messageBox = messageBox;
1719
}
1820

1921
protected override bool CanExecuteImpl(object parameter)
@@ -52,7 +54,7 @@ protected override void ExecuteImpl(object parameter)
5254
return;
5355
}
5456

55-
var refactoring = new IntroduceParameterRefactoring(Vbe, _state, new MessageBox());
57+
var refactoring = new IntroduceParameterRefactoring(Vbe, _state, _messageBox);
5658
refactoring.Refactor(selection.Value);
5759
}
5860
}

‎RetailCoder.VBE/UI/DockableToolwindowPresenter.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ private IWindow CreateToolWindow(IDockableUserControl control)
3838
IWindow toolWindow;
3939
try
4040
{
41-
toolWindow = _vbe.Windows.CreateToolWindow(_addin, _DockableWindowHost.RegisteredProgId,
42-
control.Caption, control.ClassId, ref _userControlObject);
41+
var info = _vbe.Windows.CreateToolWindow(_addin, _DockableWindowHost.RegisteredProgId, control.Caption, control.ClassId);
42+
_userControlObject = info.UserControl;
43+
toolWindow = info.ToolWindow;
4344
}
4445
catch (COMException exception)
4546
{

‎Rubberduck.Parsing/VBA/RubberduckParserState.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ public void AddParseTree(IVBComponent component, IParseTree parseTree)
776776
_moduleStates[key].SetModuleContentHashCode(key.ContentHashCode);
777777
}
778778

779-
public IParseTree GetParseTree(VBComponent component)
779+
public IParseTree GetParseTree(IVBComponent component)
780780
{
781781
return _moduleStates[new QualifiedModuleName(component)].ParseTree;
782782
}

‎Rubberduck.VBEEditor/SafeComWrappers/Abstract/IWindows.cs‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,25 @@
22

33
namespace Rubberduck.VBEditor.SafeComWrappers.Abstract
44
{
5+
public struct ToolWindowInfo
6+
{
7+
private readonly IWindow _window;
8+
private readonly object _control;
9+
10+
public ToolWindowInfo(IWindow window, object control) : this()
11+
{
12+
_window = window;
13+
_control = control;
14+
}
15+
16+
public IWindow ToolWindow { get { return _window; } }
17+
public object UserControl { get { return _control; } }
18+
}
19+
520
public interface IWindows : ISafeComWrapper, IComCollection<IWindow>, IEquatable<IWindows>
621
{
722
IVBE VBE { get; }
823
IApplication Parent { get; }
9-
IWindow CreateToolWindow(IAddIn addInInst, string progId, string caption, string guidPosition, ref object docObj);
24+
ToolWindowInfo CreateToolWindow(IAddIn addInInst, string progId, string caption, string guidPosition);
1025
}
1126
}

‎Rubberduck.VBEEditor/SafeComWrappers/VB6/Windows.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ public IWindow this[object index]
3737
get { return new Window(Target.Item(index)); }
3838
}
3939

40-
public IWindow CreateToolWindow(IAddIn addInInst, string progId, string caption, string guidPosition, ref object docObj)
40+
public ToolWindowInfo CreateToolWindow(IAddIn addInInst, string progId, string caption, string guidPosition)
4141
{
42-
return new Window(Target.CreateToolWindow((VB.AddIn)addInInst.Target, progId, caption, guidPosition, ref docObj));
42+
object control = null;
43+
var window = new Window(Target.CreateToolWindow((VB.AddIn)addInInst.Target, progId, caption, guidPosition, ref control));
44+
return new ToolWindowInfo(window, control);
4345
}
4446

4547
IEnumerator IEnumerable.GetEnumerator()

‎Rubberduck.VBEEditor/SafeComWrappers/VBA/Windows.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ public IWindow this[object index]
3232
get { return new Window(Target.Item(index)); }
3333
}
3434

35-
public IWindow CreateToolWindow(IAddIn addInInst, string progId, string caption, string guidPosition, ref object docObj)
35+
public ToolWindowInfo CreateToolWindow(IAddIn addInInst, string progId, string caption, string guidPosition)
3636
{
37-
return new Window(Target.CreateToolWindow((VB.AddIn)addInInst.Target, progId, caption, guidPosition, ref docObj));
37+
object control = null;
38+
var window = new Window(Target.CreateToolWindow((VB.AddIn)addInInst.Target, progId, caption, guidPosition, ref control));
39+
return new ToolWindowInfo(window, control);
3840
}
3941

4042
IEnumerator IEnumerable.GetEnumerator()

0 commit comments

Comments
 (0)