Skip to content

Commit 8a0eff4

Browse files
Hosch250Hosch250
committed
Close #1928 
1 parent 5d49b4e commit 8a0eff4

File tree

4 files changed

+18
-33
lines changed

4 files changed

+18
-33
lines changed

‎RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void FixTypeHintUsage(string hint, CodeModule module, Selection selectio
6767
{
6868
var line = module.Lines[selection.StartLine, 1];
6969

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

7272
string fix;
7373

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

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Rubberduck.UI.Command.MenuItems.ParentMenus;
88
using Rubberduck.VBEditor;
99
using ParserState = Rubberduck.Parsing.VBA.ParserState;
10-
using NLog;
1110

1211
namespace Rubberduck.UI.Command.MenuItems
1312
{
@@ -21,7 +20,6 @@ public class RubberduckCommandBar : IDisposable
2120
private CommandBarButton _statusButton;
2221
private CommandBarButton _selectionButton;
2322
private CommandBar _commandbar;
24-
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
2523

2624
public RubberduckCommandBar(RubberduckParserState state, VBE vbe, IShowParserErrorsCommand command)
2725
{
@@ -32,7 +30,7 @@ public RubberduckCommandBar(RubberduckParserState state, VBE vbe, IShowParserErr
3230
Initialize();
3331
}
3432

35-
private void _statusButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
33+
private void _statusButton_Click(CommandBarButton ctrl, ref bool cancelDefault)
3634
{
3735
if (_state.Status == ParserState.Error)
3836
{
@@ -43,7 +41,6 @@ private void _statusButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
4341
public void SetStatusText(string value = null)
4442
{
4543
var text = value ?? RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status);
46-
_logger.Debug("RubberduckCommandBar status text changes to '{0}'.", text);
4744
UiDispatcher.Invoke(() => _statusButton.Caption = text);
4845
}
4946

@@ -55,31 +52,21 @@ public void SetSelectionText(Declaration declaration)
5552
if (selection.HasValue) { SetSelectionText(selection.Value); }
5653
_selectionButton.TooltipText = _selectionButton.Caption;
5754
}
58-
else if (declaration != null && !declaration.IsBuiltIn && declaration.DeclarationType != DeclarationType.ClassModule && declaration.DeclarationType != DeclarationType.ProceduralModule)
55+
else if (declaration != null)
5956
{
57+
var typeName = declaration.HasTypeHint
58+
? Declaration.TypeHintToTypeName[declaration.TypeHint]
59+
: declaration.AsTypeName;
60+
6061
_selectionButton.Caption = string.Format("{0}|{1}: {2} ({3}{4})",
6162
declaration.QualifiedSelection.Selection,
6263
declaration.QualifiedName.QualifiedModuleName,
6364
declaration.IdentifierName,
6465
RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType),
65-
string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + declaration.AsTypeName);
66-
_selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
67-
? _selectionButton.Caption
68-
: declaration.DescriptionString;
69-
}
70-
else if (declaration != null)
71-
{
72-
// todo: confirm this is what we want, and then refator
73-
var selection = _vbe.ActiveCodePane.GetQualifiedSelection();
74-
if (selection.HasValue)
75-
{
76-
_selectionButton.Caption = string.Format("{0}|{1}: {2} ({3}{4})",
77-
selection.Value.Selection,
78-
declaration.QualifiedName.QualifiedModuleName,
79-
declaration.IdentifierName,
80-
RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType),
81-
string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + declaration.AsTypeName);
82-
}
66+
string.IsNullOrEmpty(declaration.AsTypeName)
67+
? string.Empty
68+
: ": " + typeName);
69+
8370
_selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
8471
? _selectionButton.Caption
8572
: declaration.DescriptionString;
@@ -93,8 +80,6 @@ private void SetSelectionText(QualifiedSelection selection)
9380

9481
private void State_StateChanged(object sender, EventArgs e)
9582
{
96-
_logger.Debug("RubberduckCommandBar handles StateChanged...");
97-
9883
if (_state.Status != ParserState.ResolvedDeclarations)
9984
{
10085
SetStatusText(RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status));
@@ -112,15 +97,15 @@ private void OnRefresh()
11297
}
11398
}
11499

115-
public void Initialize()
100+
private void Initialize()
116101
{
117102
_commandbar = _vbe.CommandBars.Add("Rubberduck", MsoBarPosition.msoBarTop, false, true);
118103

119104
_refreshButton = (CommandBarButton)_commandbar.Controls.Add(MsoControlType.msoControlButton);
120105
ParentMenuItemBase.SetButtonImage(_refreshButton, Resources.arrow_circle_double, Resources.arrow_circle_double_mask);
121106
_refreshButton.Style = MsoButtonStyle.msoButtonIcon;
122107
_refreshButton.Tag = "Refresh";
123-
_refreshButton.TooltipText =RubberduckUI.RubberduckCommandbarRefreshButtonTooltip;
108+
_refreshButton.TooltipText = RubberduckUI.RubberduckCommandbarRefreshButtonTooltip;
124109
_refreshButton.Click += refreshButton_Click;
125110

126111
_statusButton = (CommandBarButton)_commandbar.Controls.Add(MsoControlType.msoControlButton);
@@ -136,7 +121,7 @@ public void Initialize()
136121
_commandbar.Visible = true;
137122
}
138123

139-
private void refreshButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
124+
private void refreshButton_Click(CommandBarButton ctrl, ref bool cancelDefault)
140125
{
141126
OnRefresh();
142127
}

‎Rubberduck.Parsing/Symbols/Declaration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Rubberduck.Parsing.Symbols
1818
[DebuggerDisplay("({DeclarationType}) {Accessibility} {IdentifierName} As {AsTypeName} | {Selection}")]
1919
public class Declaration : IEquatable<Declaration>
2020
{
21-
public static readonly string[] BASE_TYPES = new string[]
21+
public static readonly string[] BaseTypes =
2222
{
2323
"BOOLEAN",
2424
"BYTE",
@@ -36,7 +36,7 @@ public class Declaration : IEquatable<Declaration>
3636
"ANY"
3737
};
3838

39-
public static readonly IDictionary<string, string> TYPEHINT_TO_TYPENAME = new Dictionary<string, string>
39+
public static readonly IDictionary<string, string> TypeHintToTypeName = new Dictionary<string, string>
4040
{
4141
{ "%", Tokens.Integer },
4242
{ "&", Tokens.Long },
@@ -460,7 +460,7 @@ public bool AsTypeIsBaseType
460460
{
461461
get
462462
{
463-
return string.IsNullOrWhiteSpace(AsTypeName) || BASE_TYPES.Contains(_asTypeName.ToUpperInvariant());
463+
return string.IsNullOrWhiteSpace(AsTypeName) || BaseTypes.Contains(_asTypeName.ToUpperInvariant());
464464
}
465465
}
466466

‎Rubberduck.Parsing/Symbols/TypeAnnotationPass.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void AnnotateType(Declaration declaration)
5353
var typeContext = declaration.AsTypeContext;
5454
typeExpression = typeContext.type().complexType().GetText();
5555
}
56-
else if (!string.IsNullOrWhiteSpace(declaration.AsTypeNameWithoutArrayDesignator) && !Declaration.BASE_TYPES.Contains(declaration.AsTypeNameWithoutArrayDesignator.ToUpperInvariant()))
56+
else if (!string.IsNullOrWhiteSpace(declaration.AsTypeNameWithoutArrayDesignator) && !Declaration.BaseTypes.Contains(declaration.AsTypeNameWithoutArrayDesignator.ToUpperInvariant()))
5757
{
5858
typeExpression = declaration.AsTypeNameWithoutArrayDesignator;
5959
}

0 commit comments

Comments
 (0)