From a65ce2f24ea5c0f07e480298dc66200c0142dd7b Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Sun, 24 Jun 2018 16:48:38 +0200
Subject: [PATCH] Display the correct line number when executing the extracted
 public tests

---
 test/tests_extractor/ascii.d.ext     | 30 ++++++++---------
 test/tests_extractor/iteration.d.ext | 50 ++++++++++++++--------------
 tests_extractor.d                    | 10 ++++--
 3 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/test/tests_extractor/ascii.d.ext b/test/tests_extractor/ascii.d.ext
index d7fd8ae..0c2d368 100644
--- a/test/tests_extractor/ascii.d.ext
+++ b/test/tests_extractor/ascii.d.ext
@@ -1,4 +1,4 @@
-// Line 109
+# line 107
 unittest
 {
     import std.ascii;
@@ -11,7 +11,7 @@ unittest
     assert(!isAlphaNum('á'));
 }
 
-// Line 140
+# line 138
 unittest
 {
     import std.ascii;
@@ -24,7 +24,7 @@ unittest
     assert(!isAlpha('á'));
 }
 
-// Line 170
+# line 168
 unittest
 {
     import std.ascii;
@@ -38,7 +38,7 @@ unittest
     assert(!isLower('Á'));
 }
 
-// Line 201
+# line 199
 unittest
 {
     import std.ascii;
@@ -52,7 +52,7 @@ unittest
     assert(!isUpper('Á'));
 }
 
-// Line 232
+# line 230
 unittest
 {
     import std.ascii;
@@ -67,7 +67,7 @@ unittest
     assert(!isDigit('４')); // full-width digit four (U+FF14)
 }
 
-// Line 264
+# line 262
 unittest
 {
     import std.ascii;
@@ -79,7 +79,7 @@ unittest
     assert(!isOctalDigit('#'));
 }
 
-// Line 293
+# line 291
 unittest
 {
     import std.ascii;
@@ -92,7 +92,7 @@ unittest
     assert(!isHexDigit('#'));
 }
 
-// Line 325
+# line 323
 unittest
 {
     import std.ascii;
@@ -110,7 +110,7 @@ unittest
     assert(!isWhite('\u00A0')); // std.ascii.isWhite
 }
 
-// Line 360
+# line 358
 unittest
 {
     import std.ascii;
@@ -129,7 +129,7 @@ unittest
     assert(!isControl('\u2029'));
 }
 
-// Line 399
+# line 397
 unittest
 {
     import std.ascii;
@@ -153,7 +153,7 @@ unittest
     assert(!isPunctuation('\u2012')); // (U+2012 = en-dash)
 }
 
-// Line 443
+# line 441
 unittest
 {
     import std.ascii;
@@ -169,7 +169,7 @@ unittest
     assert(!isGraphical('á'));
 }
 
-// Line 479
+# line 477
 unittest
 {
     import std.ascii;
@@ -184,7 +184,7 @@ unittest
     assert(!isPrintable('á'));
 }
 
-// Line 515
+# line 513
 unittest
 {
     import std.ascii;
@@ -193,7 +193,7 @@ unittest
     assert(!isASCII('á'));
 }
 
-// Line 556
+# line 554
 unittest
 {
     import std.ascii;
@@ -206,7 +206,7 @@ unittest
     assert(toLower('Á') == 'Á');
 }
 
-// Line 618
+# line 616
 unittest
 {
     import std.ascii;
diff --git a/test/tests_extractor/iteration.d.ext b/test/tests_extractor/iteration.d.ext
index cacb6c2..56d5f82 100644
--- a/test/tests_extractor/iteration.d.ext
+++ b/test/tests_extractor/iteration.d.ext
@@ -1,4 +1,4 @@
-// Line 165
+# line 163
 unittest
 {
     import std.algorithm.iteration;
@@ -42,7 +42,7 @@ unittest
     assert(counter == iota(-4, 5).length);
 }
 
-// Line 220
+# line 218
 unittest
 {
     import std.algorithm.iteration;
@@ -62,7 +62,7 @@ unittest
     assert(i == 3); //cache has accessed 3. It is still stored internally by cache.
 }
 
-// Line 497
+# line 495
 unittest
 {
     import std.algorithm.iteration;
@@ -75,7 +75,7 @@ unittest
     assert(equal(squares, [ 1, 4, 9, 16, 25, 36 ]));
 }
 
-// Line 512
+# line 510
 unittest
 {
     import std.algorithm.iteration;
@@ -92,7 +92,7 @@ unittest
     }
 }
 
-// Line 530
+# line 528
 unittest
 {
     import std.algorithm.iteration;
@@ -104,7 +104,7 @@ unittest
     assert(equal(stringize([ 1, 2, 3, 4 ]), [ "1", "2", "3", "4" ]));
 }
 
-// Line 957
+# line 955
 unittest
 {
     import std.algorithm.iteration;
@@ -147,7 +147,7 @@ unittest
     assert(s.x == 1);
 }
 
