Fixed: Do not randomly remove slashes from comments, fixes #656

protobufjs · Jan 24, 2017 · 301f776 · 301f776
1 parent 3317a76
commit 301f776
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 13 deletions.
diff --git a/dist/light/protobuf.js b/dist/light/protobuf.js
diff --git a/dist/light/protobuf.min.js b/dist/light/protobuf.min.js
diff --git a/dist/light/protobuf.min.js.gz b/dist/light/protobuf.min.js.gz
diff --git a/dist/minimal/protobuf.js b/dist/minimal/protobuf.js
diff --git a/dist/minimal/protobuf.min.js b/dist/minimal/protobuf.min.js
diff --git a/dist/minimal/protobuf.min.js.gz b/dist/minimal/protobuf.min.js.gz
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/src/tokenize.js b/src/tokenize.js
@@ -117,7 +117,7 @@ function tokenize(source) {
             .substring(start, end)
             .split(/\n/g);
         for (var i = 0; i < lines.length; ++i)
-            lines[i] = lines[i].replace(/ *[*/]+ */, "").trim();
+            lines[i] = lines[i].replace(/^ *[*/]+ */, "").trim();
         commentText = lines
             .join("\n")
             .trim();

diff --git a/tests/data/comments.proto b/tests/data/comments.proto
@@ -20,7 +20,7 @@ message Test1 {
     // Field with no comment.
     uint32 field2 = 2;
 
-    bool field3 = 3; /// Field with a comment.
+    bool field3 = 3; /// Field with a comment and a <a href="http://example.com/foo/">link</a>
 }
 
 // Message

diff --git a/tests/docs_comments.js b/tests/docs_comments.js
@@ -13,7 +13,7 @@ tape.test("proto comments", function(test) {
 
         test.equal(root.lookup("Test1.field1").comment, "Field with a comment.", "should parse blocks for message fields");
         test.equal(root.lookup("Test1.field2").comment, null, "should not parse lines for message fields");
-        test.equal(root.lookup("Test1.field3").comment, "Field with a comment.", "should parse triple-slash lines for message fields");
+        test.equal(root.lookup("Test1.field3").comment, "Field with a comment and a <a href=\"http://example.com/foo/\">link</a>", "should parse triple-slash lines for message fields");
 
         test.equal(root.lookup("Test3").comments.ONE, "Value with a comment.", "should parse blocks for enum values");
         test.equal(root.lookup("Test3").comments.TWO, null, "should not parse lines for enum values");