fix(style): leading/ending space in blocks, none in records

Author: blindFS

languages/nu.scm

@@ -207,13 +207,22 @@
   (_) @prepend_end_scope @prepend_input_softline
   (#scope_id! "consecutive_scope")
 )
+(block
+  "{" @append_space
+  "}" @prepend_space)
 
 (val_closure
   (_) @append_begin_scope
   .
   (_) @prepend_end_scope @prepend_input_softline
   (#scope_id! "consecutive_scope")
 )
+(val_closure
+  "{" @append_space
+  .
+  (parameter_pipes)? @do_nothing
+)
+(val_closure "}" @prepend_space)
 
 ;; control flow
 (ctrl_if
@@ -268,20 +277,27 @@
   entry: _ @prepend_spaced_softline
 )
 
+;; match_arm
 (val_list
-  item: _ @append_space @prepend_spaced_softline
+  item: _ @append_space
+  .
+  item: _ @prepend_spaced_softline
 )
 
 (val_table
   row: _ @prepend_spaced_softline
 )
 
 (val_record
-  entry: (record_entry) @append_space @prepend_spaced_softline
+  entry: (record_entry) @append_space
+  .
+  entry: (record_entry) @prepend_spaced_softline
 )
 
 (record_body
-  entry: (record_entry) @append_space @prepend_spaced_softline
+  entry: (record_entry) @append_space
+  .
+  entry: (record_entry) @prepend_spaced_softline
 )
 
 (collection_type

test/expected_ctrl.nu

@@ -12,20 +12,20 @@ for i in [1 2 3] {
 alias ll = ls -l # alias comment
 # where
 ls | where $in.name == 'foo'
-| where {|e| $e.item.name !~ $'^($e.index + 1)'}
+| where {|e| $e.item.name !~ $'^($e.index + 1)' }
 # match
-let foo = { name: 'bar' count: 7 }
+let foo = {name: 'bar' count: 7}
 match $foo {
-  { name: 'bar' count: $it } if $it < 5 => ($it + 3) # match arm comment
+  {name: 'bar' count: $it} if $it < 5 => ($it + 3) # match arm comment
   # match comment
-  { name: 'bar' count: $it } if not ($it >= 5) => ($it + 7)
-  _ => {exit 0}
+  {name: 'bar' count: $it} if not ($it >= 5) => ($it + 7)
+  _ => { exit 0 }
 }
 # while
-mut x = 0; while $x < 10 {$x = $x + 1}; $x # while comment
+mut x = 0; while $x < 10 { $x = $x + 1 }; $x # while comment
 # loop
 loop {
-  if $x > 10 {break};
+  if $x > 10 { break };
   $x = $x + 1
 }
 # try

test/expected_decl.nu

@@ -9,7 +9,7 @@ extern hi [
 ]
 # env
 hide-env ABC
-with-env { ABC: 'hello' } {
+with-env {ABC: 'hello'} {
   (
     do -i --env {|foo, bar|
       print $env.ABC

test/expected_exe.nu

@@ -15,15 +15,15 @@ def modify_args_per_workspace [
   let icons = (
     aerospace list-windows --workspace $sid --json
     | from json | get app-name
-    | each {$in | get_icon_by_app_name}
+    | each { $in | get_icon_by_app_name }
     | uniq | sort
     | str join ' '
   )
   let extra = (
     if $sid == $focused_sid {
-      { highlight: on border_color: $colors.green }
+      {highlight: on border_color: $colors.green}
     } else {
-      { highlight: off border_color: $colors.fg }
+      {highlight: off border_color: $colors.fg}
     }
   )
 
@@ -56,14 +56,14 @@ def workspace_modification_args [
   # use listener's label to store last focused space id
   let focused_sid = (aerospace list-workspaces --focused)
   let ids_to_modify = (
-    if ($last_sid | is-empty) {(aerospace list-workspaces --all | lines)}
+    if ($last_sid | is-empty) { (aerospace list-workspaces --all | lines) }
     else {
       [$focused_sid $last_sid]
     }
   )
   $ids_to_modify
   | uniq
-  | each {modify_args_per_workspace $in $focused_sid}
+  | each { modify_args_per_workspace $in $focused_sid }
   | flatten
   | append ["--set" $name $"label=($focused_sid)"]
 }

utils.nu

@@ -1,5 +1,34 @@
 use std assert
 
+def run_ide_check [
+  file: path
+] {
+  nu --ide-check 9999 $file
+  | lines
+  | each { $in | from json }
+  | flatten
+  | where severity? == Error
+  | reject start end
+}
+
+def str_repeat [
+  char: string
+  count: int
+] {
+  if $count < 1 { return '' }
+  1..$count | each { $char } | str join
+}
+
+def print_progress [
+  ratio: float
+  length: int = 20
+] {
+  let done = '▓'
+  let empty = '░'
+  let count = [1 (($ratio * $length) | into int)] | math max
+  print -n (str_repeat $done $count) (str_repeat $empty ($length - $count)) ($ratio * 100 | into string --decimals 0) %
+}
+
 # Test the topiary formatter with all nu files within a directory
 # each script should pass the idempotent check as well as the linter
 export def test_format [
@@ -8,22 +37,17 @@ export def test_format [
 ] {
   let files = glob $'($path | str trim -r -c '/')/**/*.nu'
   let target = "./test.nu"
-  for file in $files {
+  let len = $files | length
+  for i in 1..$len {
+    let file = $files | get ($i - 1)
+    print_progress ($i / $len)
+    print -n $"(ansi -e '1000D')"
     try {
       cp $file $target
+      let err_before = run_ide_check $target
       topiary format $target
-      let errors = nu --ide-check 9999 $target
-      | lines
-      | each {$in | from json}
-      | flatten
-      | (
-        where severity? == Error
-        and message? !~ '((File|Module|Variable) not found|Unknown command)'
-      )
-      if ($errors | length) > 0 {
-        print $errors
-      }
-      assert (($errors | length) == 0)
+      let err_after = run_ide_check $target
+      assert ($err_before == $err_after)
     } catch {
       print $file
       if $break {