add search function for source code was: cache source code in vector for easier access in search function

src/models/disassemblymodel.cpp

@@ -14,6 +14,7 @@
 #include "hotspot-config.h"
 
 #include "highlighter.hpp"
+#include "search.h"
 #include "sourcecodemodel.h"
 
 DisassemblyModel::DisassemblyModel(KSyntaxHighlighting::Repository* repository, QObject* parent)
@@ -222,3 +223,19 @@ QModelIndex DisassemblyModel::indexForFileLine(const Data::FileLine& fileLine) c
         return {};
     return index(bestMatch, 0);
 }
+
+void DisassemblyModel::find(const QString& search, Direction direction, int offset)
+{
+    auto searchFunc = [&search](const DisassemblyOutput::DisassemblyLine& line) {
+        return line.disassembly.indexOf(search, 0, Qt::CaseInsensitive) != -1;
+    };
+
+    int resultIndex = ::search(
+        m_data.disassemblyLines, searchFunc, [this] { emit resultFound({}); }, direction, offset);
+
+    if (resultIndex >= 0) {
+        emit resultFound(createIndex(resultIndex, DisassemblyColumn));
+    } else {
+        emit resultFound({});
+    }
+}

src/models/disassemblymodel.h

@@ -23,6 +23,8 @@ class Definition;
 class Repository;
 }
 
+enum class Direction;
+
 class DisassemblyModel : public QAbstractTableModel
 {
     Q_OBJECT
@@ -67,8 +69,13 @@ class DisassemblyModel : public QAbstractTableModel
         SyntaxHighlightRole,
     };
 
+signals:
+    void resultFound(QModelIndex index);
+    void searchEndReached();
+
 public slots:
     void updateHighlighting(int line);
+    void find(const QString& search, Direction direction, int offset);
 
 private:
     QTextDocument* m_document;

src/models/search.h

