Skip to content

Commit 6230fa4

Browse files
Hosch250Hosch250
authored
Merge pull request #2143 from Hosch250/Issue2142
Various small tweaks. Close #2142
2 parents 1fd8061 + 81e4c24 commit 6230fa4

File tree

4 files changed

+17
-24
lines changed

4 files changed

+17
-24
lines changed

‎RetailCoder.VBE/Sinks.cs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Runtime.InteropServices.ComTypes;
4-
using System.Threading.Tasks;
54
using Microsoft.Vbe.Interop;
65
using Rubberduck.Common.Dispatch;
76
using Rubberduck.Parsing;
@@ -78,11 +77,11 @@ public class Sinks : ISinks, IDisposable
7877
private readonly IDictionary<string, Tuple<IConnectionPoint, int>> _componentsEventsConnectionPoints =
7978
new Dictionary<string, Tuple<IConnectionPoint, int>>();
8079

81-
public bool IsEnabled { get; set; }
80+
public bool ComponentSinksEnabled { get; set; }
8281

8382
public Sinks(VBE vbe)
8483
{
85-
IsEnabled = true;
84+
ComponentSinksEnabled = true;
8685

8786
_sink = new VBProjectsEventsSink();
8887
var connectionPointContainer = (IConnectionPointContainer)vbe.VBProjects;
@@ -105,7 +104,6 @@ public Sinks(VBE vbe)
105104

106105
private void _sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e)
107106
{
108-
if (!IsEnabled) { return; }
109107
var projectId = e.Item.HelpFile;
110108

111109
var handler = ProjectActivated;
@@ -117,8 +115,6 @@ private void _sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject
117115

118116
private void _sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
119117
{
120-
if (!IsEnabled) { return; }
121-
122118
e.Item.AssignProjectId();
123119
var projectId = e.Item.HelpFile;
124120

@@ -134,7 +130,6 @@ private void _sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
134130
private void _sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
135131
{
136132
UnregisterComponentsEventSink(e.Item.HelpFile);
137-
if (!IsEnabled) { return; }
138133

139134
var projectId = e.Item.HelpFile;
140135

@@ -147,8 +142,6 @@ private void _sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject>
147142

148143
private void _sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProject> e)
149144
{
150-
if (!IsEnabled) { return; }
151-
152145
var projectId = e.Item.HelpFile;
153146
var oldName = e.OldName;
154147

@@ -218,7 +211,7 @@ private void UnregisterComponentsEventSink(string projectId)
218211

219212
private void ComponentsSink_ComponentActivated(object sender, DispatcherEventArgs<VBComponent> e)
220213
{
221-
if (!IsEnabled) { return; }
214+
if (!ComponentSinksEnabled) { return; }
222215

223216
var projectId = e.Item.Collection.Parent.HelpFile;
224217

@@ -231,7 +224,7 @@ private void ComponentsSink_ComponentActivated(object sender, DispatcherEventArg
231224

232225
private void ComponentsSink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e)
233226
{
234-
if (!IsEnabled) { return; }
227+
if (!ComponentSinksEnabled) { return; }
235228

236229
var projectId = e.Item.Collection.Parent.HelpFile;
237230
var componentName = e.Item.Name;
@@ -245,7 +238,7 @@ private void ComponentsSink_ComponentAdded(object sender, DispatcherEventArgs<VB
245238

246239
private void ComponentsSink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent> e)
247240
{
248-
if (!IsEnabled) { return; }
241+
if (!ComponentSinksEnabled) { return; }
249242

250243
var projectId = e.Item.Collection.Parent.HelpFile;
251244
var componentName = e.Item.Name;
@@ -259,7 +252,7 @@ private void ComponentsSink_ComponentReloaded(object sender, DispatcherEventArgs
259252

260253
private void ComponentsSink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)
261254
{
262-
if (!IsEnabled) { return; }
255+
if (!ComponentSinksEnabled) { return; }
263256

264257
var projectId = e.Item.Collection.Parent.HelpFile;
265258
var componentName = e.Item.Name;
@@ -273,7 +266,7 @@ private void ComponentsSink_ComponentRemoved(object sender, DispatcherEventArgs<
273266

274267
private void ComponentsSink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
275268
{
276-
if (!IsEnabled) { return; }
269+
if (!ComponentSinksEnabled) { return; }
277270

278271
var projectId = e.Item.Collection.Parent.HelpFile;
279272
var componentName = e.Item.Name;
@@ -288,7 +281,7 @@ private void ComponentsSink_ComponentRenamed(object sender, DispatcherRenamedEve
288281

289282
private void ComponentsSink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
290283
{
291-
if (!IsEnabled) { return; }
284+
if (!ComponentSinksEnabled) { return; }
292285

293286
var projectId = e.Item.Collection.Parent.HelpFile;
294287
var componentName = e.Item.Name;

‎RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -707,14 +707,14 @@ private void OpenRepo()
707707
var project = _vbe.ActiveVBProject;
708708
var repo = new Repository(project.HelpFile, folderPicker.SelectedPath, string.Empty);
709709

710-
_sinks.IsEnabled = false;
710+
_sinks.ComponentSinksEnabled = false;
711711
try
712712
{
713713
Provider = _providerFactory.CreateProvider(project, repo, _wrapperFactory);
714714
}
715715
catch (SourceControlException ex)
716716
{
717-
_sinks.IsEnabled = true;
717+
_sinks.ComponentSinksEnabled = true;
718718
ViewModel_ErrorThrown(null, new ErrorEventArgs(ex.Message, ex.InnerException, NotificationType.Error));
719719
return;
720720
}
@@ -726,7 +726,7 @@ private void OpenRepo()
726726
throw;
727727
}
728728

729-
_sinks.IsEnabled = true;
729+
_sinks.ComponentSinksEnabled = true;
730730

731731
AddOrUpdateLocalPathConfig(repo);
732732

@@ -738,7 +738,7 @@ private void OpenRepo()
738738
private void CloneRepo(SecureCredentials credentials = null)
739739
{
740740
_isCloning = true;
741-
_sinks.IsEnabled = false;
741+
_sinks.ComponentSinksEnabled = false;
742742

743743
Logger.Trace("Cloning repo");
744744
try
@@ -774,7 +774,7 @@ private void CloneRepo(SecureCredentials credentials = null)
774774
}
775775

776776
_isCloning = false;
777-
_sinks.IsEnabled = true;
777+
_sinks.ComponentSinksEnabled = true;
778778
CloseCloneRepoGrid();
779779

780780
Status = RubberduckUI.Online;
@@ -862,7 +862,7 @@ private void OpenRepoAssignedToProject()
862862
Logger.Trace("Opening repo assigned to project");
863863
try
864864
{
865-
_sinks.IsEnabled = false;
865+
_sinks.ComponentSinksEnabled = false;
866866
Provider = _providerFactory.CreateProvider(_vbe.ActiveVBProject,
867867
_config.Repositories.First(repo => repo.Id == _vbe.ActiveVBProject.HelpFile), _wrapperFactory);
868868
Status = RubberduckUI.Online;
@@ -883,7 +883,7 @@ private void OpenRepoAssignedToProject()
883883
throw;
884884
}
885885

886-
_sinks.IsEnabled = true;
886+
_sinks.ComponentSinksEnabled = true;
887887
}
888888

889889
private void Refresh()

‎Rubberduck.Parsing/ISinks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public interface IComponentRenamedEventArgs : IComponentEventArgs
2929

3030
public interface ISinks
3131
{
32-
bool IsEnabled { get; set; }
32+
bool ComponentSinksEnabled { get; set; }
3333

3434
event EventHandler<IProjectEventArgs> ProjectActivated;
3535
event EventHandler<IProjectEventArgs> ProjectAdded;

‎Rubberduck.SourceControl/GitProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public override IRepository InitVBAProject(string directory)
194194
//The default behavior of LibGit2Sharp.Repo.Commit is to throw an exception if no signature is found,
195195
// but BuildSignature() does not throw if a signature is not found, it returns "unknown" instead.
196196
// so we pass a signature that won't throw along to the commit.
197-
repo.Commit("Intial Commit", GetSignature(repo));
197+
repo.Commit("Initial Commit", GetSignature(repo));
198198
}
199199
catch(LibGit2SharpException ex)
200200
{

0 commit comments

Comments
 (0)