Skip to content

Commit b38db63

Browse files
MDoernerMDoerner
committed
Merge remote-tracking branch 'upstream/next' into FixesAndRefactorings
Merge of recent changed before pull request
2 parents 2e1bcc6 + 5cf9cfa commit b38db63

Some content is hidden

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

45 files changed

+475
-247
lines changed

‎RetailCoder.VBE/AppMenu.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@ public void Localize()
4242

4343
public void Dispose()
4444
{
45-
foreach (var menu in _menus.Where(menu => menu.Item != null))
46-
{
47-
menu.RemoveChildren();
48-
menu.Item.Delete();
49-
}
45+
// note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
46+
//foreach (var menu in _menus.Where(menu => menu.Item != null))
47+
//{
48+
// menu.RemoveChildren();
49+
// menu.Item.Delete();
50+
//}
5051
}
5152
}
5253
}

‎RetailCoder.VBE/Common/ExportFormatter.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,12 @@ public ColumnInfo(string Title, hAlignment HorizontalAlignment = hAlignment.Left
4343

4444
public static class ExportFormatter
4545
{
46-
public static string Csv(object[][] data, string Title, ColumnInfo[] ColumnInfos)
46+
public static string Csv(object[][] data, string title, ColumnInfo[] columnInfos)
4747
{
48-
string s = "";
49-
50-
string[] headerRow = new string[ColumnInfos.Length];
51-
for (var c = 0; c < ColumnInfos.Length; c++)
48+
var headerRow = new string[columnInfos.Length];
49+
for (var c = 0; c < columnInfos.Length; c++)
5250
{
53-
headerRow[c] = CsvEncode(ColumnInfos[c].Title);
51+
headerRow[c] = CsvEncode(columnInfos[c].Title);
5452
}
5553

5654
string[] rows = new string[data.Length];
@@ -63,7 +61,7 @@ public static string Csv(object[][] data, string Title, ColumnInfo[] ColumnInfos
6361
}
6462
rows[r] = string.Join(",", row);
6563
}
66-
return CsvEncode(Title.Replace("\r\n"," ")) + Environment.NewLine + string.Join(",", headerRow) + Environment.NewLine + string.Join(Environment.NewLine, rows);
64+
return CsvEncode(title.Replace("\r\n"," ")) + Environment.NewLine + string.Join(",", headerRow) + Environment.NewLine + string.Join(Environment.NewLine, rows);
6765
}
6866

6967
private static string CsvEncode(object value)

‎RetailCoder.VBE/Extension.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,15 @@ private void Startup()
212212

213213
_app = _kernel.Get<App>();
214214
_app.Startup();
215+
215216
_isInitialized = true;
216217
}
217218

