From 629b22e3d50e9903512ec893174eb797d9ed431b Mon Sep 17 00:00:00 2001
From: ee7 <45465154+ee7@users.noreply.github.com>
Date: Wed, 2 Dec 2020 20:48:16 +0100
Subject: [PATCH] styleCheck: Fix error for `sugar` and `std/with` (#16176)

With this commit, we no longer see an error if we pass
`--styleCheck:error` when compiling a file that contains `import sugar`
or `import std/with`.

The problem was that those modules (and only those modules) import
`std/private/underscored_calls`, which contained a styleCheck issue:
its spelling of `nnkArgList` didn't match the `nnkArglist` spelling in
`macros.nim`.

This commit fixes the issue by renaming `nnkArgList` to `nnkArglist`
repo-wide. The other way around would be a breaking change for code that
used `nnkArglist` and `--styleCheck:error`.

Fixes: #16174
---
 doc/manual_experimental.rst           | 2 +-
 lib/std/private/underscored_calls.nim | 2 +-
 tests/astspec/tastspec.nim            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual_experimental.rst b/doc/manual_experimental.rst
index caf3dfb481..dadcf62d45 100644
--- a/doc/manual_experimental.rst
+++ b/doc/manual_experimental.rst
@@ -1250,7 +1250,7 @@ all the arguments, but also the matched operators in reverse polish notation:
   echo x + y * z - x
 
 This passes the expression ``x + y * z - x`` to the ``optM`` macro as
-an ``nnkArgList`` node containing::
+an ``nnkArglist`` node containing::
 
   Arglist
     Sym "x"
diff --git a/lib/std/private/underscored_calls.nim b/lib/std/private/underscored_calls.nim
index f0bcbcc741..6d0a99ab50 100644
--- a/lib/std/private/underscored_calls.nim
+++ b/lib/std/private/underscored_calls.nim
@@ -39,7 +39,7 @@ proc underscoredCall(n, arg0: NimNode): NimNode =
     result.add arg0
 
 proc underscoredCalls*(result, calls, arg0: NimNode) =
-  expectKind calls, {nnkArgList, nnkStmtList, nnkStmtListExpr}
+  expectKind calls, {nnkArglist, nnkStmtList, nnkStmtListExpr}
 
   for call in calls:
     if call.kind in {nnkStmtList, nnkStmtListExpr}:
diff --git a/tests/astspec/tastspec.nim b/tests/astspec/tastspec.nim
index e2cfed2776..3413d32f33 100644
--- a/tests/astspec/tastspec.nim
+++ b/tests/astspec/tastspec.nim
@@ -929,7 +929,7 @@ static:
         (x & y & z) is string
 
     ast.peelOff({nnkStmtList, nnkTypeSection}).matchAst:
-    of nnkTypeDef(_, _, nnkTypeClassTy(nnkArgList, _, _, nnkStmtList)):
+    of nnkTypeDef(_, _, nnkTypeClassTy(nnkArglist, _, _, nnkStmtList)):
       # note this isn't nnkConceptTy!
       echo "ok"