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

ProjectExplorer: Allow extra compilers to post compile issues

Browse Source 
If we have a text editor for the source document the errors will be
highlighted in the editor then.

Change-Id: I02ed24783e7079c3d2cb308d8111b399cd77adb1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-01-22 11:58:37 +01:00
parent 2b48a4fa27
commit 8643877c33
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/projectexplorer/extracompiler.cpp
View File

@@ -30,12 +30,17 @@
#include "buildconfiguration.h"
#include "kitinformation.h"
#include <texteditor/texteditor.h>
#include <texteditor/texteditorsettings.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/fontsettings.h>
#include <utils/qtcassert.h>
#include <coreplugin/idocument.h>
#include <coreplugin/editormanager/editormanager.h>
#include <QDateTime>
#include <QTimer>
#include <QTextBlock>
namespace ProjectExplorer {
@@ -48,6 +53,7 @@ public:
Utils::FileName source;
Utils::FileNameList targets;
QVector<QString> contents;
QList<Task> issues;
QDateTime compileTime;
Core::IEditor *lastEditor = 0;
QMetaObject::Connection activeBuildConfigConnection;
@@ -55,6 +61,7 @@ public:
bool dirty = false;
QTimer timer;
void updateIssues();
};
ExtraCompiler::ExtraCompiler(const Project *project, const Utils::FileName &source,
@@ -207,6 +214,7 @@ void ExtraCompiler::onEditorChanged(Core::IEditor *editor)
if (editor && editor->document()->filePath() == d->source) {
d->lastEditor = editor;
d->updateIssues();
// Handle new editor
connect(d->lastEditor->document(), &Core::IDocument::contentsChanged,
@@ -291,6 +299,41 @@ Utils::Environment ExtraCompiler::buildEnvironment() const
return Utils::Environment::systemEnvironment();
}
void ExtraCompiler::setCompileIssues(const QList<Task> &issues)
{
d->issues = issues;
d->updateIssues();
}
void ExtraCompilerPrivate::updateIssues()
{
if (!lastEditor)
return;
TextEditor::TextEditorWidget *widget =
qobject_cast<TextEditor::TextEditorWidget *>(lastEditor->widget());
if (!widget)
return;
QList<QTextEdit::ExtraSelection> selections;
const QTextDocument *document = widget->document();
foreach (const Task &issue, issues) {
QTextEdit::ExtraSelection selection;
QTextCursor cursor(document->findBlockByNumber(issue.line - 1));
cursor.movePosition(QTextCursor::StartOfLine);
cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
selection.cursor = cursor;
const auto fontSettings = TextEditor::TextEditorSettings::instance()->fontSettings();
selection.format = fontSettings.toTextCharFormat(issue.type == Task::Warning ?
TextEditor::C_WARNING : TextEditor::C_ERROR);
selection.format.setToolTip(issue.description);
selections.append(selection);
}
widget->setExtraSelections(TextEditor::TextEditorWidget::CodeWarningsSelection, selections);
}
void ExtraCompiler::setContent(const Utils::FileName &file, const QString &contents)
{
for (int i = 0; i < d->targets.length(); ++i) {