Skip to content

Commit 869f783

Browse files
bclothierbclothier
committed
Address PR comments
1 parent 71034ff commit 869f783

File tree

8 files changed

+156
-9
lines changed

8 files changed

+156
-9
lines changed

‎Rubberduck.Core/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ public void RemoveCommandBar()
200200
Logger.Debug("Removing commandbar.");
201201
RemoveChildren();
202202
Item.Delete();
203+
204+
// Setting them to null will automatically dispose those
203205
Item = null;
204206
Parent = null;
205207
}

‎Rubberduck.Core/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ public void RemoveMenu()
110110
Logger.Debug($"Removing menu {_key}.");
111111
RemoveChildren();
112112
Item?.Delete();
113+
114+
//This will also dispose the Item as well
113115
Item = null;
114116
}
115117

‎Rubberduck.Resources/Rubberduck.Resources.csproj

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,170 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33+
<Compile Update="About\AboutUI.Designer.cs">
34+
<DesignTime>True</DesignTime>
35+
<AutoGen>True</AutoGen>
36+
<DependentUpon>AboutUI.resx</DependentUpon>
37+
</Compile>
38+
<Compile Update="CodeExplorer\CodeExplorerUI.Designer.cs">
39+
<DesignTime>True</DesignTime>
40+
<AutoGen>True</AutoGen>
41+
<DependentUpon>CodeExplorerUI.resx</DependentUpon>
42+
</Compile>
43+
<Compile Update="CommandBarIcons.Designer.cs">
44+
<DesignTime>True</DesignTime>
45+
<AutoGen>True</AutoGen>
46+
<DependentUpon>CommandBarIcons.resx</DependentUpon>
47+
</Compile>
48+
<Compile Update="Inspections\InspectionInfo.Designer.cs">
49+
<DesignTime>True</DesignTime>
50+
<AutoGen>True</AutoGen>
51+
<DependentUpon>InspectionInfo.resx</DependentUpon>
52+
</Compile>
53+
<Compile Update="Inspections\InspectionNames.Designer.cs">
54+
<DesignTime>True</DesignTime>
55+
<AutoGen>True</AutoGen>
56+
<DependentUpon>InspectionNames.resx</DependentUpon>
57+
</Compile>
58+
<Compile Update="Inspections\InspectionResults.Designer.cs">
59+
<DesignTime>True</DesignTime>
60+
<AutoGen>True</AutoGen>
61+
<DependentUpon>InspectionResults.resx</DependentUpon>
62+
</Compile>
63+
<Compile Update="Inspections\InspectionsUI.Designer.cs">
64+
<DesignTime>True</DesignTime>
65+
<AutoGen>True</AutoGen>
66+
<DependentUpon>InspectionsUI.resx</DependentUpon>
67+
</Compile>
68+
<Compile Update="Inspections\QuickFixes.Designer.cs">
69+
<DesignTime>True</DesignTime>
70+
<AutoGen>True</AutoGen>
71+
<DependentUpon>QuickFixes.resx</DependentUpon>
72+
</Compile>
73+
<Compile Update="Menus\RubberduckMenus.Designer.cs">
74+
<DesignTime>True</DesignTime>
75+
<AutoGen>True</AutoGen>
76+
<DependentUpon>RubberduckMenus.resx</DependentUpon>
77+
</Compile>
78+
<Compile Update="RegexAssistant\RegexAssistantUI.Designer.cs">
79+
<DesignTime>True</DesignTime>
80+
<AutoGen>True</AutoGen>
81+
<DependentUpon>RegexAssistantUI.resx</DependentUpon>
82+
</Compile>
3383
<Compile Update="RubberduckUI.Designer.cs">
3484
<DesignTime>True</DesignTime>
3585
<AutoGen>True</AutoGen>
3686
<DependentUpon>RubberduckUI.resx</DependentUpon>
3787
</Compile>
88+
<Compile Update="Settings\AutoCompletesPage.Designer.cs">
89+
<DesignTime>True</DesignTime>
90+
<AutoGen>True</AutoGen>
91+
<DependentUpon>AutoCompletesPage.resx</DependentUpon>
92+
</Compile>
3893
<Compile Update="Settings\SettingsUI.Designer.cs">
3994
<DesignTime>True</DesignTime>
4095
<AutoGen>True</AutoGen>
4196
<DependentUpon>SettingsUI.resx</DependentUpon>
4297
</Compile>
98+
<Compile Update="Settings\ToDoExplorerPage.Designer.cs">
99+
<DesignTime>True</DesignTime>
100+
<AutoGen>True</AutoGen>
101+
<DependentUpon>ToDoExplorerPage.resx</DependentUpon>
102+
</Compile>
103+
<Compile Update="Settings\UnitTestingPage.Designer.cs">
104+
<DesignTime>True</DesignTime>
105+
<AutoGen>True</AutoGen>
106+
<DependentUpon>UnitTestingPage.resx</DependentUpon>
107+
</Compile>
108+
<Compile Update="ToDoExplorer\ToDoExplorerUI.Designer.cs">
109+
<DesignTime>True</DesignTime>
110+
<AutoGen>True</AutoGen>
111+
<DependentUpon>ToDoExplorerUI.resx</DependentUpon>
112+
</Compile>
113+
<Compile Update="UnitTesting\AssertMessages.Designer.cs">
114+
<DesignTime>True</DesignTime>
115+
<AutoGen>True</AutoGen>
116+
<DependentUpon>AssertMessages.resx</DependentUpon>
117+
</Compile>
118+
<Compile Update="UnitTesting\TestExplorer.Designer.cs">
119+
<DesignTime>True</DesignTime>
120+
<AutoGen>True</AutoGen>
121+
<DependentUpon>TestExplorer.resx</DependentUpon>
122+
</Compile>
43123
</ItemGroup>
44124

