feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Fix preprocessor line offsets

Browse Source 
In TranslationUnit, the "normal" lines are based on utf16char offsets,
but the preprocessor lines were based on byte/latin1 offsets.

The preprocessor lines are now based on utf16char offsets, too.

Task-number: QTCREATORBUG-7356
Change-Id: I3c41d1dcee8e9e487210f36da806b0229d3f4cd0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-06-24 17:25:20 -04:00
parent fa24266972
commit 04d655dee0
3 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
View File

@@ -125,6 +125,7 @@ public:
// Preprocess source
Environment env;
Preprocessor preprocess(0, &env);
preprocess.setKeepComments(true);
const QByteArray preprocessedSource = preprocess.run(filePath, source);
document->setUtf8Source(preprocessedSource);
@@ -1687,6 +1688,26 @@ void tst_CheckSymbols::test_checksymbols_data()
<< Use(9, 1, 5, Highlighting::TypeUse)
<< Use(9, 1, 5, Highlighting::TypeUse)
<< Use(9, 9, 5, Highlighting::TypeUse));
#define UC_U10302_4TIMES UC_U10302 UC_U10302 UC_U10302 UC_U10302
#define UC_U10302_12TIMES UC_U10302_4TIMES UC_U10302_4TIMES UC_U10302_4TIMES
QTest::newRow("unicodeComments1")
<< _("#define NULL 0\n"
"\n"
"// " UC_U10302_12TIMES "\n"
"// " UC_U10302_12TIMES "\n"
"\n"
"class Foo {\n"
"double f(bool b = NULL);\n"
"Foo *x;\n"
"};\n")
<< (UseList()
<< Use(6, 7, 3, CppHighlightingSupport::TypeUse)
<< Use(7, 8, 1, CppHighlightingSupport::FunctionUse)
<< Use(8, 1, 3, CppHighlightingSupport::TypeUse)
<< Use(8, 6, 1, CppHighlightingSupport::FieldUse));
#undef UC_U10302_12TIMES
#undef UC_U10302_4TIMES
}
void tst_CheckSymbols::test_checksymbols_macroUses()