Skip to content

Commit

Permalink
Merge branch 'next' into SourceControlBugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hosch250
Hosch250 committed Jun 29, 2016
2 parents 22443ad + 95dd6df commit 3e1b4b3
Show file tree
Hide file tree
Showing 35 changed files with 297 additions and 201 deletions.
46 changes: 20 additions & 26 deletions RetailCoder.VBE/App.cs
View file
Expand Up @@ -38,7 +38,7 @@ public sealed class App : IDisposable
private readonly BranchesViewViewModel _branchesVM;
private readonly SourceControlViewViewModel _sourceControlPanelVM;

private readonly Logger _logger;
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

private VBProjectsEventsSink _sink;
private Configuration _config;
Expand Down Expand Up @@ -67,7 +67,6 @@ public sealed class App : IDisposable
_appMenus = appMenus;
_stateBar = stateBar;
_hooks = hooks;
_logger = LogManager.GetCurrentClassLogger();

var sourceControlPanel = (SourceControlPanel) sourceControlPresenter.Window();
_sourceControlPanelVM = (SourceControlViewViewModel) sourceControlPanel.ViewModel;
Expand Down Expand Up @@ -221,7 +220,7 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)

if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
{
_logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
Logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
return;
}

Expand All @@ -235,7 +234,7 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
_parser.State.RemoveProject(e.Item);
_parser.State.OnParseRequested(this);

_logger.Debug("Project '{0}' was removed.", e.Item.Name);
Logger.Debug("Project '{0}' was removed.", e.Item.Name);
Tuple<IConnectionPoint, int> componentsTuple;
if (_componentsEventsConnectionPoints.TryGetValue(projectId, out componentsTuple))
{
Expand All @@ -261,10 +260,10 @@ async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
{
if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }

_logger.Debug("Project '{0}' was added.", e.Item.Name);
Logger.Debug("Project '{0}' was added.", e.Item.Name);
if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
{
_logger.Debug("Project is protected and will not be added to parser state.");
Logger.Debug("Project is protected and will not be added to parser state.");
return;
}

Expand All @@ -288,7 +287,7 @@ private void RegisterComponentsEventSink(VBComponents components, string project
if (_componentsEventsSinks.ContainsKey(projectId))
{
// already registered - this is caused by the initial load+rename of a project in the VBE
_logger.Debug("Components sink already registered.");
Logger.Debug("Components sink already registered.");
return;
}

Expand All @@ -311,7 +310,7 @@ private void RegisterComponentsEventSink(VBComponents components, string project
connectionPoint.Advise(componentsSink, out cookie);

_componentsEventsConnectionPoints.Add(projectId, Tuple.Create(connectionPoint, cookie));
_logger.Debug("Components sink registered and advising.");
Logger.Debug("Components sink registered and advising.");
}

async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
Expand All @@ -322,9 +321,8 @@ async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent
{
return;
}

_logger.Debug("Component '{0}' was selected.", e.Item.Name);
// do something?

// todo: keep Code Explorer in sync with Project Explorer
}

async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
Expand All @@ -340,7 +338,7 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom

_sourceControlPanelVM.HandleRenamedComponent(e.Item, e.OldName);

_logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
Logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);

var projectId = e.Item.Collection.Parent.HelpFile;
var componentDeclaration = _parser.State.AllDeclarations.FirstOrDefault(f =>
Expand All @@ -359,7 +357,7 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom
_referencesEventsSinks.Remove(projectId);
_parser.State.RemoveProject(projectId);

_logger.Debug("Project '{0}' was removed.", e.Item.Name);
Logger.Debug("Project '{0}' was removed.", e.Item.Name);
Tuple<IConnectionPoint, int> componentsTuple;
if (_componentsEventsConnectionPoints.TryGetValue(projectId, out componentsTuple))
{
Expand Down Expand Up @@ -397,7 +395,7 @@ async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent>

_sourceControlPanelVM.HandleRemovedComponent(e.Item);

_logger.Debug("Component '{0}' was removed.", e.Item.Name);
Logger.Debug("Component '{0}' was removed.", e.Item.Name);
_parser.State.ClearStateCache(e.Item, true);
}

Expand All @@ -411,8 +409,7 @@ async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent
}

_parser.Cancel(e.Item);

_logger.Debug("Component '{0}' was reloaded.", e.Item.Name);

_parser.State.OnParseRequested(sender, e.Item);
}

Expand All @@ -427,7 +424,7 @@ async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e

_sourceControlPanelVM.HandleAddedComponent(e.Item);

