Skip to content

Commit 3b87830

Browse files
committed
feat: OrderedMapValue not null
1 parent 39da761 commit 3b87830

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

cmd/protoc-gen-csharp-tableau-loader/ordered_map.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func genOrderedMapTypeDef(g *protogen.GeneratedFile, md protoreflect.MessageDesc
4242
currValueType := helper.ParseCsharpType(fd.MapValue())
4343
nextPrefix := parseOrderedMapPrefix(nextMapFD, messagerFullName)
4444
nextOrderedMap := nextPrefix + orderedMapSuffix
45-
g.P(helper.Indent(2), "public class ", orderedMapValue, "(", nextOrderedMap, " item1, ", currValueType, "? item2) : Tuple<", nextOrderedMap, ", ", currValueType, "?>(item1, item2);")
45+
g.P(helper.Indent(2), "public class ", orderedMapValue, "(", nextOrderedMap, " item1, ", currValueType, " item2) : Tuple<", nextOrderedMap, ", ", currValueType, ">(item1, item2);")
4646
g.P(helper.Indent(2), "public class ", orderedMap, " : SortedDictionary<", keyType, ", ", orderedMapValue, ">;")
4747
g.P()
4848
} else {

test/csharp-tableau-loader/tableau/HeroConf.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class HeroConf : Messager, IMessagerName
1313
// OrderedMap types.
1414
public class Hero_Attr_OrderedMap : SortedDictionary<string, Protoconf.HeroConf.Types.Hero.Types.Attr>;
1515

16-
public class Hero_OrderedMapValue(Hero_Attr_OrderedMap item1, Protoconf.HeroConf.Types.Hero? item2) : Tuple<Hero_Attr_OrderedMap, Protoconf.HeroConf.Types.Hero?>(item1, item2);
16+
public class Hero_OrderedMapValue(Hero_Attr_OrderedMap item1, Protoconf.HeroConf.Types.Hero item2) : Tuple<Hero_Attr_OrderedMap, Protoconf.HeroConf.Types.Hero>(item1, item2);
1717
public class Hero_OrderedMap : SortedDictionary<string, Hero_OrderedMapValue>;
1818

1919
private readonly Hero_OrderedMap _orderedMap = [];

test/csharp-tableau-loader/tableau/TestConf.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public class ActivityConf : Messager, IMessagerName
1313
// OrderedMap types.
1414
public class Int32_OrderedMap : SortedDictionary<uint, int>;
1515

16-
public class Protoconf_Section_OrderedMapValue(Int32_OrderedMap item1, Protoconf.Section? item2) : Tuple<Int32_OrderedMap, Protoconf.Section?>(item1, item2);
16+
public class Protoconf_Section_OrderedMapValue(Int32_OrderedMap item1, Protoconf.Section item2) : Tuple<Int32_OrderedMap, Protoconf.Section>(item1, item2);
1717
public class Protoconf_Section_OrderedMap : SortedDictionary<uint, Protoconf_Section_OrderedMapValue>;
1818

19-
public class Activity_Chapter_OrderedMapValue(Protoconf_Section_OrderedMap item1, Protoconf.ActivityConf.Types.Activity.Types.Chapter? item2) : Tuple<Protoconf_Section_OrderedMap, Protoconf.ActivityConf.Types.Activity.Types.Chapter?>(item1, item2);
19+
public class Activity_Chapter_OrderedMapValue(Protoconf_Section_OrderedMap item1, Protoconf.ActivityConf.Types.Activity.Types.Chapter item2) : Tuple<Protoconf_Section_OrderedMap, Protoconf.ActivityConf.Types.Activity.Types.Chapter>(item1, item2);
2020
public class Activity_Chapter_OrderedMap : SortedDictionary<uint, Activity_Chapter_OrderedMapValue>;
2121

22-
public class Activity_OrderedMapValue(Activity_Chapter_OrderedMap item1, Protoconf.ActivityConf.Types.Activity? item2) : Tuple<Activity_Chapter_OrderedMap, Protoconf.ActivityConf.Types.Activity?>(item1, item2);
22+
public class Activity_OrderedMapValue(Activity_Chapter_OrderedMap item1, Protoconf.ActivityConf.Types.Activity item2) : Tuple<Activity_Chapter_OrderedMap, Protoconf.ActivityConf.Types.Activity>(item1, item2);
2323
public class Activity_OrderedMap : SortedDictionary<ulong, Activity_OrderedMapValue>;
2424

2525
private readonly Activity_OrderedMap _orderedMap = [];

0 commit comments

Comments
 (0)