Respect curly brace padding setting in YAML

Author: AndrewRadev

autoload/sj/yaml.vim

@@ -237,7 +237,11 @@ function! sj#yaml#JoinMap()
     let lines = s:NormalizeWhitespace(lines)
     let lines = map(lines, 's:StripComment(v:val)')
 
-    let replacement = first_line . ' { '. join(lines, ', ') . ' }'
+    if sj#settings#Read('curly_brace_padding')
+      let replacement = first_line . ' { '. join(lines, ', ') . ' }'
+    else
+      let replacement = first_line . ' {'. join(lines, ', ') . '}'
+    endif
 
     call sj#ReplaceLines(line_no, last_line_no, replacement)
     silent! normal! zO

spec/plugin/yaml_spec.rb

@@ -8,6 +8,10 @@
     vim.set 'shiftwidth', 2
   end
 
+  after :each do
+    vim.command('silent! unlet g:splitjoin_curly_brace_padding')
+  end
+
   describe "arrays" do
     specify "basic" do
       set_file_contents <<~EOF
@@ -396,7 +400,6 @@
         end: true
       EOF
     end
-
   end
 
   describe "maps" do
@@ -447,6 +450,20 @@
       EOF
     end
 
+    specify "without padding" do
+      vim.command 'let g:splitjoin_curly_brace_padding = 0'
+
+      set_file_contents <<~EOF
+        root:
+          one: 1
+      EOF
+
+      vim.search 'root:'
+      join
+
+      assert_file_contents 'root: {one: 1}'
+    end
+
     specify "complex keys" do
       set_file_contents <<~EOF
         map:
@@ -669,6 +686,5 @@
           - prop: { a: 'one', b: 'two' }
       EOF
     end
-
   end
 end