Skip to content

Commit 35f9c9a

Browse files
authored
Merge pull request #2578 from comintern/next
Fix extensible attribute on coclasses, reserialize, reenable tests.
2 parents ae1a780 + 1a04e76 commit 35f9c9a

15 files changed

+18
-16
lines changed

Rubberduck.Parsing/ComReflection/ComModule.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ public ComMember DefaultMember
2424
get { return null; }
2525
}
2626

27+
public bool IsExtensible
28+
{
29+
get { return false; }
30+
}
31+
2732
private readonly List<ComField> _fields = new List<ComField>();
2833
public IEnumerable<ComField> Fields
2934
{

Rubberduck.Parsing/ComReflection/ComType.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ public interface IComType : IComBase
99
bool IsAppObject { get; }
1010
bool IsPreDeclared { get; }
1111
bool IsHidden { get; }
12-
bool IsRestricted { get; }
12+
bool IsRestricted { get; }
1313
}
1414

1515
public interface IComTypeWithMembers : IComType
1616
{
1717
IEnumerable<ComMember> Members { get; }
1818
ComMember DefaultMember { get; }
19+
bool IsExtensible { get; }
1920
}
2021

2122
public interface IComTypeWithFields : IComType

Rubberduck.Parsing/ComReflection/ReferencedDeclarationsCollector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private static Attributes GetModuleAttributes(IComType module)
205205
{
206206
attributes.AddGlobalClassAttribute();
207207
}
208-
if (module as ComInterface != null && ((ComInterface)module).IsExtensible)
208+
if (module as IComTypeWithMembers != null && ((IComTypeWithMembers)module).IsExtensible)
209209
{
210210
attributes.AddExtensibledClassAttribute();
211211
}

RubberduckTests/Inspections/MemberNotOnInterfaceInspectionTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ private static ParseCoordinator ArrangeParser(string inputCode)
3838
[TestCategory("Inspections")]
3939
public void MemberNotOnInterface_ReturnsResult_UnDeclaredMember()
4040
{
41-
Assert.Inconclusive("Pending post-merge fix.");
4241
const string inputCode =
4342
@"Sub Foo()
4443
Dim dict As Dictionary
@@ -63,7 +62,6 @@ Dim dict As Dictionary
6362
[TestCategory("Inspections")]
6463
public void MemberNotOnInterface_ReturnsResult_UnDeclaredInterfaceMember()
6564
{
66-
Assert.Inconclusive("Pending post-merge fix.");
6765
const string inputCode =
6866
@"Sub Foo()
6967
Dim dict As Dictionary
@@ -88,7 +86,6 @@ Dim dict As Dictionary
8886
[TestCategory("Inspections")]
8987
public void MemberNotOnInterface_ReturnsResult_UnDeclaredMemberOnParameter()
9088
{
91-
Assert.Inconclusive("Pending post-merge fix.");
9289
const string inputCode =
9390
@"Sub Foo(dict As Dictionary)
9491
dict.NonMember

RubberduckTests/Inspections/ObjectVariableNotSetInpsectionTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ Dim target As Range
178178
[TestCategory("Inspections")]
179179
public void ObjectVariableNotSet_FunctionReturnsArrayOfType_ReturnsNoResult()
180180
{
181-
Assert.Inconclusive("Pending reserialization.");
182181
const string inputCode = @"
183182
Private Function GetSomeDictionaries() As Dictionary()
184183
Dim temp(0 To 1) As Worksheet

RubberduckTests/Testfiles/Resolver/ADODB.6.1.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

RubberduckTests/Testfiles/Resolver/Excel.1.8.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

RubberduckTests/Testfiles/Resolver/MSForms.2.0.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

RubberduckTests/Testfiles/Resolver/MSXML2.6.0.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

RubberduckTests/Testfiles/Resolver/Office.2.7.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)