Fixed ObjectPascal comment issue (#1097)

Fixes #1042.

Author: Chi-Iroh

lexers/embedded/objectpascal.xml

@@ -31,12 +31,9 @@
       <rule pattern="\{[$].*?\}|\{[-](NOD|EXT|OBJ).*?\}|\([*][$].*?[*]\)">
         <token type="CommentPreproc" />
       </rule>
-      <!-- Comment Single -->
-      <rule pattern="(//.*?)(\n)">
-        <bygroups>
-          <token type="CommentSingle" />
-          <token type="TextWhitespace" />
-        </bygroups>
+      <!-- Comment -->
+      <rule pattern="//.*">
+        <token type="CommentSingle" />
       </rule>
       <!-- Comment Multiline Block -->
       <rule pattern="\([*](.|\n)*?[*]\)">

lexers/testdata/objectpascal.expected

@@ -314,8 +314,7 @@
   {"type":"Text","value":"\n"},
   {"type":"TextWhitespace","value":"  "},
   {"type":"CommentSingle","value":"// Comment Single"},
-  {"type":"TextWhitespace","value":"\n"},
-  {"type":"Text","value":"\n"},
+  {"type":"Text","value":"\n\n"},
   {"type":"KeywordReserved","value":"const"},
   {"type":"Text","value":"\n"},
   {"type":"TextWhitespace","value":"  "},
@@ -412,8 +411,7 @@
   {"type":"CommentPreproc","value":"(*$hints off*)"},
   {"type":"TextWhitespace","value":" "},
   {"type":"CommentSingle","value":"// another valid compiler directive"},
-  {"type":"TextWhitespace","value":"\n"},
-  {"type":"Text","value":"\n"},
+  {"type":"Text","value":"\n\n"},
   {"type":"KeywordReserved","value":"const"},
   {"type":"Text","value":"\n"},
   {"type":"TextWhitespace","value":"   "},
@@ -896,15 +894,17 @@
   {"type":"Punctuation","value":";"},
   {"type":"TextWhitespace","value":" "},
   {"type":"CommentSingle","value":"// deprecated"},
-  {"type":"TextWhitespace","value":"\n  "},
+  {"type":"Text","value":"\n"},
+  {"type":"TextWhitespace","value":"  "},
   {"type":"Text","value":"LTDoubleRec"},
   {"type":"Operator","value":":"},
   {"type":"TextWhitespace","value":" "},
   {"type":"KeywordType","value":"TDoubleRec"},
   {"type":"Punctuation","value":";"},
   {"type":"TextWhitespace","value":" "},
   {"type":"CommentSingle","value":"// deprecated"},
-  {"type":"TextWhitespace","value":"\n  "},
+  {"type":"Text","value":"\n"},
+  {"type":"TextWhitespace","value":"  "},
   {"type":"Text","value":"LTExtended80Rec"},
   {"type":"Operator","value":":"},
   {"type":"TextWhitespace","value":" "},
@@ -1521,7 +1521,7 @@
   {"type":"Punctuation","value":";"},
   {"type":"TextWhitespace","value":" "},
   {"type":"CommentSingle","value":"// ???"},
-  {"type":"TextWhitespace","value":"\n"},
+  {"type":"Text","value":"\n"},
   {"type":"KeywordReserved","value":"end"},
   {"type":"Punctuation","value":";"},
   {"type":"Text","value":"\n\n"},
@@ -1541,7 +1541,7 @@
   {"type":"Punctuation","value":";"},
   {"type":"TextWhitespace","value":" "},
   {"type":"CommentSingle","value":"// this is hurting"},
-  {"type":"TextWhitespace","value":"\n"},
+  {"type":"Text","value":"\n"},
   {"type":"KeywordReserved","value":"var"},
   {"type":"Text","value":"\n"},
   {"type":"TextWhitespace","value":"  "},
@@ -1946,7 +1946,8 @@
   {"type":"Text","value":"eax"},
   {"type":"TextWhitespace","value":" "},
   {"type":"CommentSingle","value":"// fpc"},
-  {"type":"TextWhitespace","value":"\n    "},
+  {"type":"Text","value":"\n"},
+  {"type":"TextWhitespace","value":"    "},
   {"type":"Text","value":"mov"},
   {"type":"TextWhitespace","value":"   "},
   {"type":"Operator","value":"%"},
@@ -1959,7 +1960,8 @@
   {"type":"Text","value":"edx"},
   {"type":"TextWhitespace","value":" "},
   {"type":"CommentSingle","value":"// fpc"},
-  {"type":"TextWhitespace","value":"\n    "},
+  {"type":"Text","value":"\n"},
+  {"type":"TextWhitespace","value":"    "},
   {"type":"Text","value":"mov"},
   {"type":"TextWhitespace","value":"   "},
   {"type":"LiteralNumberHex","value":"$0x1000000"},
@@ -1968,7 +1970,8 @@
   {"type":"Text","value":"eax"},
   {"type":"TextWhitespace","value":" "},
   {"type":"CommentSingle","value":"// fpc assembler"},
-  {"type":"TextWhitespace","value":"\n    "},
+  {"type":"Text","value":"\n"},
+  {"type":"TextWhitespace","value":"    "},
   {"type":"Text","value":"DB"},
   {"type":"TextWhitespace","value":"    "},
   {"type":"LiteralString","value":"'a string...'"},
@@ -2388,7 +2391,7 @@
   {"type":"Text","value":"\n"},
   {"type":"TextWhitespace","value":"  "},
   {"type":"CommentSingle","value":"// DoIt"},
-  {"type":"TextWhitespace","value":"\n"},
+  {"type":"Text","value":"\n"},
   {"type":"KeywordReserved","value":"end"},
   {"type":"Punctuation","value":";"},
   {"type":"Text","value":"\n\n"},
@@ -2433,13 +2436,11 @@
   {"type":"KeywordReserved","value":"initialization"},
   {"type":"Text","value":"\n\n"},
   {"type":"CommentSingle","value":"// Unit initialization code..."},
-  {"type":"TextWhitespace","value":"\n"},
-  {"type":"Text","value":"\n"},
+  {"type":"Text","value":"\n\n"},
   {"type":"KeywordReserved","value":"finalization"},
   {"type":"Text","value":"\n\n"},
   {"type":"CommentSingle","value":"// Unit finalization code..."},
-  {"type":"TextWhitespace","value":"\n"},
-  {"type":"Text","value":"\n"},
+  {"type":"Text","value":"\n\n"},
   {"type":"KeywordReserved","value":"end"},
   {"type":"Punctuation","value":"."}
 ]