@@ -0,0 +1,50 @@
+/*
+    SPDX-FileCopyrightText: Lieven Hey <[email protected]>
+    SPDX-FileCopyrightText: 2023 Klarälvdalens Datakonsult AB, a KDAB Group company, [email protected]
+
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#pragma once
+
+#include <QVector>
+
+enum class Direction
+{
+    Forward,
+    Backward
+};
+
+template<typename entry, typename SearchFunc, typename EndReached>
+int search(QVector<entry> source, SearchFunc&& searchFunc, EndReached&& endReached, Direction direction, int offset)
+{
+    if (offset > source.size() || offset < 0) {
+        offset = 0;
+    }
+
+    auto start = direction == Direction::Forward
+        ? (source.begin() + offset)
+        : (source.end() - (source.size() - offset - 1)); // 1 one due to offset of the reverse iterator
+
+    auto it = direction == Direction::Forward
+        ? std::find_if(start, source.end(), searchFunc)
+        : (std::find_if(std::make_reverse_iterator(start), source.rend(), searchFunc) + 1).base();
+
+    // it is less than source.begin() if the backward search ends at source.rend()
+    if (it >= source.begin() && it < source.end()) {
+        auto distance = std::distance(source.begin(), it);
+        return distance;
+    }
+
+    it = direction == Direction::Forward
+        ? std::find_if(source.begin(), start, searchFunc)
+        : (std::find_if(source.rbegin(), std::make_reverse_iterator(start), searchFunc) + 1).base();
+
+    if (it != source.end()) {
+        auto distance = std::distance(source.begin(), it);
+        endReached();
+        return distance;
+    }
+
+    return -1;
+}

src/models/sourcecodemodel.cpp

@@ -13,7 +13,10 @@
 #include <QTextBlock>
 #include <QTextDocument>
 
+#include <algorithm>
+
 #include "highlighter.hpp"
+#include "search.h"
 
 SourceCodeModel::SourceCodeModel(KSyntaxHighlighting::Repository* repository, QObject* parent)
     : QAbstractTableModel(parent)
@@ -51,6 +54,14 @@ void SourceCodeModel::setDisassembly(const DisassemblyOutput& disassemblyOutput,
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
         return;
 
+    QString sourceCode = QString::fromUtf8(file.readAll());
+
+    m_sourceCodeLines.clear();
+    m_document->clear();
+
+    m_document->setPlainText(sourceCode);
+    m_document->setTextWidth(m_document->idealWidth());
+
     int maxLineNumber = 0;
     int minLineNumber = INT_MAX;
 
@@ -61,12 +72,7 @@ void SourceCodeModel::setDisassembly(const DisassemblyOutput& disassemblyOutput,
 
     m_mainSourceFileName = disassemblyOutput.mainSourceFileName;
 
-    const auto sourceCode = QString::fromUtf8(file.readAll());
-
-    m_document->clear();
-
-    m_document->setPlainText(sourceCode);
-    m_document->setTextWidth(m_document->idealWidth());
+    const auto entry = results.entries.find(disassemblyOutput.symbol);
 
     for (const auto& line : disassemblyOutput.disassemblyLines) {
         if (line.fileLine.line == 0 || line.fileLine.file != disassemblyOutput.mainSourceFileName) {
@@ -83,7 +89,6 @@ void SourceCodeModel::setDisassembly(const DisassemblyOutput& disassemblyOutput,
         if (m_validLineNumbers.contains(line.fileLine.line))
             continue;
 
-        const auto entry = results.entries.find(disassemblyOutput.symbol);
         if (entry != results.entries.end()) {
             const auto it = entry->sourceMap.find(line.fileLine);
             if (it != entry->sourceMap.end()) {
@@ -101,9 +106,18 @@ void SourceCodeModel::setDisassembly(const DisassemblyOutput& disassemblyOutput,
     Q_ASSERT(minLineNumber < maxLineNumber);
 
     m_prettySymbol = disassemblyOutput.symbol.prettySymbol;
-    m_startLine = minLineNumber - 2;
-    m_lineOffset = minLineNumber - 1;
-    m_numLines = maxLineNumber - m_startLine;
+    m_startLine = minLineNumber - 1; // convert to index
+    m_numLines = maxLineNumber - minLineNumber + 1; // include minLineNumber
+
+    m_sourceCodeLines.reserve(m_numLines);
+
+    for (int i = m_startLine; i < m_startLine + m_numLines; i++) {
+        auto block = m_document->findBlockByLineNumber(i);
+        if (!block.isValid())
+            continue;
+
+        m_sourceCodeLines.push_back({block.text(), block.layout()->lineAt(0)});
+    }
 }
 
 QVariant SourceCodeModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -142,7 +156,7 @@ QVariant SourceCodeModel::data(const QModelIndex& index, int role) const
         return {};
     }
 
-    const auto fileLine = Data::FileLine(m_mainSourceFileName, index.row() + m_lineOffset);
+    const auto fileLine = Data::FileLine(m_mainSourceFileName, index.row() + m_startLine);
     if (role == FileLineRole) {
         return QVariant::fromValue(fileLine);
     } else if (role == Qt::ToolTipRole) {
@@ -154,19 +168,17 @@ QVariant SourceCodeModel::data(const QModelIndex& index, int role) const
             if (index.row() == 0) {
                 return m_prettySymbol;
             }
-            const auto block = m_document->findBlockByLineNumber(index.row() + m_startLine);
-            if (!block.isValid())
-                return {};
+
             if (role == SyntaxHighlightRole)
-                return QVariant::fromValue(block.layout()->lineAt(0));
-            return block.text();
+                return QVariant::fromValue(m_sourceCodeLines[index.row() - 1].line);
+            return m_sourceCodeLines[index.row() - 1].text;
         }
 
         if (index.column() == SourceCodeLineNumber) {
             return fileLine.line;
         }
 
-        auto cost = [role, id = index.row() + m_lineOffset](int type, const Data::Costs& costs) -> QVariant {
+        auto cost = [role, id = index.row() + m_startLine](int type, const Data::Costs& costs) -> QVariant {
             const auto cost = costs.cost(type, id);
             const auto totalCost = costs.totalCost(type);
             if (role == CostRole) {
@@ -185,9 +197,9 @@ QVariant SourceCodeModel::data(const QModelIndex& index, int role) const
             return cost(column, m_selfCosts);
         return cost(column - m_selfCosts.numTypes(), m_inclusiveCosts);
     } else if (role == HighlightRole) {
-        return index.row() + m_lineOffset == m_highlightLine;
+        return index.row() + m_startLine == m_highlightLine;
     } else if (role == RainbowLineNumberRole) {
-        int line = index.row() + m_lineOffset;
+        int line = index.row() + m_startLine;
         if (m_validLineNumbers.contains(line))
             return line;
         return -1;
@@ -202,7 +214,12 @@ int SourceCodeModel::columnCount(const QModelIndex& parent) const
 
 int SourceCodeModel::rowCount(const QModelIndex& parent) const
 {
-    return parent.isValid() ? 0 : m_numLines;
+    // don't show the function name, when we have no source code
+    if (m_numLines == 0)
+        return 0;
+
+    // 1 line for the function name + source codes lines
+    return parent.isValid() ? 0 : m_numLines + 1;
 }
 
 void SourceCodeModel::updateHighlighting(int line)
@@ -215,18 +232,34 @@ Data::FileLine SourceCodeModel::fileLineForIndex(const QModelIndex& index) const
 {
     if (!index.isValid())
         return {};
-    return {m_mainSourceFileName, index.row() + m_lineOffset};
+    return {m_mainSourceFileName, index.row() + m_startLine};
 }
 
 QModelIndex SourceCodeModel::indexForFileLine(const Data::FileLine& fileLine) const
 {
-    if (fileLine.file != m_mainSourceFileName || fileLine.line < m_lineOffset
-        || fileLine.line >= m_lineOffset + m_numLines)
+    if (fileLine.file != m_mainSourceFileName || fileLine.line < m_startLine
+        || fileLine.line > m_startLine + m_numLines)
         return {};
-    return index(fileLine.line - m_lineOffset, 0);
+    return index(fileLine.line - m_startLine, 0);
 }
 
 void SourceCodeModel::setSysroot(const QString& sysroot)
 {
     m_sysroot = sysroot;
 }
+
+void SourceCodeModel::find(const QString& search, Direction direction, int offset)
+{
+    auto searchFunc = [&search](const SourceCodeLine& line) {
+        return line.text.indexOf(search, 0, Qt::CaseInsensitive) != -1;
+    };
+
+    int resultIndex = ::search(
+        m_sourceCodeLines, searchFunc, [this] { emit resultFound({}); }, direction, offset);
+
+    if (resultIndex >= 0) {
+        emit resultFound(createIndex(resultIndex + 1, SourceCodeColumn));
+    } else {
+        emit resultFound({});
+    }
+}

src/models/sourcecodemodel.h

@@ -23,6 +23,15 @@ class Repository;
 class Definition;
 }
 
+struct SourceCodeLine
+{
+    QString text;
+    QTextLine line;
+};
+Q_DECLARE_TYPEINFO(SourceCodeLine, Q_MOVABLE_TYPE);
+
+enum class Direction;
+
 Q_DECLARE_METATYPE(QTextLine)
 
 class SourceCodeModel : public QAbstractTableModel
@@ -66,20 +75,26 @@ class SourceCodeModel : public QAbstractTableModel
         FileLineRole,
     };
 
+signals:
+    void resultFound(QModelIndex index);
+    void searchEndReached();
+
 public slots:
     void updateHighlighting(int line);
     void setSysroot(const QString& sysroot);
 
+    void find(const QString& search, Direction direction, int offset);
+
 private:
     QString m_sysroot;
     QSet<int> m_validLineNumbers;
     QTextDocument* m_document = nullptr;
+    QVector<SourceCodeLine> m_sourceCodeLines;
     Highlighter* m_highlighter = nullptr;
     Data::Costs m_selfCosts;
     Data::Costs m_inclusiveCosts;
     QString m_mainSourceFileName;
     QString m_prettySymbol;
-    int m_lineOffset = 0;
     int m_startLine = 0;
     int m_numLines = 0;
     int m_highlightLine = 0;