45125
<ItemGroup>
126+
<EmbeddedResource Update="About\AboutUI.resx">
127+
<Generator>PublicResXFileCodeGenerator</Generator>
128+
<LastGenOutput>AboutUI.Designer.cs</LastGenOutput>
129+
</EmbeddedResource>
130+
<EmbeddedResource Update="CodeExplorer\CodeExplorerUI.resx">
131+
<Generator>PublicResXFileCodeGenerator</Generator>
132+
<LastGenOutput>CodeExplorerUI.Designer.cs</LastGenOutput>
133+
</EmbeddedResource>
134+
<EmbeddedResource Update="CommandBarIcons.resx">
135+
<Generator>PublicResXFileCodeGenerator</Generator>
136+
<LastGenOutput>CommandBarIcons.Designer.cs</LastGenOutput>
137+
</EmbeddedResource>
138+
<EmbeddedResource Update="Inspections\InspectionInfo.resx">
139+
<Generator>PublicResXFileCodeGenerator</Generator>
140+
<LastGenOutput>InspectionInfo.Designer.cs</LastGenOutput>
141+
</EmbeddedResource>
142+
<EmbeddedResource Update="Inspections\InspectionNames.resx">
143+
<Generator>PublicResXFileCodeGenerator</Generator>
144+
<LastGenOutput>InspectionNames.Designer.cs</LastGenOutput>
145+
</EmbeddedResource>
146+
<EmbeddedResource Update="Inspections\InspectionResults.resx">
147+
<Generator>PublicResXFileCodeGenerator</Generator>
148+
<LastGenOutput>InspectionResults.Designer.cs</LastGenOutput>
149+
</EmbeddedResource>
150+
<EmbeddedResource Update="Inspections\InspectionsUI.resx">
151+
<Generator>PublicResXFileCodeGenerator</Generator>
152+
<LastGenOutput>InspectionsUI.Designer.cs</LastGenOutput>
153+
</EmbeddedResource>
154+
<EmbeddedResource Update="Inspections\QuickFixes.resx">
155+
<Generator>PublicResXFileCodeGenerator</Generator>
156+
<LastGenOutput>QuickFixes.Designer.cs</LastGenOutput>
157+
</EmbeddedResource>
158+
<EmbeddedResource Update="Menus\RubberduckMenus.resx">
159+
<Generator>PublicResXFileCodeGenerator</Generator>
160+
<LastGenOutput>RubberduckMenus.Designer.cs</LastGenOutput>
161+
</EmbeddedResource>
162+
<EmbeddedResource Update="RegexAssistant\RegexAssistantUI.resx">
163+
<Generator>PublicResXFileCodeGenerator</Generator>
164+
<LastGenOutput>RegexAssistantUI.Designer.cs</LastGenOutput>
165+
</EmbeddedResource>
46166
<EmbeddedResource Update="RubberduckUI.resx">
47167
<Generator>PublicResXFileCodeGenerator</Generator>
48168
<LastGenOutput>RubberduckUI.Designer.cs</LastGenOutput>
49169
</EmbeddedResource>
170+
<EmbeddedResource Update="Settings\AutoCompletesPage.resx">
171+
<Generator>PublicResXFileCodeGenerator</Generator>
172+
<LastGenOutput>AutoCompletesPage.Designer.cs</LastGenOutput>
173+
</EmbeddedResource>
50174
<EmbeddedResource Update="Settings\SettingsUI.resx">
51175
<Generator>PublicResXFileCodeGenerator</Generator>
52176
<LastGenOutput>SettingsUI.Designer.cs</LastGenOutput>
53177
</EmbeddedResource>
178+
<EmbeddedResource Update="Settings\ToDoExplorerPage.resx">
179+
<Generator>PublicResXFileCodeGenerator</Generator>
180+
<LastGenOutput>ToDoExplorerPage.Designer.cs</LastGenOutput>
181+
</EmbeddedResource>
182+
<EmbeddedResource Update="Settings\UnitTestingPage.resx">
183+
<Generator>PublicResXFileCodeGenerator</Generator>
184+
<LastGenOutput>UnitTestingPage.Designer.cs</LastGenOutput>
185+
</EmbeddedResource>
186+
<EmbeddedResource Update="ToDoExplorer\ToDoExplorerUI.resx">
187+
<Generator>PublicResXFileCodeGenerator</Generator>
188+
<LastGenOutput>ToDoExplorerUI.Designer.cs</LastGenOutput>
189+
</EmbeddedResource>
190+
<EmbeddedResource Update="UnitTesting\AssertMessages.resx">
191+
<Generator>PublicResXFileCodeGenerator</Generator>
192+
<LastGenOutput>AssertMessages.Designer.cs</LastGenOutput>
193+
</EmbeddedResource>
194+
<EmbeddedResource Update="UnitTesting\TestExplorer.resx">
195+
<Generator>PublicResXFileCodeGenerator</Generator>
196+
<LastGenOutput>TestExplorer.Designer.cs</LastGenOutput>
197+
</EmbeddedResource>
54198
</ItemGroup>
55199
</Project>

