From b741f3cbd3dfde68bc13f35548f4326cb515c7a0 Mon Sep 17 00:00:00 2001
From: flywind <xzsflywind@gmail.com>
Date: Thu, 24 Mar 2022 04:09:44 +0800
Subject: [PATCH] fix nim check nimscript [backport: 1.6] (#19444)

fix #19440; fix #3858

(cherry picked from commit 7c3c61f2f1e898e5c70dfd619d94d09e339836e4)
---
 compiler/commands.nim             |  2 ++
 compiler/main.nim                 |  6 +++++-
 tests/newconfig/tconfigcheck.nims | 11 +++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/newconfig/tconfigcheck.nims

diff --git a/compiler/commands.nim b/compiler/commands.nim
index 58f6a651d5..d37e1c21d6 100644
--- a/compiler/commands.nim
+++ b/compiler/commands.nim
@@ -1090,6 +1090,8 @@ proc processArgument*(pass: TCmdLinePass; p: OptParser;
   else:
     if pass == passCmd1: config.commandArgs.add p.key
     if argsCount == 1:
+      if p.key.endsWith(".nims"):
+        incl(config.globalOptions, optWasNimscript)
       # support UNIX style filenames everywhere for portable build scripts:
       if config.projectName.len == 0:
         config.projectName = unixToNativePath(p.key)
diff --git a/compiler/main.nim b/compiler/main.nim
index e4ec4d7293..6a9b9985ec 100644
--- a/compiler/main.nim
+++ b/compiler/main.nim
@@ -58,6 +58,9 @@ proc commandCheck(graph: ModuleGraph) =
   let conf = graph.config
   conf.setErrorMaxHighMaybe
   defineSymbol(conf.symbols, "nimcheck")
+  if optWasNimscript in conf.globalOptions:
+    defineSymbol(conf.symbols, "nimscript")
+    defineSymbol(conf.symbols, "nimconfig")
   semanticPasses(graph)  # use an empty backend for semantic checking only
   compileProject(graph)
 
@@ -363,7 +366,8 @@ proc mainCommand*(graph: ModuleGraph) =
       msgWriteln(conf, "-- end of list --", {msgStdout, msgSkipHook})
 
       for it in conf.searchPaths: msgWriteln(conf, it.string)
-  of cmdCheck: commandCheck(graph)
+  of cmdCheck:
+    commandCheck(graph)
   of cmdParse:
     wantMainModule(conf)
     discard parseFile(conf.projectMainIdx, cache, conf)
diff --git a/tests/newconfig/tconfigcheck.nims b/tests/newconfig/tconfigcheck.nims
new file mode 100644
index 0000000000..2e12a0bda8
--- /dev/null
+++ b/tests/newconfig/tconfigcheck.nims
@@ -0,0 +1,11 @@
+discard """
+  cmd: "nim check $file"
+"""
+
+mode = ScriptMode.Verbose
+proc build() =
+  echo "building nim... "
+  exec "sleep 10"
+  echo getCurrentDir()
+
+echo "hello"