Skip to content

Commit d5e85b9

Browse files
committed
Fix incorrect duplicate resolution of fields in structs, update effected serializations.
1 parent 69ffc2e commit d5e85b9

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

Rubberduck.Parsing/ComReflection/ReferencedDeclarationsCollector.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ public List<Declaration> LoadDeclarationsFromLibrary()
177177
var enumTree = new SerializableDeclarationTree(enumDeclaration);
178178
moduleTree.AddChildTree(enumTree);
179179
enumTree.AddChildren(members);
180+
continue;
180181
}
181182

182183
var structure = module as ComStruct;
@@ -190,6 +191,7 @@ public List<Declaration> LoadDeclarationsFromLibrary()
190191
var typeTree = new SerializableDeclarationTree(typeDeclaration);
191192
moduleTree.AddChildTree(typeTree);
192193
typeTree.AddChildren(members);
194+
continue;
193195
}
194196

195197
var fields = module as IComTypeWithFields;

Rubberduck.Parsing/Rubberduck.Parsing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<DebugType>full</DebugType>
2424
<Optimize>false</Optimize>
2525
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>DEBUG;TRACE</DefineConstants>
26+
<DefineConstants>TRACE;DEBUG</DefineConstants>
2727
<ErrorReport>prompt</ErrorReport>
2828
<WarningLevel>1</WarningLevel>
2929
<UseVSHostingProcess>true</UseVSHostingProcess>

RubberduckTests/Testfiles/Resolver/MSXML2.6.0.xml

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

RubberduckTests/Testfiles/Resolver/stdole.2.0.xml

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

0 commit comments

Comments
 (0)