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

Core: filepathify expected document changes

Browse Source 
Change-Id: Ifa9341e55c79459db9ecef3c441da9b2816695bf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-06-09 09:59:37 +02:00
parent 072958c3b0
commit 410b02f8c5
19 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/externaltool.cpp
View File

@@ -644,12 +644,12 @@ void ExternalToolRunner::run()
}
if (m_tool->modifiesCurrentDocument()) {
if (IDocument *document = EditorManager::currentDocument()) {
m_expectedFileName = document->filePath().toString();
m_expectedFilePath = document->filePath();
if (!DocumentManager::saveModifiedDocument(document)) {
deleteLater();
return;
}
DocumentManager::expectFileChange(m_expectedFileName);
DocumentManager::expectFileChange(m_expectedFilePath);
}
}
m_process = new QtcProcess(this);
@@ -687,7 +687,7 @@ void ExternalToolRunner::finished()
ExternalToolManager::emitReplaceSelectionRequested(m_processOutput);
}
if (m_tool->modifiesCurrentDocument())
DocumentManager::unexpectFileChange(m_expectedFileName);
DocumentManager::unexpectFileChange(m_expectedFilePath);
const auto write = m_tool->outputHandling() == ExternalTool::ShowInPane
? QOverload<const QString &>::of(MessageManager::writeFlashing)
: QOverload<const QString &>::of(MessageManager::writeSilently);
@@ -698,7 +698,7 @@ void ExternalToolRunner::finished()
void ExternalToolRunner::error(QProcess::ProcessError error)
{
if (m_tool->modifiesCurrentDocument())
DocumentManager::unexpectFileChange(m_expectedFileName);
DocumentManager::unexpectFileChange(m_expectedFilePath);
// TODO inform about errors
Q_UNUSED(error)
deleteLater();