From 01dc38a05cde387b7b4ad512505bd6dabce4893d Mon Sep 17 00:00:00 2001
From: Tomasz Kramkowski <tk@the-tk.com>
Date: Fri, 29 Oct 2021 10:39:41 +0100
Subject: [PATCH] Fix nimIdentNormalize, fixes #19067 (#19068)

* Make nimIdentNormalize return "" when passed ""; fixes #19067

Fixes #19067

* Add tests for nimIdentNormalize

(cherry picked from commit ee703c5db4ceb8d0228b4429c53d85d5f1ff91ea)
---
 lib/pure/strutils.nim      | 5 +++--
 tests/stdlib/tstrutils.nim | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim
index 187ee1f7b1b3..d5f143628322 100644
--- a/lib/pure/strutils.nim
+++ b/lib/pure/strutils.nim
@@ -276,8 +276,9 @@ func nimIdentNormalize*(s: string): string =
   runnableExamples:
     doAssert nimIdentNormalize("Foo_bar") == "Foobar"
   result = newString(s.len)
-  if s.len > 0:
-    result[0] = s[0]
+  if s.len == 0:
+    return
+  result[0] = s[0]
   var j = 1
   for i in 1..len(s) - 1:
     if s[i] in {'A'..'Z'}:
diff --git a/tests/stdlib/tstrutils.nim b/tests/stdlib/tstrutils.nim
index 234991bdbf96..8000b6b07049 100644
--- a/tests/stdlib/tstrutils.nim
+++ b/tests/stdlib/tstrutils.nim
@@ -841,5 +841,12 @@ bar
     doAssert s.endsWith('a') == false
     doAssert s.endsWith('\0') == false
 
+  block: # nimIdentNormalize
+    doAssert nimIdentNormalize("") == ""
+    doAssert nimIdentNormalize("foo") == "foo"
+    doAssert nimIdentNormalize("foo_bar") == "foobar"
+    doAssert nimIdentNormalize("Foo_bar") == "Foobar"
+    doAssert nimIdentNormalize("_Foo_bar") == "_foobar"
+
 static: main()
 main()