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

C++ Macro Usages: Fix search result encoding and highlighting.

Browse Source 
If the result lines contain non-Latin1 characters (e.g. in comments),
the output is garbled. Using QByteArrays with toUtf8() and fromUtf8()
doesn't seem to be an alternative, as in this case the macro.offset() is
no longer valid.

So it seems to be the best to use QString for the result lines.

Task-number: QTCREATORBUG-7122
Change-Id: I57128c9c9f3eb182f079e305e97e9c5ac0a1bc61
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Andre Hartmann
2012-10-08 18:18:28 +02:00
committed by Erik Verbruggen
parent 00e8190801
commit 199b243bca
1 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/cpptools/cppfindreferences.cpp
View File

@@ -569,7 +569,7 @@ public:
return usages;
const Document::Ptr &doc = snapshot.document(fileName);
QByteArray source;
QString source;
foreach (const Document::MacroUse &use, doc->macroUses()) {
const Macro &useMacro = use.macro();
@@ -577,7 +577,7 @@ public:
&& useMacro.fileName() == macro.fileName())
{
if (source.isEmpty())
source = getSource(fileName, workingCopy).toLatin1(); // ### FIXME: Encoding?
source = getSource(fileName, workingCopy);
unsigned lineStart;
const QString &lineSource = matchingLine(use.begin(), source, &lineStart);
@@ -592,29 +592,18 @@ public:
}
// ### FIXME: Pretty close to FindUsages::matchingLine.
static QString matchingLine(unsigned position, const QByteArray &source,
static QString matchingLine(unsigned position, const QString &source,
unsigned *lineStart = 0)
{
const char *beg = source.constData();
const char *start = beg + position;
for (; start != beg - 1; --start) {
if (*start == '\n')
break;
}
++start;
const char *end = start + 1;
for (; *end; ++end) {
if (*end == '\n')
break;
}
int lineBegin = source.lastIndexOf(QLatin1Char('\n'), position) + 1;
int lineEnd = source.indexOf(QLatin1Char('\n'), position);
if (lineEnd == -1)
lineEnd = source.length();
if (lineStart)
*lineStart = start - beg;
*lineStart = lineBegin;
// ### FIXME: Encoding?
const QString matchingLine = QString::fromUtf8(start, end - start);
const QString matchingLine = source.mid(lineBegin, lineEnd - lineBegin);
return matchingLine;
}
};
@@ -678,15 +667,11 @@ void CppFindReferences::findMacroUses(const Macro &macro, const QString &replace
// add the macro definition itself
{
// ### FIXME: Encoding?
const QByteArray &source = getSource(macro.fileName(), workingCopy).toLatin1();
int lineBegin = source.lastIndexOf('\n', macro.offset()) + 1;
int lineEnd = source.indexOf('\n', macro.offset());
if (lineEnd == -1)
lineEnd = source.length();
const QByteArray line = source.mid(lineBegin, lineEnd - lineBegin);
const QString &source = getSource(macro.fileName(), workingCopy);
unsigned lineStart;
const QString line = FindMacroUsesInFile::matchingLine(macro.offset(), source, &lineStart);
search->addResult(macro.fileName(), macro.line(), line,
line.indexOf(macro.name()), macro.name().length());
macro.offset() - lineStart, macro.name().length());
}
QFuture<Usage> result;