Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
3c2a32a7
Commit
3c2a32a7
authored
Nov 24, 2019
by
Sydney Acksman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Distinct on depended extensions to filter duplicate extensions
parent
a9f390f4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
FileDescriptor.cs
csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
+4
-3
No files found.
csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
View file @
3c2a32a7
...
...
@@ -422,7 +422,8 @@ namespace Google.Protobuf.Reflection
GeneratedClrTypeInfo
generatedCodeInfo
)
{
ExtensionRegistry
registry
=
new
ExtensionRegistry
();
AddAllExtensions
(
dependencies
,
generatedCodeInfo
,
registry
);
registry
.
AddRange
(
GetAllExtensions
(
dependencies
,
generatedCodeInfo
));
FileDescriptorProto
proto
;
try
{
...
...
@@ -445,9 +446,9 @@ namespace Google.Protobuf.Reflection
}
}
private
static
void
AddAllExtensions
(
FileDescriptor
[]
dependencies
,
GeneratedClrTypeInfo
generatedInfo
,
ExtensionRegistry
registry
)
private
static
IEnumerable
<
Extension
>
GetAllExtensions
(
FileDescriptor
[]
dependencies
,
GeneratedClrTypeInfo
generatedInfo
)
{
re
gistry
.
AddRange
(
dependencies
.
SelectMany
(
GetAllDependedExtensions
).
Concat
(
GetAllGeneratedExtensions
(
generatedInfo
)).
ToArray
(
));
re
turn
dependencies
.
SelectMany
(
GetAllDependedExtensions
).
Distinct
().
Concat
(
GetAllGeneratedExtensions
(
generatedInfo
));
}
private
static
IEnumerable
<
Extension
>
GetAllGeneratedExtensions
(
GeneratedClrTypeInfo
generated
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment