Skip to content

Commit 2e78637

Browse files
Hosch250Hosch250
committed
#1051 (English only)
1 parent 113c1ef commit 2e78637

File tree

8 files changed

+54
-47
lines changed

8 files changed

+54
-47
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public AddTestMethodCommandMenuItem(CommandBase command)
1212
{
1313
}
1414

15-
public override string Key { get { return "TestExplorer_AddTestMethod"; } }
15+
public override string Key { get { return "TestExplorerMenu_AddTestMethod"; } }
1616
public override int DisplayOrder { get { return (int)UnitTestingMenuItemDisplayOrder.AddTestMethod; } }
1717

1818
public override Image Image { get { return Resources.flask; } }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public AddTestMethodExpectedErrorCommandMenuItem(CommandBase command)
1212
{
1313
}
1414

15-
public override string Key { get { return "TestExplorer_AddExpectedErrorTestMethod"; } }
15+
public override string Key { get { return "TestExplorerMenu_AddExpectedErrorTestMethod"; } }
1616
public override int DisplayOrder { get { return (int)UnitTestingMenuItemDisplayOrder.AddTestMethodExpectedError; } }
1717

1818
public override Image Image { get { return Resources.flask_exclamation; } }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public AddTestModuleCommandMenuItem(CommandBase command)
1010
{
1111
}
1212

13-
public override string Key { get { return "TestExplorer_AddTestModule"; } }
13+
public override string Key { get { return "TestExplorerMenu_AddTestModule"; } }
1414
public override int DisplayOrder { get { return (int)UnitTestingMenuItemDisplayOrder.AddTestModule; } }
1515
public override bool BeginGroup { get { return true; } }
1616
}

‎RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected ParentMenuItemBase(string key, IEnumerable<IMenuItem> items, int? befo
3131

3232
public string Key { get { return Item == null ? null : Item.Tag; } }
3333

34-
public Func<string> Caption { get { return () => Key == null ? null : RubberduckUI.ResourceManager.GetString(Key, UI.Settings.Settings.Culture); } }
34+
public Func<string> Caption { get { return () => Key == null ? null : RubberduckUI.ResourceManager.GetString(Key, Settings.Settings.Culture); } }
3535

3636
public virtual bool BeginGroup { get { return false; } }
3737
public virtual int DisplayOrder { get { return default(int); } }

‎RetailCoder.VBE/UI/RubberduckUI.Designer.cs

Lines changed: 33 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -982,19 +982,19 @@ Are you sure you want to proceed with this rename?</value>
982982
<value>Find symbol</value>
983983
</data>
984984
<data name="IndentCurrentModule" xml:space="preserve">
985-
<value>Current module</value>
985+
<value>Current &amp;Module</value>
986986
</data>
987987
<data name="IndentCurrentProcedure" xml:space="preserve">
988-
<value>Current procedure</value>
988+
<value>Current &amp;Procedure</value>
989989
</data>
990990
<data name="IndentCurrentProject" xml:space="preserve">
991991
<value>Entire project</value>
992992
</data>
993993
<data name="SmartIndenterMenu" xml:space="preserve">
994-
<value>Indent</value>
994+
<value>In&amp;dent</value>
995995
</data>
996996
<data name="RefactorMenu_IntroduceParameter" xml:space="preserve">
997-
<value>&amp;Introduce Parameter</value>
997+
<value>Introduce &amp;Parameter</value>
998998
</data>
999999
<data name="RefactorMenu_IntroduceField" xml:space="preserve">
10001000
<value>Introduce &amp;Field</value>
@@ -1058,7 +1058,7 @@ Are you sure you want to proceed with this rename?</value>
10581058
<value>E&amp;xtract Interface</value>
10591059
</data>
10601060
<data name="RefactorMenu_ImplementInterface" xml:space="preserve">
1061-
<value>Implement Interface</value>
1061+
<value>&amp;Implement Interface</value>
10621062
</data>
10631063
<data name="ImplementInterface_Caption" xml:space="preserve">
10641064
<value>Rubberduck - Implement Interface</value>
@@ -1551,7 +1551,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
15511551
<value>Source Control - Undo</value>
15521552
</data>
15531553
<data name="NoIndentAnnotation" xml:space="preserve">
1554-
<value>Add '@NoIndent</value>
1554+
<value>&amp;Add '@NoIndent</value>
15551555
</data>
15561556
<data name="CodeExplorer_Sort" xml:space="preserve">
15571557
<value>Sort</value>
@@ -1721,4 +1721,13 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
17211721
<data name="RubberduckFatalError" xml:space="preserve">
17221722
<value>Rubberduck encountered an error. Please save your work and restart the host program, then upload your log file to our GitHub page.</value>
17231723
</data>
1724+
<data name="TestExplorerMenu_AddExpectedErrorTestMethod" xml:space="preserve">
1725+
<value>Test Method (&amp;Expected Error)</value>
1726+
</data>
1727+
<data name="TestExplorerMenu_AddTestMethod" xml:space="preserve">
1728+
<value>Test &amp;Method</value>
1729+
</data>
1730+
<data name="TestExplorerMenu_AddTestModule" xml:space="preserve">
1731+
<value>Test M&amp;odule</value>
1732+
</data>
17241733
</root>

‎Rubberduck.Parsing/VBA/RubberduckParser.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ private void ReparseRequested(object sender, ParseRequestEventArgs e)
6565
Cancel(e.Component);
6666
Task.Run(() =>
6767
{
68+
State.SetModuleState(e.Component, ParserState.Pending);
69+
6870
SyncComReferences(State.Projects);
6971
AddBuiltInDeclarations();
7072

@@ -490,7 +492,6 @@ private void UnloadComReference(Reference reference, IReadOnlyList<VBProject> pr
490492
private Task ParseAsync(VBComponent component, CancellationToken token, TokenStreamRewriter rewriter = null)
491493
{
492494
State.ClearStateCache(component);
493-
State.SetModuleState(component, ParserState.Pending); // also clears module-exceptions
494495

495496
var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(_central.Token, token);
496497

‎Rubberduck.Parsing/VBA/RubberduckParserState.cs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -922,36 +922,6 @@ public bool IsDirty()
922922
return false;
923923
}
924924

925-
public bool HasAllParseTrees(IReadOnlyList<VBComponent> expected)
926-
{
927-
var expectedModules = new List<QualifiedModuleName>();
928-
foreach (var component in expected)
929-
{
930-
expectedModules.Add(new QualifiedModuleName(component));
931-
}
932-
933-
foreach (var key in _moduleStates.Keys)
934-
{
935-
if (key.Component == null || expectedModules.Contains(key))
936-
{
937-
continue;
938-
}
939-
940-
ClearStateCache(key.Component);
941-
}
942-
943-
var parseTreeCount = 0;
944-
foreach (var state in _moduleStates)
945-
{
946-
if (state.Value.ParseTree != null)
947-
{
948-
parseTreeCount++;
949-
}
950-
}
951-
952-
return parseTreeCount == expected.Count;
953-
}
954-
955925
public TokenStreamRewriter GetRewriter(VBComponent component)
956926
{
957927
return new TokenStreamRewriter(_moduleStates[new QualifiedModuleName(component)].TokenStream);

0 commit comments

Comments
 (0)