_logger.Debug("Component '{0}' was added.", e.Item.Name);
Logger.Debug("Component '{0}' was added.", e.Item.Name);
_parser.State.OnParseRequested(sender, e.Item);
}

Expand All @@ -439,8 +436,7 @@ async void sink_ComponentActivated(object sender, DispatcherEventArgs<VBComponen
{
return;
}

_logger.Debug("Component '{0}' was activated.", e.Item.Name);

// do something?
}

Expand All @@ -455,7 +451,7 @@ async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProje

_parser.Cancel();

_logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
Logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);

_parser.State.RemoveProject(e.Item.HelpFile);
_parser.State.AddProject(e.Item);
Expand All @@ -471,9 +467,8 @@ async void sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e
{
return;
}

_logger.Debug("Project '{0}' was activated.", e.Item.Name);
// do something?

// todo: keep Code Explorer in sync with Project Explorer
}
#endregion

Expand All @@ -485,13 +480,12 @@ private void _stateBar_Refresh(object sender, EventArgs e)

private void Parser_StateChanged(object sender, EventArgs e)
{
_logger.Debug("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
Logger.Debug("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
_appMenus.EvaluateCanExecute(_parser.State);
}

private void LoadConfig()
{
_logger.Debug("Loading configuration");
_config = _configService.LoadConfiguration();

_autoSave.ConfigServiceSettingsChanged(this, EventArgs.Empty);
Expand All @@ -504,7 +498,7 @@ private void LoadConfig()
}
catch (CultureNotFoundException exception)
{
_logger.Error(exception, "Error Setting Culture for Rubberduck");
Logger.Error(exception, "Error Setting Culture for Rubberduck");
_messageBox.Show(exception.Message, "Rubberduck", MessageBoxButtons.OK, MessageBoxIcon.Error);
_config.UserSettings.GeneralSettings.Language.Code = currentCulture.Name;
_configService.SaveConfiguration(_config);
Expand Down
8 changes: 3 additions & 5 deletions RetailCoder.VBE/Common/Hotkeys/Hotkey.cs
View file
Expand Up @@ -4,6 +4,7 @@
using System.Windows.Input;
using Rubberduck.Common.WinAPI;
using NLog;
using Rubberduck.UI;
using Rubberduck.UI.Command;

namespace Rubberduck.Common.Hotkeys
Expand All @@ -13,7 +14,7 @@ public class Hotkey : IHotkey
private readonly string _key;
private readonly CommandBase _command;
private readonly IntPtr _hWndVbe;
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

public Hotkey(IntPtr hWndVbe, string key, CommandBase command, Keys secondKey = Keys.None)
{
Expand Down Expand Up @@ -86,14 +87,11 @@ private void HookKey(Keys key, uint shift)
var success = User32.RegisterHotKey(_hWndVbe, hookId, shift, (uint)key);
if (!success)
{
_logger.Debug(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
//throw new Win32Exception(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
Logger.Debug(RubberduckUI.CommonHotkey_KeyNotRegistered, key);
}

HotkeyInfo = new HotkeyInfo(hookId, Combo);
IsAttached = true;

_logger.Debug("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType()); //no translation needed for Debug.Writeline
}

private void SetCommandShortcutText()
Expand Down
14 changes: 6 additions & 8 deletions RetailCoder.VBE/Common/RubberduckHooks.cs
View file
Expand Up @@ -29,7 +29,7 @@ public class RubberduckHooks : IRubberduckHooks
private readonly IGeneralConfigService _config;
private readonly IEnumerable<CommandBase> _commands;
private readonly IList<IAttachable> _hooks = new List<IAttachable>();
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

public RubberduckHooks(VBE vbe, IGeneralConfigService config, IEnumerable<CommandBase> commands)
{
Expand Down Expand Up @@ -145,7 +145,7 @@ public void Attach()
}
catch (Win32Exception exception)
{
_logger.Error(exception);
Logger.Error(exception);
}
}

Expand All @@ -166,7 +166,7 @@ public void Detach()
}
catch (Win32Exception exception)
{
_logger.Error(exception);
Logger.Error(exception);
}
IsAttached = false;
}
Expand All @@ -182,12 +182,10 @@ private void hook_MessageReceived(object sender, HookEventArgs e)
var hotkey = sender as IHotkey;
if (hotkey != null)
{
_logger.Debug("Hotkey message received");
hotkey.Command.Execute(null);
return;
}

_logger.Debug("Unknown message received");

OnMessageReceived(sender, e);
}

Expand Down Expand Up @@ -226,7 +224,7 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
}
catch (Exception exception)
{
_logger.Error(exception);
Logger.Error(exception);
}

