record enc.inTable statu

Signed-off-by: he1pa <[email protected]>
kcl-lang · Jan 6, 2025 · dc39dbf · dc39dbf
1 parent f32088d
commit dc39dbf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pkg/3rdparty/toml/encode.go b/pkg/3rdparty/toml/encode.go
@@ -394,6 +394,7 @@ func (enc *Encoder) eArrayOfTables(key Key, rv reflect.Value) {
 }
 
 func (enc *Encoder) eTable(key Key, rv reflect.Value) {
+	inTable := enc.inTable
 	enc.inTable = true
 	if len(key) == 1 {
 		// Output an extra newline between top-level tables.
@@ -406,7 +407,7 @@ func (enc *Encoder) eTable(key Key, rv reflect.Value) {
 		enc.newline()
 	}
 	enc.eMapOrStruct(key, rv, false)
-	enc.inTable = false
+	enc.inTable = inTable
 }
 
 func (enc *Encoder) eMapOrStruct(key Key, rv reflect.Value, inline bool) {

diff --git a/pkg/tools/gen/gentoml_test.go b/pkg/tools/gen/gentoml_test.go
@@ -121,12 +121,17 @@ c_key = "value3"
 			if err != nil && tt.expectErr != nil {
 				if err.Error() != tt.expectErr.Error() {
 					t.Fatalf("expected error: %v, got: %v", tt.expectErr, err)
+				} else {
+					return
+				}
+			} else if err == nil && tt.expectErr == nil {
+				if got := string(tomlData); got != tt.expectedTOML {
+					t.Errorf("expected:\n%s\ngot:\n%s", tt.expectedTOML, got)
+				} else {
+					t.Fatalf("expected error: %v, got: %v", tt.expectErr, err)
 				}
 			}
 
-			if got := string(tomlData); got != tt.expectedTOML {
-				t.Errorf("expected:\n%s\ngot:\n%s", tt.expectedTOML, got)
-			}
 		})
 	}
 }