diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-28 08:47:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-28 10:47:19 +0100 |
| commit | a699e7c70d312c96d0dbb8eb4c31b81129dcf7b2 (patch) | |
| tree | 0ec459eb9dd628f5ae8dcd755ac0deb4c3a3c6e1 /comphelper | |
| parent | a027fa423876a3c9a4f3edfcd3a35ae1e83b068f (diff) | |
Revert "COMPHELPER: Allow empty comments in SyntaxHighlight"
This reverts commit a79cb836b951eb2492e43aadd2ee672b9b67b914, which broke
--with-help builds again, as
strLine.copy(i->nBegin, i->nEnd-i->nBegin)
in BasicCodeTagger::tagParagraph (helpcompiler/source/BasCodeTagger.cxx) depends
on the invariant that a HighlightPortion does not extend past the source string.
Also, I see no reason for that change, as empty comments are handled just fine
already as demonstrated by the following commit...
Change-Id: I384bae9c4cf6a38d0a0a2832fa15bde82126cace
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/qa/unit/syntaxhighlighttest.cxx | 5 | ||||
| -rw-r--r-- | comphelper/source/misc/syntaxhighlight.cxx | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/comphelper/qa/unit/syntaxhighlighttest.cxx b/comphelper/qa/unit/syntaxhighlighttest.cxx index d26b8556681d..8fab0677d4eb 100644 --- a/comphelper/qa/unit/syntaxhighlighttest.cxx +++ b/comphelper/qa/unit/syntaxhighlighttest.cxx @@ -41,11 +41,10 @@ void SyntaxHighlightTest::testBasicString() aPortions.begin(), itrEnd = aPortions.end(); itr != itrEnd; ++itr) { CPPUNIT_ASSERT_EQUAL(prevEnd, itr->nBegin); - //The comment is empty, so empty zone - CPPUNIT_ASSERT(itr->nBegin <= itr->nEnd); + CPPUNIT_ASSERT(itr->nBegin < itr->nEnd); prevEnd = itr->nEnd; } - CPPUNIT_ASSERT_EQUAL(aBasicString.getLength() - 1, prevEnd); + CPPUNIT_ASSERT_EQUAL(aBasicString.getLength(), prevEnd); } CPPUNIT_TEST_SUITE_REGISTRATION(SyntaxHighlightTest); diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index c6340ef68f54..83bcb59becc3 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -399,14 +399,16 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType, // Comment? if ( c == '\'' ) { - c = peekChar(); + c = getChar(); // Remove all characters until end of line or EOF sal_Unicode cPeek = c; while( cPeek != 0 && testCharFlags( cPeek, CHAR_EOL ) == sal_False ) { - cPeek = getChar(); + getChar(); + cPeek = peekChar(); } + reType = TT_COMMENT; } @@ -672,7 +674,7 @@ void SimpleTokenizer_Impl::getHighlightPortions( sal_uInt32 nParseLine, const OU const sal_Unicode* pEndPos; // Loop over all the tokens - while( getNextToken( eType, pStartPos, pEndPos ) ) + while( getNextToken( eType, pStartPos, pEndPos ) ) { portions.push_back( HighlightPortion( |