218219
private void ShutdownAddIn()
219220
{
221+
var currentDomain = AppDomain.CurrentDomain;
222+
currentDomain.AssemblyResolve -= LoadFromSameFolder;
223+
220224
User32.EnumChildWindows(_ide.MainWindow.Handle(), EnumCallback, new IntPtr(0));
221225

222226
if (_app != null)

‎RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplace.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ namespace Rubberduck.Navigation.RegexSearchReplace
1313
{
1414
public class RegexSearchReplace : IRegexSearchReplace
1515
{
16-
private readonly RegexSearchReplaceModel _model;
1716
private readonly IVBE _vbe;
1817
private readonly IRubberduckParser _parser;
1918

‎RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplacePresenter.cs‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,65 +6,65 @@
66

77
namespace Rubberduck.Navigation.RegexSearchReplace
88
{
9-
public class RegexSearchReplacePresenter : IPresenter
9+
public class RegexSearchReplacePresenter //: IPresenter
1010
{
11-
private readonly IVBE _vbe;
12-
private readonly IRegexSearchReplaceDialog _view;
13-
private readonly IRubberduckParser _parser;
11+
//private readonly IVBE _vbe;
12+
//private readonly IRegexSearchReplaceDialog _view;
13+
//private readonly IRubberduckParser _parser;
1414

15-
public RegexSearchReplacePresenter(IVBE vbe, IRubberduckParser parser/*, IRegexSearchReplaceDialog view*/)
16-
{
17-
_vbe = vbe;
18-
//_view = view;
19-
_parser = parser;
15+
//public RegexSearchReplacePresenter(IVBE vbe, IRubberduckParser parser/*, IRegexSearchReplaceDialog view*/)
16+
//{
17+
// _vbe = vbe;
18+
// _view = view;
19+
// _parser = parser;
2020

21-
//_view.FindButtonClicked += _view_FindButtonClicked;
22-
//_view.ReplaceButtonClicked += _view_ReplaceButtonClicked;
23-
//_view.ReplaceAllButtonClicked += _view_ReplaceAllButtonClicked;
24-
//_view.CancelButtonClicked += _view_CancelButtonClicked;
25-
}
21+
// _view.FindButtonClicked += _view_FindButtonClicked;
22+
// _view.ReplaceButtonClicked += _view_ReplaceButtonClicked;
23+
// _view.ReplaceAllButtonClicked += _view_ReplaceAllButtonClicked;
24+
// _view.CancelButtonClicked += _view_CancelButtonClicked;
25+
//}
2626

27-
public void Show()
28-
{
29-
//_view.ShowDialog();
30-
}
27+
//public void Show()
28+
//{
29+
// _view.ShowDialog();
30+
//}
3131

32-
public void Hide()
33-
{
34-
//_view.Close();
35-
}
32+
//public void Hide()
33+
//{
34+
// _view.Close();
35+
//}
3636

37-
public event EventHandler<IEnumerable<RegexSearchResult>> FindButtonResults;
38-
protected virtual void OnFindButtonResults(IEnumerable<RegexSearchResult> results)
39-
{
40-
var handler = FindButtonResults;
41-
if (handler != null)
42-
{
43-
handler(this, results);
44-
}
45-
}
37+
//public event EventHandler<IEnumerable<RegexSearchResult>> FindButtonResults;
38+
//protected virtual void OnFindButtonResults(IEnumerable<RegexSearchResult> results)
39+
//{
40+
// var handler = FindButtonResults;
41+
// if (handler != null)
42+
// {
43+
// handler(this, results);
44+
// }
45+
//}
4646

47-
private void _view_FindButtonClicked(object sender, EventArgs e)
48-
{
49-
var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
50-
OnFindButtonResults(regexSearchReplace.Search(_view.SearchPattern, _view.Scope));
51-
}
47+
//private void _view_FindButtonClicked(object sender, EventArgs e)
48+
//{
49+
// var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
50+
// OnFindButtonResults(regexSearchReplace.Search(_view.SearchPattern, _view.Scope));
51+
//}
5252

53-
private void _view_ReplaceButtonClicked(object sender, EventArgs e)
54-
{
55-
var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
56-
regexSearchReplace.Replace(_view.SearchPattern, _view.ReplacePattern, _view.Scope);
57-
}
53+
//private void _view_ReplaceButtonClicked(object sender, EventArgs e)
54+
//{
55+
// var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
56+
// regexSearchReplace.Replace(_view.SearchPattern, _view.ReplacePattern, _view.Scope);
57+
//}
5858

59-
private void _view_ReplaceAllButtonClicked(object sender, EventArgs e)
60-
{
61-
var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
62-
regexSearchReplace.ReplaceAll(_view.SearchPattern, _view.ReplacePattern, _view.Scope);
63-
}
59+
//private void _view_ReplaceAllButtonClicked(object sender, EventArgs e)
60+
//{
61+
// var regexSearchReplace = new RegexSearchReplace(_vbe, _parser);
62+
// regexSearchReplace.ReplaceAll(_view.SearchPattern, _view.ReplacePattern, _view.Scope);
63+
//}
6464

65-
private void _view_CancelButtonClicked(object sender, EventArgs e)
66-
{
67-
//_view.Close();
68-
}
65+
//private void _view_CancelButtonClicked(object sender, EventArgs e)
66+
//{
67+
// //_view.Close();
68+
//}
6969
}
7070
}

‎RetailCoder.VBE/Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ private string GetPropertyText()
231231
(_model.ImplementSetSetterType ? setterText : string.Empty)).TrimEnd() + Environment.NewLine;
232232

233233
var propertyTextLines = propertyText.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
234-
return string.Join(Environment.NewLine, _indenter.Indent(propertyTextLines, "test", false));
234+
return string.Join(Environment.NewLine, _indenter.Indent(propertyTextLines, "test"));
235235
}
236236
}
237237
}

‎RetailCoder.VBE/Refactorings/ExtractMethod/ExtractMethodPresenter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private void GeneratePreview(IExtractMethodModel extractMethodModel,IExtractMeth
8585
*/
8686
var extractedMethod = extractMethodProc.createProc(extractMethodModel);
8787
var code = extractedMethod.Split(new[]{Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries);
88-
code = _indenter.Indent(code, "Preview", false).ToArray();
88+
code = _indenter.Indent(code, "Preview").ToArray();
8989
_view.Preview = string.Join(Environment.NewLine, code);
9090
}
9191
}

‎RetailCoder.VBE/Rubberduck.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@
247247
<SpecificVersion>False</SpecificVersion>
248248
<EmbedInteropTypes>False</EmbedInteropTypes>
249249
<HintPath>..\libs\Microsoft.Vbe.Interop.Forms.dll</HintPath>
250+
<Private>True</Private>
250251
</Reference>
251252
<Reference Include="Ninject.Extensions.Conventions">
252253
<HintPath>..\packages\ninject.extensions.conventions.3.2.0.0\lib\net45-full\Ninject.Extensions.Conventions.dll</HintPath>

‎RetailCoder.VBE/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ private ICommandBarControl InitializeChildControl(ICommandMenuItem item)
8585
if (item.Command != null)
8686
{
8787
child.Click += child_Click;
88-
((CommandBarButton)child).HandleEvents();
8988
}
9089
return child;
9190
}
@@ -111,11 +110,12 @@ public void EvaluateCanExecute(RubberduckParserState state)
111110
public ICommandBar Item { get; private set; }
112111
public void RemoveChildren()
113112
{
113+
// note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
114114
foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
115115
{
116116
child.Click -= child_Click;
117-
child.Delete();
118-
//child.Release();
117+
// child.Delete();
118+
// child.Release();
119119
}
120120
}
121121

‎RetailCoder.VBE/UI/Command/MenuItems/CommandBars/RubberduckCommandBar.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,10 @@ public void SetContextSelectionCaption(string caption)
5353

5454
public void Dispose()
5555
{
56+
//note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
5657
RemoveChildren();
57-
Item.Delete();
58-
Item.Release(true);
58+
//Item.Delete();
59+
//Item.Release(true);
5960
}
6061
}
6162

0 commit comments

Comments
 (0)