‎Rubberduck.VBEEditor/Events/VbeEvents.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ private void RegisterComponents(string projectId, string projectName)
7373
if (item.ProjectId == projectId && item.Name == projectName)
7474
{
7575
project = item;
76-
item.Dispose();
7776
break;
7877
}
7978

‎Rubberduck.VBEditor.VB6/SafeComWrappers/VB/CodePane.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private void ForceFocus()
115115
}
116116
else
117117
{
118-
System.Diagnostics.Debug.WriteLine(
118+
_logger.Debug(
119119
"CodePane.ForceFocus() failed to get a handle on the MainWindow.");
120120
}
121121
}

‎Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBProjects.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ void VB._dispVBProjectsEvents.ItemRenamed([MarshalAs(UnmanagedType.Interface), I
101101

102102
var projectId = project.ProjectId;
103103

104-
var handler = ProjectRenamed;
105-
if (handler == null || projectId == null)
104+
if (projectId == null)
106105
{
107106
return;
108107
}
109108

110-
handler.Invoke(this, new ProjectRenamedEventArgs(projectId, project.Name, OldName));
109+
var handler = ProjectRenamed;
110+
handler?.Invoke(this, new ProjectRenamedEventArgs(projectId, project.Name, OldName));
111111
}
112112
}
113113

‎Rubberduck.VBEditor.VBA/SafeComWrappers/VB/CodePane.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private void ForceFocus()
115115
}
116116
else
117117
{
118-
System.Diagnostics.Debug.WriteLine(
118+
_logger.Debug(
119119
"CodePane.ForceFocus() failed to get a handle on the MainWindow.");
120120
}
121121
}

‎Rubberduck.VBEditor.VBA/SafeComWrappers/VB/VBProjects.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ void VB._dispVBProjectsEvents.ItemRenamed([MarshalAs(UnmanagedType.Interface), I
105105

106106
var projectId = project.ProjectId;
107107

108-
var handler = ProjectRenamed;
109-
if (handler == null || projectId == null)
108+
if (projectId == null)
110109
{
111110
return;
112111
}
113112

114-
handler.Invoke(this, new ProjectRenamedEventArgs(projectId, project.Name, OldName));
113+
var handler = ProjectRenamed;
114+
handler?.Invoke(this, new ProjectRenamedEventArgs(projectId, project.Name, OldName));
115115
}
116116
}
117117

0 commit comments

Comments
 (0)