mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMPHELPER: Allow empty comments in SyntaxHighlight

Browse Source 
Change-Id: I0f3d5673e28e34ed3921c930aca48f3d7574b064
Reviewed-on: https://gerrit.libreoffice.org/6450
Reviewed-by: Arnaud Versini <arnaud.versini@libreoffice.org>
Tested-by: Arnaud Versini <arnaud.versini@libreoffice.org>
This commit is contained in:
Arnaud Versini 2013-10-27 15:15:30 +01:00
parent 591827c9ad
commit a79cb836b9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
comphelper/qa/unit/syntaxhighlighttest.cxx
View File

@ -41,10 +41,11 @@ void SyntaxHighlightTest::testBasicString()
aPortions.begin(), itrEnd = aPortions.end(); itr != itrEnd; ++itr) aPortions.begin(), itrEnd = aPortions.end(); itr != itrEnd; ++itr)
{ {
CPPUNIT_ASSERT_EQUAL(prevEnd, itr->nBegin); CPPUNIT_ASSERT_EQUAL(prevEnd, itr->nBegin);
CPPUNIT_ASSERT(itr->nBegin < itr->nEnd); //The comment is empty, so empty zone
CPPUNIT_ASSERT(itr->nBegin <= itr->nEnd);
prevEnd = itr->nEnd; prevEnd = itr->nEnd;
} }
CPPUNIT_ASSERT_EQUAL(aBasicString.getLength(), prevEnd); CPPUNIT_ASSERT_EQUAL(aBasicString.getLength() - 1, prevEnd);
} }
CPPUNIT_TEST_SUITE_REGISTRATION(SyntaxHighlightTest); CPPUNIT_TEST_SUITE_REGISTRATION(SyntaxHighlightTest);

8
comphelper/source/misc/syntaxhighlight.cxx
View File

@ -399,16 +399,14 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
// Comment? // Comment?
if ( c == '\'' ) if ( c == '\'' )
{ {
c = getChar(); c = peekChar();
// Remove all characters until end of line or EOF // Remove all characters until end of line or EOF
sal_Unicode cPeek = c; sal_Unicode cPeek = c;
while( cPeek != 0 && testCharFlags( cPeek, CHAR_EOL ) == sal_False ) while( cPeek != 0 && testCharFlags( cPeek, CHAR_EOL ) == sal_False )
{ {
getChar(); cPeek = getChar();
cPeek = peekChar();
} }
reType = TT_COMMENT; reType = TT_COMMENT;
} }
@ -674,7 +672,7 @@ void SimpleTokenizer_Impl::getHighlightPortions( sal_uInt32 nParseLine, const OU
const sal_Unicode* pEndPos; const sal_Unicode* pEndPos;
// Loop over all the tokens // Loop over all the tokens
while( getNextToken( eType, pStartPos, pEndPos ) ) while( getNextToken( eType, pStartPos, pEndPos ) )
{ {
portions.push_back( portions.push_back(
HighlightPortion( HighlightPortion(