magic formatting is consistent with TL - always 8 digits

VKCOM · Jun 18, 2024 · a529201 · a529201
1 parent bb42217
commit a529201
Show file tree

Hide file tree

Showing 36 changed files with 114 additions and 114 deletions.
diff --git a/internal/tlcodegen/qt_factory.qtpl b/internal/tlcodegen/qt_factory.qtpl
@@ -36,7 +36,7 @@ func init() {
 {%- for _, wr := range typeWrappers  -%}
     {%- if wr.tlTag == 0 || !wr.IsTopLevel() -%} {%- continue -%} {%- endif -%}
     {%- if fun, ok := wr.trw.(*TypeRWStruct); ok && len(wr.NatParams) == 0-%}
-    {%- code tlTag := fmt.Sprintf("%#08x", wr.tlTag) -%}
+    {%- code tlTag := fmt.Sprintf("0x%08x", wr.tlTag) -%}
         {%- if wr.unionParent != nil && wr.unionParent.IsEnum -%}
             meta.SetGlobalFactoryCreateForEnumElement({%s tlTag %})
             {%- continue -%}

diff --git a/internal/tlcodegen/qt_factory.qtpl.go b/internal/tlcodegen/qt_factory.qtpl.go
diff --git a/internal/tlcodegen/qt_meta.qtpl b/internal/tlcodegen/qt_meta.qtpl
@@ -267,7 +267,7 @@ func init() {
         {%- endif -%}
         "{%= wr.tlName.String() %}#{%s= fmt.Sprintf("%08x", wr.tlTag) %}",
         {%q= fmt.Sprintf("#%08x", wr.tlTag) %},
-        &TLItem{tag: {%s= fmt.Sprintf("%#x", wr.tlTag) %}, annotations: {%s= fmt.Sprintf("%#x", wr.AnnotationsMask()) %}, tlName: "{%= wr.tlName.String() %}"})
+        &TLItem{tag: {%s= fmt.Sprintf("0x%08x", wr.tlTag) %}, annotations: {%s= fmt.Sprintf("0x%x", wr.AnnotationsMask()) %}, tlName: "{%= wr.tlName.String() %}"})
     {%- endif -%}
 {%- endstripspace -%}
 

diff --git a/internal/tlcodegen/qt_meta.qtpl.go b/internal/tlcodegen/qt_meta.qtpl.go
diff --git a/internal/tlcodegen/qt_namespace.qtpl b/internal/tlcodegen/qt_namespace.qtpl
@@ -179,7 +179,7 @@ switch tag {
     {%- for _, wr := range types -%}
         {%- if fun, ok := wr.trw.(*TypeRWStruct); ok && fun.ResultType != nil -%}
             {%- code
-                tlTag := fmt.Sprintf("%#08x", wr.tlTag)
+                tlTag := fmt.Sprintf("0x%08x", wr.tlTag)
                 funcTypeString := wr.TypeString2(false, directImports, nil, true, true)
                 tlName := wr.tlName.String()
             -%}

diff --git a/internal/tlcodegen/qt_namespace.qtpl.go b/internal/tlcodegen/qt_namespace.qtpl.go
diff --git a/internal/tlcodegen/qt_struct.qtpl b/internal/tlcodegen/qt_struct.qtpl
@@ -5,7 +5,7 @@
 {%- func (struct_ *TypeRWStruct)GenerateCode(bytesVersion bool, directImports *DirectImports) -%}
     {%- code
         goName := addBytes(struct_.wr.goGlobalName, bytesVersion)
-        tlTag := fmt.Sprintf("%#x", struct_.wr.tlTag)
+        tlTag := fmt.Sprintf("0x%08x", struct_.wr.tlTag)
         natArgsDecl := formatNatArgsDecl(struct_.wr.NatParams)
         natArgsCall := formatNatArgsDeclCall(struct_.wr.NatParams)
         writeNeedsError := struct_.wr.hasErrorInWriteMethods

diff --git a/internal/tlcodegen/qt_struct.qtpl.go b/internal/tlcodegen/qt_struct.qtpl.go
diff --git a/internal/tlcodegen/qt_union.qtpl b/internal/tlcodegen/qt_union.qtpl
@@ -54,7 +54,7 @@ func (item*{%s= goName %}) ReadBoxed(w []byte{%s= natArgsDecl %}) (_ []byte, err
     }
     switch tag {
     {%- for i, field := range union.Fields -%}
-    case {%s= fmt.Sprintf("%#x", field.t.tlTag) %}:
+    case {%s= fmt.Sprintf("0x%08x", field.t.tlTag) %}:
         item.index = {%d i %}
         {%- if field.t.IsTrueType() -%}
         return w, nil
@@ -487,7 +487,7 @@ func (item *{%s= goGlobalName %}) Set{%s= field.goName %}(value {%s= fieldTypeSt
     var _{%s= goName %} = [{%d len(union.Fields) %}]{%s= union.wr.gen.InternalPrefix()%}UnionElement{
     {%- for _, x := range union.Fields -%}
         {%- code
-            tlTag := fmt.Sprintf("%#x", x.t.tlTag )
+            tlTag := fmt.Sprintf("0x%08x", x.t.tlTag )
             tlString := fmt.Sprintf("%s#%08x", x.t.tlName, x.t.tlTag)
             tlName := x.t.tlName.String()
         -%}

diff --git a/internal/tlcodegen/qt_union.qtpl.go b/internal/tlcodegen/qt_union.qtpl.go
diff --git a/...odegen/test/gen/cases/internal/tlcases_bytes/tlCasesBytesTestEnum/cases_bytes.TestEnum.go b/...odegen/test/gen/cases/internal/tlcases_bytes/tlCasesBytesTestEnum/cases_bytes.TestEnum.go
diff --git a/internal/tlcodegen/test/gen/cases/meta/meta.go b/internal/tlcodegen/test/gen/cases/meta/meta.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlInnerMaybe/innerMaybe.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlInnerMaybe/innerMaybe.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlInnerMaybe0/innerMaybe.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlInnerMaybe0/innerMaybe.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlMultiPoint/multiPoint.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlMultiPoint/multiPoint.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairAInnerAInner/pair.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairAInnerAInner/pair.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairBoolAColor/pair.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairBoolAColor/pair.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairFloatDouble/pair.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairFloatDouble/pair.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairIntInt/pair.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairIntInt/pair.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairIntLong/pair.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairIntLong/pair.go
diff --git a/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairIntPairMultiPointString/pair.go b/internal/tlcodegen/test/gen/goldmaster/internal/tl/tlPairIntPairMultiPointString/pair.go