Correctly fix "Terminating NUL" fix

1cbe2313edda8a04f0fe233b4a29ef4e2485f557 "Terminating NUL at end of its buffer
is not considered part of OUString" was a thinko that cut the last character off
the last reported HighlightPortion on a line.

Change-Id: Idbe74676e85749cd93854293c6f49c7581414562

2 files changed, 89 insertions, 16 deletions

diff --git a/comphelper/qa/unit/syntaxhighlighttest.cxx b/comphelper/qa/unit/syntaxhighlighttest.cxx
index c576f7b7d85a..294db3e76fc0 100644
--- a/comphelper/qa/unit/syntaxhighlighttest.cxx
+++ b/comphelper/qa/unit/syntaxhighlighttest.cxx
@@ -21,13 +21,94 @@ class SyntaxHighlightTest : public CppUnit::TestFixture
 {
 public:
     void testBasicString();
+    void testBasicComment();
+    void testBasicCommentNewline();
+    void testBasicEmptyComment();
+    void testBasicEmptyCommentNewline();
+    void testBasic();
 
     CPPUNIT_TEST_SUITE(SyntaxHighlightTest);
     CPPUNIT_TEST(testBasicString);
+    CPPUNIT_TEST(testBasicComment);
+    CPPUNIT_TEST(testBasicCommentNewline);
+    CPPUNIT_TEST(testBasicEmptyComment);
+    CPPUNIT_TEST(testBasicEmptyCommentNewline);
+    CPPUNIT_TEST(testBasic);
     CPPUNIT_TEST_SUITE_END();
 };
 
-void SyntaxHighlightTest::testBasicString()
+void SyntaxHighlightTest::testBasicString() {
+    SyntaxHighlighter h;
+    h.initialize(HIGHLIGHT_BASIC);
+    OUString s("\"foo\"");
+    std::vector<HighlightPortion> ps;
+    h.getHighlightPortions(0, s, ps);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
+    CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
+    CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd);
+    CPPUNIT_ASSERT_EQUAL(TT_STRING, ps[0].tokenType);
+}
+
+void SyntaxHighlightTest::testBasicComment() {
+    SyntaxHighlighter h;
+    h.initialize(HIGHLIGHT_BASIC);
+    OUString s("' foo");
+    std::vector<HighlightPortion> ps;
+    h.getHighlightPortions(0, s, ps);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
+    CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
+    CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd);
+    CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType);
+}
+
+void SyntaxHighlightTest::testBasicCommentNewline() {
+    SyntaxHighlighter h;
+    h.initialize(HIGHLIGHT_BASIC);
+    OUString s("' foo\n");
+    std::vector<HighlightPortion> ps;
+    h.getHighlightPortions(0, s, ps);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast<std::vector<HighlightPortion>::size_type>(2), ps.size());
+    CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
+    CPPUNIT_ASSERT_EQUAL(5, ps[0].nEnd);
+    CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType);
+    CPPUNIT_ASSERT_EQUAL(5, ps[1].nBegin);
+    CPPUNIT_ASSERT_EQUAL(6, ps[1].nEnd);
+    CPPUNIT_ASSERT_EQUAL(TT_EOL, ps[1].tokenType);
+}
+
+void SyntaxHighlightTest::testBasicEmptyComment() {
+    SyntaxHighlighter h;
+    h.initialize(HIGHLIGHT_BASIC);
+    OUString s("'");
+    std::vector<HighlightPortion> ps;
+    h.getHighlightPortions(0, s, ps);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
+    CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
+    CPPUNIT_ASSERT_EQUAL(1, ps[0].nEnd);
+    CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType);
+}
+
+void SyntaxHighlightTest::testBasicEmptyCommentNewline() {
+    SyntaxHighlighter h;
+    h.initialize(HIGHLIGHT_BASIC);
+    OUString s("'\n");
+    std::vector<HighlightPortion> ps;
+    h.getHighlightPortions(0, s, ps);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast<std::vector<HighlightPortion>::size_type>(2), ps.size());
+    CPPUNIT_ASSERT_EQUAL(0, ps[0].nBegin);
+    CPPUNIT_ASSERT_EQUAL(1, ps[0].nEnd);
+    CPPUNIT_ASSERT_EQUAL(TT_COMMENT, ps[0].tokenType);
+    CPPUNIT_ASSERT_EQUAL(1, ps[1].nBegin);
+    CPPUNIT_ASSERT_EQUAL(2, ps[1].nEnd);
+    CPPUNIT_ASSERT_EQUAL(TT_EOL, ps[1].tokenType);
+}
+
+void SyntaxHighlightTest::testBasic()
 {
     OUString aBasicString("        if Mid(sText,iRun,1 )<> \" \" then Mid( sText ,iRun, 1, Chr( 1 + Asc( Mid(sText,iRun,1 )) ) '");
 
@@ -46,13 +127,6 @@ void SyntaxHighlightTest::testBasicString()
         prevEnd = itr->nEnd;
     }
     CPPUNIT_ASSERT_EQUAL(aBasicString.getLength(), prevEnd);
-
-    // The last portion is an empty comment consisting just of the leading
-    // apostrophe:
-    assert(!aPortions.empty());
-    CPPUNIT_ASSERT_EQUAL(98, aPortions.back().nBegin);
-    CPPUNIT_ASSERT_EQUAL(99, aPortions.back().nEnd);
-    CPPUNIT_ASSERT_EQUAL(TT_COMMENT, aPortions.back().tokenType);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SyntaxHighlightTest);
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index 83bcb59becc3..ca3207d73387 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -399,14 +399,13 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
             // Comment?
             if ( c == '\'' )
             {
-                c = getChar();
-
-                // Remove all characters until end of line or EOF
-                sal_Unicode cPeek = c;
-                while( cPeek != 0 && testCharFlags( cPeek, CHAR_EOL ) == sal_False )
-                {
+                // Skip all characters until end of input or end of line:
+                for (;;) {
+                    c = peekChar();
+                    if (c == 0 || testCharFlags(c, CHAR_EOL)) {
+                        break;
+                    }
                     getChar();
-                    cPeek = peekChar();
                 }
 
                 reType = TT_COMMENT;
@@ -540,7 +539,7 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
     // All other will remain TT_UNKNOWN
 
     // Save end position
-    rpEndPos = *mpActualPos == 0 ? mpActualPos - 1 : mpActualPos;
+    rpEndPos = mpActualPos;
     return sal_True;
 }