Skip to content

Commit 632afcb

Browse files
MDoernerMDoerner
committed
Merge branch 'next' into AnnotateCommand
# Conflicts: # Rubberduck.Resources/RubberduckUI.resx
2 parents fe10c33 + 3fb5770 commit 632afcb

File tree

16 files changed

+752
-23
lines changed

16 files changed

+752
-23
lines changed

‎Rubberduck.CodeAnalysis/Inspections/Abstract/MemberAccessMayReturnNothingInspectionBase.cs

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,20 @@ protected MemberAccessMayReturnNothingInspectionBase(IDeclarationFinderProvider
1919
: base(declarationFinderProvider)
2020
{}
2121

22+
/// <summary>
23+
/// Members that might return Nothing
24+
/// </summary>
25+
/// <remarks>
26+
/// It must not be legal to call the members unqualified. In particular, user-defined members will not be considered.
27+
/// Moreover, this disqualifies all members on global objects.
28+
/// </remarks>
2229
public abstract IEnumerable<Declaration> MembersUnderTest(DeclarationFinder finder);
2330
public abstract string ResultTemplate { get; }
2431

2532
protected override IEnumerable<Declaration> ObjectionableDeclarations(DeclarationFinder finder)
2633
{
27-
return MembersUnderTest(finder);
34+
//This restriction is in place because the inspection currently cannot handle unqualified accesses.
35+
return MembersUnderTest(finder).Where(member => !member.IsUserDefined);
2836
}
2937

3038
protected override bool IsResultReference(IdentifierReference reference, DeclarationFinder finder)
@@ -46,7 +54,7 @@ protected override bool IsResultReference(IdentifierReference reference, Declara
4654
{
4755
return usageContext is VBAParser.MemberAccessExprContext
4856
|| !(usageContext is VBAParser.CallStmtContext)
49-
&& !ContextIsNothingTest(usageContext);
57+
&& !ContextIsNothing(usageContext);
5058
}
5159

5260
var assignedTo = AssignmentTarget(reference, finder, setter);
@@ -65,14 +73,21 @@ private static IdentifierReference AssignmentTarget(IdentifierReference referenc
6573

6674
private static RuleContext UsageContext(IdentifierReference reference)
6775
{
68-
var access = reference.Context.GetAncestor<VBAParser.MemberAccessExprContext>();
69-
var usageContext = access.Parent is VBAParser.IndexExprContext indexExpr
76+
//We prefer the with member access over the member access, because the accesses are resolved right to left.
77+
var access = reference.Context.GetAncestor<VBAParser.WithMemberAccessExprContext>() as VBAParser.LExpressionContext
78+
?? reference.Context.GetAncestor<VBAParser.MemberAccessExprContext>();
79+
80+
if (access == null)
81+
{
82+
return null;
83+
}
84+
85+
return access.Parent is VBAParser.IndexExprContext indexExpr
7086
? indexExpr.Parent
7187
: access.Parent;
72-
return usageContext;
7388
}
7489

75-
private static bool ContextIsNothingTest(IParseTree context)
90+
private static bool ContextIsNothing(IParseTree context)
7691
{
7792
return context is VBAParser.LExprContext
7893
&& context.Parent is VBAParser.RelationalOpContext comparison
@@ -86,7 +101,7 @@ private static bool IsUsedBeforeCheckingForNothing(IdentifierReference assignedT
86101
var firstUse = GetReferenceNodes(tree).FirstOrDefault();
87102

88103
return !(firstUse is null)
89-
&& !ContextIsNothingTest(firstUse.Reference.Context.Parent);
104+
&& !ContextIsNothing(firstUse.Reference.Context.Parent);
90105
}
91106

92107
private static IEnumerable<INode> GetReferenceNodes(INode node)

‎Rubberduck.Core/UI/CodeExplorer/Commands/DragAndDrop/CodeExplorerMoveToFolderDragAndDropCommand.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ private bool SpecialEvaluateCanExecute(object parameter)
3131
{
3232
var (targetFolder, node) = (ValueTuple<string, ICodeExplorerNode>)parameter;
3333
return !string.IsNullOrEmpty(targetFolder)
34-
&& (node is CodeExplorerCustomFolderViewModel
34+
&& (node is CodeExplorerCustomFolderViewModel folderViewModel
35+
&& folderViewModel.FullPath != targetFolder
3536
|| node is CodeExplorerComponentViewModel componentViewModel
3637
&& componentViewModel.Declaration is ModuleDeclaration);
3738
}

‎Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@
200200
SelectedItem="{Binding SelectedItem}"
201201
SelectionUnit="FullRow"
202202
ItemsSource="{Binding Results, NotifyOnSourceUpdated=True}"
203-
RequestBringIntoView="InspectionResultsGrid_RequestBringIntoView"
204203
VirtualizingPanel.IsVirtualizingWhenGrouping="True"
205204
ScrollViewer.CanContentScroll="True"
206205
ScrollViewer.VerticalScrollBarVisibility="Auto"

‎Rubberduck.Core/UI/Refactorings/EncapsulateField/EncapsulateFieldView.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
Text="{Binding Path=PropertyName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
145145
TabIndex="1" Margin="10,5"
146146
VerticalAlignment="Center"
147+
VerticalContentAlignment="Center"
147148
Height="22" />
148149
<Image Grid.Row="1" Style="{StaticResource InvalidNameIconStyle}"
149150
Visibility="{Binding Path=SelectionHasValidEncapsulationAttributes, Converter={StaticResource BoolToHiddenVisibility}}" />

‎Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ public bool CanExecuteIgnoreSelectedTests(object obj)
256256

257257
return false;
258258
}
259+
259260
public bool CanExecuteUnignoreSelectedTests(object obj)
260261
{
261262
if (!Model.IsBusy && obj is IList viewModels && viewModels.Count > 0)
@@ -273,12 +274,14 @@ public bool CanExecuteIgnoreGroupCommand(object obj)
273274

274275
return groupItems.Cast<TestMethodViewModel>().Count(test => test.Method.IsIgnored) != groupItems.Count;
275276
}
277+
276278
public bool CanExecuteUnignoreGroupCommand(object obj)
277279
{
278280
var groupItems = MouseOverGroup?.Items
279-
?? GroupContainingSelectedTest(MouseOverTest).Items;
280-
281-
return groupItems.Cast<TestMethodViewModel>().Any(test => test.Method.IsIgnored);
281+
?? GroupContainingSelectedTest(MouseOverTest)?.Items;
282+
283+
return groupItems != null
284+
&& groupItems.Cast<TestMethodViewModel>().Any(test => test.Method.IsIgnored);
282285
}
283286

284287
#region Commands

‎Rubberduck.Parsing/Grammar/VBALexer.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ R_SQUARE_BRACKET : ']';
250250
L_BRACE : '{';
251251
R_BRACE : '}';
252252
STRINGLITERAL : '"' (~["\r\n] | '""')* '"';
253-
OCTLITERAL : '&O' [0-8]+ INTEGERTYPESUFFIX?;
253+
OCTLITERAL : '&O' [0-7]+ INTEGERTYPESUFFIX?;
254254
HEXLITERAL : '&H' [0-9A-F]+ INTEGERTYPESUFFIX?;
255255
FLOATLITERAL :
256256
FLOATINGPOINTLITERAL FLOATINGPOINTTYPESUFFIX?

‎Rubberduck.Refactorings/ImplementInterface/AddInterfaceImplementations/AddInterfaceImplementationsRefactoringAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class AddInterfaceImplementationsRefactoringAction : CodeOnlyRefactoringA
1515
public AddInterfaceImplementationsRefactoringAction(IRewritingManager rewritingManager)
1616
: base(rewritingManager)
1717
{
18-
_memberBody = $" {Tokens.Err}.Raise 5 {Resources.RubberduckUI.ImplementInterface_TODO}";
18+
_memberBody = $" {Tokens.Err}.Raise 5 {Resources.Refactorings.Refactorings.ImplementInterface_TODO}";
1919
}
2020

2121
public override void Refactor(AddInterfaceImplementationsModel model, IRewriteSession rewriteSession)

‎Rubberduck.Resources/Refactorings/Refactorings.Designer.cs

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

‎Rubberduck.Resources/Refactorings/Refactorings.cs.resx

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

0 commit comments

Comments
 (0)