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

LSP: Use document contents to collect search result texts

Browse Source 
Otherwise search results in modified files will get wrong line texts.

Change-Id: I7be4b27ebc5b250da3a3a0050de8646bcfcd010b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-06-25 13:42:35 +02:00
parent 8541650096
commit ac2c487e2e
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/languageclient/languageclientsymbolsupport.cpp
View File

@@ -139,23 +139,40 @@ struct ItemData
QVariant userData; QVariant userData;
}; };
static QStringList getFileContents(const QString &filePath)
{
QString fileContent;
if (TextEditor::TextDocument *document = TextEditor::TextDocument::textDocumentForFilePath(
Utils::FilePath::fromString(filePath))) {
fileContent = document->plainText();
} else {
Utils::TextFileFormat format;
format.lineTerminationMode = Utils::TextFileFormat::LFLineTerminator;
QString error;
const QTextCodec *codec = Core::EditorManager::defaultTextCodec();
if (Utils::TextFileFormat::readFile(filePath, codec, &fileContent, &format, &error)
!= Utils::TextFileFormat::ReadSuccess) {
qDebug() << "Failed to read file" << filePath << ":" << error;
}
}
return fileContent.split("\n");
}
QList<Core::SearchResultItem> generateSearchResultItems( QList<Core::SearchResultItem> generateSearchResultItems(
const QMap<QString, QList<ItemData>> &rangesInDocument) const QMap<QString, QList<ItemData>> &rangesInDocument)
{ {
QList<Core::SearchResultItem> result; QList<Core::SearchResultItem> result;
for (auto it = rangesInDocument.begin(); it != rangesInDocument.end(); ++it) { for (auto it = rangesInDocument.begin(); it != rangesInDocument.end(); ++it) {
const QString &fileName = it.key(); const QString &fileName = it.key();
QFile file(fileName);
file.open(QFile::ReadOnly);
Core::SearchResultItem item; Core::SearchResultItem item;
item.path = QStringList() << fileName; item.path = QStringList() << fileName;
item.useTextEditorFont = true; item.useTextEditorFont = true;
QStringList lines = QString::fromLocal8Bit(file.readAll()).split(QChar::LineFeed); QStringList lines = getFileContents(fileName);
for (const ItemData &data : it.value()) { for (const ItemData &data : it.value()) {
item.mainRange = data.range; item.mainRange = data.range;
if (file.isOpen() && data.range.begin.line > 0 && data.range.begin.line <= lines.size()) if (data.range.begin.line > 0 && data.range.begin.line <= lines.size())
item.text = lines[data.range.begin.line - 1]; item.text = lines[data.range.begin.line - 1];
else else
item.text.clear(); item.text.clear();