return IntPtr.Zero;
Expand All @@ -249,7 +247,7 @@ private bool HandleHotkeyMessage(IntPtr wParam)
}
catch (Exception exception)
{
_logger.Error(exception);
Logger.Error(exception);
}
return processed;
}
Expand Down
4 changes: 2 additions & 2 deletions RetailCoder.VBE/Common/WinAPI/RawInput.cs
View file
Expand Up @@ -11,7 +11,7 @@ public class RawInput : NativeWindow
{
static readonly Guid DeviceInterfaceHid = new Guid("4D1E55B2-F16F-11CF-88CB-001111000030");
private readonly List<IRawDevice> _devices;
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

public RawInput(IntPtr parentHandle)
{
Expand Down Expand Up @@ -47,7 +47,7 @@ protected override void WndProc(ref Message message)
if (dwSize != res)
{
var ex = new Win32Exception(Marshal.GetLastWin32Error());
_logger.Error(ex, "Error getting the rawinput buffer: {0}", ex.Message);
Logger.Error(ex, "Error getting the rawinput buffer: {0}", ex.Message);
return;
}
foreach (var device in _devices)
Expand Down
2 changes: 1 addition & 1 deletion RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs
View file
Expand Up @@ -67,7 +67,7 @@ private void FixTypeHintUsage(string hint, CodeModule module, Selection selectio
{
var line = module.Lines[selection.StartLine, 1];

var asTypeClause = ' ' + Tokens.As + ' ' + Declaration.TYPEHINT_TO_TYPENAME[hint];
var asTypeClause = ' ' + Tokens.As + ' ' + Declaration.TypeHintToTypeName[hint];

string fix;

Expand Down
6 changes: 2 additions & 4 deletions RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs
View file
Expand Up @@ -19,7 +19,7 @@ public class ExtractInterfaceRefactoring : IRefactoring
private readonly IMessageBox _messageBox;
private readonly IRefactoringPresenterFactory<ExtractInterfacePresenter> _factory;
private ExtractInterfaceModel _model;
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

public ExtractInterfaceRefactoring(VBE vbe, RubberduckParserState state, IMessageBox messageBox, IRefactoringPresenterFactory<ExtractInterfacePresenter> factory)
{
Expand Down Expand Up @@ -81,13 +81,11 @@ private void AddInterface()
private int _insertionLine;
private void _state_StateChanged(object sender, EventArgs e)
{
_logger.Debug("ExtractInterfaceRefactoring handles StateChanged...");
if (_state.Status != ParserState.Ready)
{
return;
}

_logger.Debug("Implementing extracted interface...");

var qualifiedSelection = new QualifiedSelection(_model.TargetDeclaration.QualifiedSelection.QualifiedName, new Selection(_insertionLine, 1, _insertionLine, 1));
_vbe.ActiveCodePane.CodeModule.SetSelection(qualifiedSelection);

Expand Down
5 changes: 0 additions & 5 deletions RetailCoder.VBE/Root/RubberduckModule.cs
View file
Expand Up @@ -49,8 +49,6 @@ public class RubberduckModule : NinjectModule
private const int MsForms = 17;
private const int MsFormsControl = 18;

private static readonly Logger _logger = LogManager.GetCurrentClassLogger();

public RubberduckModule(VBE vbe, AddIn addin)
{
_vbe = vbe;
Expand All @@ -59,8 +57,6 @@ public RubberduckModule(VBE vbe, AddIn addin)

public override void Load()
{
_logger.Debug("in RubberduckModule.Load()");

// bind VBE and AddIn dependencies to host-provided instances.
Bind<VBE>().ToConstant(_vbe);
Bind<AddIn>().ToConstant(_addin);
Expand Down Expand Up @@ -149,7 +145,6 @@ public override void Load()
ConfigureProjectExplorerContextMenu();

BindWindowsHooks();
_logger.Debug("completed RubberduckModule.Load()");
}

private void BindWindowsHooks()
Expand Down
1 change: 1 addition & 0 deletions RetailCoder.VBE/Rubberduck.csproj
View file
Expand Up @@ -830,6 +830,7 @@
</Compile>
<Compile Include="UI\SourceControl\ChangesViewViewModel.cs" />
<Compile Include="UI\SourceControl\CommitAction.cs" />
<Compile Include="UI\SourceControl\Converters\ChangeTypesToTextConverter.cs" />
<Compile Include="UI\SourceControl\Converters\CommitActionsToTextConverter.cs" />
<Compile Include="UI\SourceControl\Converters\CommitActionTextToEnum.cs" />
<Compile Include="UI\FileBrowserDialogFactory.cs" />
Expand Down

0 comments on commit 3e1b4b3

Please sign in to comment.