From 54459995cf4e677e775e96e9c0aad3e095cc2e47 Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Fri, 24 Jan 2020 14:25:12 -0800 Subject: [PATCH 1/2] set the default line length to infinity (-1) --- apic.go | 1 + encode_test.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/apic.go b/apic.go index 65846e67..ae7d049f 100644 --- a/apic.go +++ b/apic.go @@ -108,6 +108,7 @@ func yaml_emitter_initialize(emitter *yaml_emitter_t) { raw_buffer: make([]byte, 0, output_raw_buffer_size), states: make([]yaml_emitter_state_t, 0, initial_stack_size), events: make([]yaml_event_t, 0, initial_queue_size), + best_width: -1, } } diff --git a/encode_test.go b/encode_test.go index 0f01b76f..f1df3cde 100644 --- a/encode_test.go +++ b/encode_test.go @@ -422,6 +422,11 @@ var marshalTests = []struct { map[string]string{"a": "\tB\n\tC\n"}, "a: |\n \tB\n \tC\n", }, + // Ensure that strings do not wrap + { + map[string]string{"a": "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 "}, + "a: 'abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 '\n", + }, } func (s *S) TestMarshal(c *C) { From d95d4d7de0cd4c5dbb4ce15fc69cd6b9cd490a9d Mon Sep 17 00:00:00 2001 From: Gustavo Niemeyer Date: Thu, 7 May 2020 00:13:22 +0100 Subject: [PATCH 2/2] Fix spacing broken during conflict resolution --- encode_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/encode_test.go b/encode_test.go index 1f3222a2..fc65b933 100644 --- a/encode_test.go +++ b/encode_test.go @@ -429,11 +429,11 @@ var marshalTests = []struct { "a: |\n \tB\n \tC\n", }, - // Ensure that strings do not wrap + // Ensure that strings do not wrap { map[string]string{"a": "abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 "}, "a: 'abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890 '\n", - }, + }, // yaml.Node {