Skip to content

Commit

Permalink
Added Navigation to CompileOutputWindow
Browse files Browse the repository at this point in the history 
* fixed wrong task positions
  • Loading branch information
@arBmind
arBmind committed Oct 31, 2020
1 parent 71a880c commit f95cdc5
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 15 deletions.
89 changes: 74 additions & 15 deletions src/plugins/projectexplorer/compileoutputwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :

outputFormatter()->overridePostPrintAction([this](Utils::OutputLineParser *parser) {
if (const auto taskParser = qobject_cast<OutputTaskParser *>(parser)) {
int offset = 0;
int offset = m_lineCount - m_outputWindow->document()->blockCount();
Utils::reverseForeach(taskParser->taskInfo(), [this, &offset](const OutputTaskParser::TaskInfo &ti) {
registerPositionOf(ti.task, ti.linkedLines, ti.skippedLines, offset);
offset += ti.linkedLines;
});
registerPositionOf(ti.task, ti.linkedLines, ti.skippedLines, offset);
offset += ti.linkedLines;
});
}
parser->runPostPrintActions();
});
Expand All @@ -115,7 +115,7 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :

auto updateZoomEnabled = [this] {
m_outputWindow->setWheelZoomEnabled(
TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
};

updateFontSettings();
Expand Down Expand Up @@ -206,13 +206,19 @@ void CompileOutputWindow::appendText(const QString &text, BuildStep::OutputForma

}

m_lineCount += text.count('\n');
// qWarning() << "m_lineCount:" << m_lineCount
// << "document.blockCount:" << m_outputWindow->document()->blockCount()
// << "text:" << text;
m_outputWindow->appendMessage(text, fmt);
}

void CompileOutputWindow::clearContents()
{
m_lineCount = 0;
m_outputWindow->clear();
m_taskPositions.clear();
navigateStateUpdate();
}

void CompileOutputWindow::visibilityChanged(bool)
Expand All @@ -225,23 +231,61 @@ int CompileOutputWindow::priorityInStatusBar() const

bool CompileOutputWindow::canNext() const
{
return false;
return !m_taskPositions.isEmpty();
}

bool CompileOutputWindow::canPrevious() const
{
return false;
return !m_taskPositions.isEmpty();
}

void CompileOutputWindow::goToNext()
{ }
{
auto cursorLine = m_outputWindow->textCursor().blockNumber();
auto firstLine = cursorLine;
auto nextLine = -1;
for (auto &pos : m_taskPositions) {
auto line = pos.first;
if (line > cursorLine && (nextLine == -1 || line < nextLine)) {
nextLine = line;
}
if (line < firstLine) firstLine = line;
}
if (nextLine == -1) {
nextLine = firstLine;
}
auto cursor = QTextCursor(m_outputWindow->document()->findBlockByNumber(nextLine));
cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::MoveAnchor);
m_outputWindow->setTextCursor(cursor);
cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
m_outputWindow->setTextCursor(cursor);
}

void CompileOutputWindow::goToPrev()
{ }
{
auto cursorLine = m_outputWindow->textCursor().blockNumber();
auto nextLine = -1;
auto lastLine = cursorLine;
for (auto &pos : m_taskPositions) {
auto line = pos.first;
if (line < cursorLine && (nextLine == -1 || line > nextLine)) {
nextLine = line;
}
if (line > lastLine) lastLine = line;
}
if (nextLine == -1) {
nextLine = lastLine;
}
auto cursor = QTextCursor(m_outputWindow->document()->findBlockByNumber(nextLine));
cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::MoveAnchor);
m_outputWindow->setTextCursor(cursor);
cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
m_outputWindow->setTextCursor(cursor);
}

bool CompileOutputWindow::canNavigate() const
{
return false;
return true;
}

void CompileOutputWindow::registerPositionOf(const Task &task, int linkedOutputLines, int skipLines,
Expand All @@ -250,11 +294,21 @@ void CompileOutputWindow::registerPositionOf(const Task &task, int linkedOutputL
if (linkedOutputLines <= 0)
return;

const int blocknumber = m_outputWindow->document()->blockCount() - offset - 1;
const int firstLine = blocknumber - linkedOutputLines - skipLines;
const int firstLine = m_lineCount - offset - linkedOutputLines - skipLines;
const int lastLine = firstLine + linkedOutputLines - 1;

// qWarning().noquote() << "Register id:" << task.taskId
// << "at line" << QString("%2-%3").arg(firstLine).arg(lastLine)
// << "document.blockCount:" << m_outputWindow->document()->blockCount()
// << "m_lineCount:" << m_lineCount
// << "linkedOutputLines:" << linkedOutputLines
// << "skipLines:" << skipLines
// << "offset:" << offset
// << "task.summary:" << task.summary;
auto wasEmpty = m_taskPositions.isEmpty();
m_taskPositions.insert(task.taskId, qMakePair(firstLine, lastLine));
if (wasEmpty)
navigateStateUpdate();
}

bool CompileOutputWindow::knowsPositionOf(const Task &task)
Expand All @@ -280,11 +334,16 @@ void CompileOutputWindow::showPositionOf(const Task &task)
m_outputWindow->centerCursor();
}

void CompileOutputWindow::scrollToFirstTask() {
void CompileOutputWindow::scrollToFirstTask()
{
if (m_taskPositions.isEmpty()) return;
auto minLine = m_taskPositions.begin()->first;
for (auto& pos : m_taskPositions) if (pos.first < minLine) minLine = pos.first;

auto cursor = QTextCursor(m_outputWindow->document()->findBlockByNumber(minLine));
cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::MoveAnchor);
m_outputWindow->setTextCursor(cursor);
cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
m_outputWindow->setTextCursor(cursor);
}

Expand Down Expand Up @@ -318,7 +377,7 @@ void CompileOutputWindow::updateFilter()

void CompileOutputWindow::loadSettings()
{
QSettings * const s = Core::ICore::settings();
QSettings *const s = Core::ICore::settings();
m_settings.popUp = s->value(POP_UP_KEY, false).toBool();
m_settings.wrapOutput = s->value(WRAP_OUTPUT_KEY, true).toBool();
m_settings.maxCharCount = s->value(MAX_LINES_KEY,
Expand All @@ -327,7 +386,7 @@ void CompileOutputWindow::loadSettings()

void CompileOutputWindow::storeSettings() const
{
QSettings * const s = Core::ICore::settings();
QSettings *const s = Core::ICore::settings();
s->setValue(POP_UP_KEY, m_settings.popUp);
s->setValue(WRAP_OUTPUT_KEY, m_settings.wrapOutput);
s->setValue(MAX_LINES_KEY, m_settings.maxCharCount / 100);
Expand Down
1 change: 1 addition & 0 deletions src/plugins/projectexplorer/compileoutputwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class CompileOutputWindow : public Core::IOutputPane
void updateFromSettings();

Core::OutputWindow *m_outputWindow;
int m_lineCount{};
QHash<unsigned int, QPair<int, int>> m_taskPositions;
ShowOutputTaskHandler *m_handler;
QToolButton *m_cancelBuildButton;
Expand Down

0 comments on commit f95cdc5

Please sign in to comment.