Fix Issue 12745 - [Ddoc] Underscore is removed from numbers

dlang · Jul 30, 2014 · 841d62b · 841d62b
1 parent ecb09de
commit 841d62b
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 1 deletion.
diff --git a/src/doc.c b/src/doc.c
@@ -2440,7 +2440,7 @@ void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, size_t offset)
                         }
 
                         // leading '_' means no highlight unless it's a reserved symbol name
-                        if (buf->data[i] == '_' &&
+                        if (buf->data[i] == '_' && (i == 0 || !isdigit(buf->data[i-1])) &&
                             (i == buf->size-1 || !isReservedName((utf8_t *)(buf->data + i), j - i)))
                         {
                             buf->remove(i, 1);

diff --git a/test/compilable/ddoc12745.d b/test/compilable/ddoc12745.d
@@ -0,0 +1,20 @@
+// EXTRA_SOURCES:
+// PERMUTE_ARGS:
+// REQUIRED_ARGS: -D -Dd${RESULTS_DIR}/compilable -o-
+// POST_SCRIPT: compilable/extra-files/ddocAny-postscript.sh 12745
+
+/**
+i underlined $(BR)
+_i not underlined $(BR)
+__i force underscore $(BR)
+$(BR)
+_0 not underscored $(BR)
+__0 force underscored
+
+Underscores:
+1_1 $(BR)
+1_a $(BR)
+a_1 $(BR)
+a_a $(BR)
+*/
+int i;
diff --git a/test/compilable/extra-files/ddoc12745.html b/test/compilable/extra-files/ddoc12745.html
@@ -0,0 +1,26 @@
+<html><head>
+        <META http-equiv="content-type" content="text/html; charset=utf-8">
+        <title>ddoc12745</title>
+        </head><body>
+        <h1>ddoc12745</h1>
+<br><br>
+<dl><dt><big><a name="i"></a>int <u>i</u>;
+</big></dt>
+<dd><u>i</u> underlined <br>
+i not underlined <br>
+_i force underscore <br>
+<br>
+0 not underscored <br>
+_0 force underscored
+<br><br>
+<b>Underscores:</b><br>
+1_1 <br>
+1_a <br>
+a_1 <br>
+a_a <br><br><br>
+
+</dd>
+</dl>
+
+        <hr><small>Page generated by <a href="http://dlang.org/ddoc.html">Ddoc</a>. </small>
+        </body></html>