-// Line 1102
+# line 1100
 unittest
 {
     import std.algorithm.iteration;
@@ -178,7 +178,7 @@ unittest
     assert(approxEqual(r1, [ 2.5 ]));
 }
 
-// Line 1322
+# line 1320
 unittest
 {
     import std.algorithm.iteration;
@@ -199,7 +199,7 @@ unittest
     assert(r.back == 102);
 }
 
-// Line 1504
+# line 1502
 unittest
 {
     import std.algorithm.iteration;
@@ -212,7 +212,7 @@ unittest
         tuple(4, 3u), tuple(5, 1u) ][]));
 }
 
-// Line 1518
+# line 1516
 unittest
 {
     import std.algorithm.iteration;
@@ -229,7 +229,7 @@ unittest
     assert(result == ["a": 2U, "b": 2U, "c": 3U, "d": 1U, "e": 1U]);
 }
 
-// Line 1909
+# line 1907
 unittest
 {
     import std.algorithm.iteration;
@@ -258,7 +258,7 @@ unittest
     ]));
 }
 
-// Line 1959
+# line 1957
 unittest
 {
     import std.algorithm.iteration;
@@ -310,7 +310,7 @@ unittest
     }
 }
 
-// Line 2282
+# line 2280
 unittest
 {
     import std.algorithm.iteration;
@@ -327,7 +327,7 @@ unittest
     assert(["", ""].joiner("xyz").equal("xyz"));
 }
 
-// Line 2885
+# line 2883
 unittest
 {
     import std.algorithm.iteration;
@@ -377,7 +377,7 @@ unittest
     assert(approxEqual(r2, 112.5));
 }
 
-// Line 2940
+# line 2938
 unittest
 {
     import std.algorithm.iteration;
@@ -402,7 +402,7 @@ unittest
     auto stdev = sqrt(r[1] / a.length - avg * avg);
 }
 
-// Line 3212
+# line 3210
 unittest
 {
     import std.algorithm.iteration;
@@ -431,7 +431,7 @@ unittest
     assert(arr.fold!((a, b) => b) == 5);
 }
 
-// Line 3420
+# line 3418
 unittest
 {
     import std.algorithm.iteration;
@@ -482,7 +482,7 @@ unittest
     assert(approxEqual(r2, [3, 7, 107, 109.5, 112.5]));
 }
 
-// Line 3476
+# line 3474
 unittest
 {
     import std.algorithm.iteration;
@@ -505,7 +505,7 @@ unittest
     assert(approxEqual(r2.map!"a[1]", [9, 25, 74, 195, 204, 208, 233])); // sum of squares
 }
 
-// Line 3833
+# line 3831
 unittest
 {
     import std.algorithm.iteration;
@@ -524,7 +524,7 @@ unittest
     assert(equal(splitter!"a.front == b"(w, 1), [ [[0]], [[2]] ]));
 }
 
-// Line 4071
+# line 4069
 unittest
 {
     import std.algorithm.iteration;
@@ -541,7 +541,7 @@ unittest
     assert(equal(splitter(a, [0, 0]), [ [], [1] ]));
 }
 
-// Line 4220
+# line 4218
 unittest
 {
     import std.algorithm.iteration;
@@ -561,7 +561,7 @@ unittest
     assert(equal(splitter!(a => a.front == 1)(w), [ [[0]], [[2]] ]));
 }
 
-// Line 4509
+# line 4507
 unittest
 {
     import std.algorithm.iteration;
@@ -571,7 +571,7 @@ unittest
     assert(equal(splitter(a), ["a", "bcd", "ef", "gh"][]));
 }
 
-// Line 4822
+# line 4820
 unittest
 {
     import std.algorithm.iteration;
@@ -603,7 +603,7 @@ unittest
                .approxEqual((ulong.max / 2) * 4096.0 + 4096^^2 / 2));
 }
 
-// Line 4954
+# line 4952
 unittest
 {
     import std.algorithm.iteration;
@@ -624,7 +624,7 @@ unittest
     assert(equal(uniq([ 1, 1, 2, 1, 1, 3, 1]), [1, 2, 1, 3, 1]));
 }
 
-// Line 5180
+# line 5178
 unittest
 {
     import std.algorithm.iteration;
diff --git a/tests_extractor.d b/tests_extractor.d
index eac728f..f7099d2 100755
--- a/tests_extractor.d
+++ b/tests_extractor.d
@@ -67,9 +67,13 @@ class TestVisitor : ASTVisitor
 private:
     void print(const Unittest u)
     {
-
-        // write the origin source code line
-        outFile.writefln("// Line %d", u.line);
+        /*
+        Write the origin source code line
+        u.line is the first line of the unittest block, hence we need to
+        subtract two lines from it as we add "import <current.module>\n\n" at
+        the top of the unittest.
+        */
+        outFile.writefln("# line %d", u.line > 2 ? u.line - 2 : 0);
 
         // write the unittest block
         outFile.write("unittest\n{\n");