Merge remote-tracking branch 'origin/master' into render-infix-3

Author: arnetheduck

.github/workflows/release.yml

@@ -74,9 +74,15 @@ jobs:
           curl -L "https://curl.se/ca/cacert.pem" -o cacert.pem
           echo "$PWD" >> $GITHUB_PATH
 
+      - uses: jiro4989/setup-nim-action@v2
+        with:
+          nim-version: '2.0.2' # default is 'stable'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build nph
         run: |
-            nimble setup -l
+            nimble install -y
+            # nimble setup -l
             nimble build -d:release
 
       - name: Create archive

format-git-repo.sh

@@ -9,15 +9,14 @@ git ls-files | grep ".nim$" | xargs -n1 nph
 
 ! git diff --exit-code > /dev/null || { echo "This repository is already formatted" ; exit 0 ; }
 
-git commit -am "Formatted with nph $(nph --version)"
+git commit -am "Formatted with nph $(nph --version)" --author "nph <[email protected]>"
 
 echo "# Formatted with nph $(nph --version)" >> .git-blame-ignore-revs
 echo "$(git rev-parse HEAD)" >> .git-blame-ignore-revs
 
 git add .git-blame-ignore-revs
-git commit -m "Add $(git rev-parse HEAD) to .git-blame-ignore-revs"
+git commit -m "Add $(git rev-parse HEAD) to .git-blame-ignore-revs" --author "nph <[email protected]>"
 
 echo "The repo has been updated with two commits recording the reformatting and blame information."
 echo "You can review the changes with 'git diff HEAD^^' before pushing to a public repository."
 echo "If you don't want blame information, remove the last commit with 'git reset --hard HEAD^'."
-

nph.nimble

@@ -94,10 +94,10 @@ proc commitProject(
 
   try:
     exec "git checkout -b nph"
-    exec "git commit -am \"Formatted with nph $(nph --version)\""
+    exec "git commit -am \"Formatted with nph $(nph --version)\" --author \"nph <[email protected]>\""
   except:
     exec "git checkout nph"
-    exec "git commit -am \"Formatted with nph $(nph --version)\" --amend"
+    exec "git commit -am \"Formatted with nph $(nph --version)\" --amend --author \"nph <[email protected]>\""
 
   cd "../.."
 

src/phmsgs.nim

@@ -139,8 +139,7 @@ proc fileInfoIdx*(
         if pseudoPath:
           RelativeFile filename
         else:
-          relativeTo(canon, conf.projectPath)
-        ,
+          relativeTo(canon, conf.projectPath),
       )
     )
 

src/phrenderer.nim

@@ -527,8 +527,7 @@ proc init(T: type TSrcLen, g: TSrcGen): T =
       if g.tokens.len > 0:
         @[g.tokens[^1]]
       else:
-        @[]
-    ,
+        @[],
     config: g.config,
   )
 
@@ -836,7 +835,8 @@ proc gsonsNL(
 ) =
   for i in start .. n.len + theEnd:
     gsub(g, n[i], flags)
-    g.optNL()
+    if i != n.len + theEnd:
+      g.optNL()
 
 proc glist(
     g: var TOutput,
@@ -977,10 +977,6 @@ proc gstmts(g: var TOutput, n: PNode, flags: SubFlags = {}, doIndent = true) =
 
   dedent(g, ind)
 
-  if not trivial:
-    optNL(g)
-  # if not trivial:
-  #   optNL(g)
   if needsPar:
     if not trivial:
       optNL(g)
@@ -1095,7 +1091,7 @@ proc gif(g: var TOutput, n: PNode, flags: SubFlags) =
     if oneline:
       # We end up here when rendering things that were parsed as expressions but
       # don't match the "trivial" rule above
-      # TODO treat such constructs as trivail for better determinism?
+      # TODO treat such constructs as trivial for better determinism?
       gsons(g, n, 1)
     else:
       optNL(g)
@@ -1133,8 +1129,7 @@ proc gtry(g: var TOutput, n: PNode) =
       if trivial:
         {sfOneLine}
       else:
-        {}
-    ,
+        {},
   )
 
 proc gfor(g: var TOutput, n: PNode) =
@@ -2220,8 +2215,7 @@ proc renderTree*(n: PNode, conf: ConfigRef = nil): string =
     if conf == nil:
       newPartialConfigRef()
     else:
-      conf
-    ,
+      conf,
   )
   # do not indent the initial statement list so that
   # writeFile("file.nim", repr n)

tests/after/comments.nim

@@ -330,8 +330,7 @@ discard
   54 # discard value
 
 proc x() =
-  discard
-  # proc, impl and comment on one line
+  discard # proc, impl and comment on one line
 
 proc xxx() = # after proc before indented name
   discard

tests/after/comments.nim.nph.yaml

@@ -1205,8 +1205,8 @@ sons:
           - kind: "nkDiscardStmt"
             sons:
               - kind: "nkEmpty"
-          - kind: "nkCommentStmt"
-            "comment": "# proc, impl and comment on one line"
+            postfix:
+              - "# proc, impl and comment on one line"
   - kind: "nkProcDef"
     mid:
       - "# after proc before indented name"

tests/after/postexprs.nim

@@ -94,8 +94,7 @@ else:
 
 discard (
   aaa.bbb.exec do(res: int64):
-    size = res
-).ccc()
+    size = res).ccc()
 
 macro `->`(a, b, c: untyped) =
   discard

tests/after/procs.nim

@@ -131,8 +131,7 @@ type Ep = proc {.nimcall.}
 type Fp = proc(
   aaaaaaaaaaaaaaaaa: int,
   bbbbbbbbbbbbbbb = proc() =
-    discard
-  ,
+    discard,
   cccccccccccccccccc = 30,
 )
 

tests/after/style.nim

@@ -39,8 +39,7 @@ functionCall(10000000, 2000000000, 3000000000, 40000000, 5000000000)
 proc f(
   myParameter = 0,
   callback: SomeCallback = proc() =
-    discard
-  ,
+    discard,
   nextParameter = 1,
 )