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

DiffEditor: add info bar for documents with encoding errors

Browse Source 
... with the option to reload the diff document with another encoding.

Fixes: QTCREATORBUG-23835
Change-Id: I1ce07b292688059b37535f2972970d8ea91be81b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2020-04-14 11:10:52 +02:00
parent d42920d372
commit 2f53f58280
5 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/diffeditor/diffeditordocument.cpp
View File

@@ -31,7 +31,9 @@
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <coreplugin/dialogs/codecselector.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <QCoreApplication>
#include <QFile>
@@ -314,10 +316,10 @@ Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const
beginReload();
QString patch;
ReadResult readResult = read(fileName, &patch, errorString);
if (readResult == TextFileFormat::ReadEncodingError)
return OpenResult::CannotHandle;
else if (readResult != TextFileFormat::ReadSuccess)
if (readResult == TextFileFormat::ReadIOError
|| readResult == TextFileFormat::ReadMemoryAllocationError) {
return OpenResult::ReadError;
}
bool ok = false;
QList<FileData> fileDataList = DiffUtils::readPatch(patch, &ok);
@@ -333,9 +335,29 @@ Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const
setDiffFiles(fileDataList, fi.absolutePath());
}
endReload(ok);
if (!ok && readResult == TextFileFormat::ReadEncodingError)
ok = selectEncoding();
return ok ? OpenResult::Success : OpenResult::CannotHandle;
}
bool DiffEditorDocument::selectEncoding()
{
Core::CodecSelector codecSelector(Core::ICore::dialogParent(), this);
switch (codecSelector.exec()) {
case Core::CodecSelector::Reload: {
setCodec(codecSelector.selectedCodec());
QString errorMessage;
return reload(&errorMessage, Core::IDocument::FlagReload, Core::IDocument::TypeContents);
}
case Core::CodecSelector::Save:
setCodec(codecSelector.selectedCodec());
return Core::EditorManager::saveDocument(this);
case Core::CodecSelector::Cancel:
break;
}
return false;
}
QString DiffEditorDocument::fallbackSaveAsFileName() const
{
const int maxSubjectLength = 50;