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

Clang: Extract a function

Browse Source 
Change-Id: I3041e019c2c65d9d988d31c47823e29955cd1c51
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-07-20 13:24:06 +02:00
parent 7b8f5d9815
commit 91ee695c71
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
View File

@@ -645,26 +645,31 @@ void ClangCompletionAssistProcessor::addCompletionItem(const QString &text,
m_completions.append(item); m_completions.append(item);
} }
ClangCompletionAssistProcessor::UnsavedFileContentInfo
ClangCompletionAssistProcessor::unsavedFileContent(const QByteArray &customFileContent) const
{
const bool hasCustomModification = !customFileContent.isEmpty();
UnsavedFileContentInfo info;
info.isDocumentModified = hasCustomModification || m_interface->textDocument()->isModified();
info.unsavedContent = hasCustomModification
? customFileContent
: m_interface->textDocument()->toPlainText().toUtf8();
return info;
}
void ClangCompletionAssistProcessor::sendFileContent(const QString &projectPartId, void ClangCompletionAssistProcessor::sendFileContent(const QString &projectPartId,
const QByteArray &customFileContent) const QByteArray &customFileContent)
{ {
const QTextDocument *textDocument = m_interface->textDocument();
const bool hasCustomModification = !customFileContent.isEmpty();
const bool documentIsModified = hasCustomModification || textDocument->isModified();
// TODO: Revert custom modification after the completions // TODO: Revert custom modification after the completions
QByteArray unsavedContent; const UnsavedFileContentInfo info = unsavedFileContent(customFileContent);
if (documentIsModified) {
unsavedContent = hasCustomModification
? customFileContent
: m_interface->textDocument()->toPlainText().toUtf8();
}
IpcCommunicator &ipcCommunicator = m_interface->ipcCommunicator(); IpcCommunicator &ipcCommunicator = m_interface->ipcCommunicator();
ipcCommunicator.registerFilesForCodeCompletion( ipcCommunicator.registerFilesForCodeCompletion(
{ClangBackEnd::FileContainer(m_interface->fileName(), {ClangBackEnd::FileContainer(m_interface->fileName(),
projectPartId, projectPartId,
Utf8String::fromByteArray(unsavedContent), Utf8String::fromByteArray(info.unsavedContent),
documentIsModified)}); info.isDocumentModified)});
} }
void ClangCompletionAssistProcessor::sendCompletionRequest(int position, void ClangCompletionAssistProcessor::sendCompletionRequest(int position,

6
src/plugins/clangcodemodel/clangcompletionassistprocessor.h
View File

@@ -81,6 +81,12 @@ private:
int order = 0, int order = 0,
const QVariant &data = QVariant()); const QVariant &data = QVariant());
struct UnsavedFileContentInfo {
QByteArray unsavedContent;
bool isDocumentModified = false;
};
UnsavedFileContentInfo unsavedFileContent(const QByteArray &customFileContent) const;
void sendFileContent(const QString &projectPartId, const QByteArray &customFileContent); void sendFileContent(const QString &projectPartId, const QByteArray &customFileContent);
void sendCompletionRequest(int position, const QByteArray &customFileContent); void sendCompletionRequest(int position, const QByteArray &customFileContent);