aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2023-04-24 21:51:26 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2023-05-10 12:55:14 +0000
commit475e85946285cd1fd0daa0579214ef456f0a4ac7 (patch)
treee99ce822cf631fc3658ab23ad3b26203fc195ab3
parent2950762cb1aad63cf8a5ad29bbd756db68713165 (diff)
LineNumberFilter: Remove the old matchesFor() implementation
Change-Id: Ia45de8cd265300776c9cb0660b491f9584620a14 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/texteditor/linenumberfilter.cpp50
-rw-r--r--src/plugins/texteditor/linenumberfilter.h16
2 files changed, 5 insertions, 61 deletions
diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp
index cec55ecbff..b718e5b433 100644
--- a/src/plugins/texteditor/linenumberfilter.cpp
+++ b/src/plugins/texteditor/linenumberfilter.cpp
@@ -6,15 +6,13 @@
#include "texteditortr.h"
#include <coreplugin/editormanager/editormanager.h>
-#include <utils/tasktree.h>
using namespace Core;
using namespace Utils;
namespace TextEditor::Internal {
-LineNumberFilter::LineNumberFilter(QObject *parent)
- : ILocatorFilter(parent)
+LineNumberFilter::LineNumberFilter()
{
setId("Line in current document");
setDisplayName(Tr::tr("Line in Current Document"));
@@ -68,48 +66,4 @@ LocatorMatcherTasks LineNumberFilter::matchers()
return {{Sync(onSetup), storage}};
}
-void LineNumberFilter::prepareSearch(const QString &entry)
-{
- Q_UNUSED(entry)
- m_hasCurrentEditor = EditorManager::currentEditor() != nullptr;
-}
-
-QList<LocatorFilterEntry> LineNumberFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &, const QString &entry)
-{
- QList<LocatorFilterEntry> value;
- const QStringList lineAndColumn = entry.split(':');
- int sectionCount = lineAndColumn.size();
- int line = 0;
- int column = 0;
- bool ok = false;
- if (sectionCount > 0)
- line = lineAndColumn.at(0).toInt(&ok);
- if (ok && sectionCount > 1)
- column = lineAndColumn.at(1).toInt(&ok);
- if (!ok)
- return value;
- if (m_hasCurrentEditor && (line > 0 || column > 0)) {
- QString text;
- if (line > 0 && column > 0)
- text = Tr::tr("Line %1, Column %2").arg(line).arg(column);
- else if (line > 0)
- text = Tr::tr("Line %1").arg(line);
- else
- text = Tr::tr("Column %1").arg(column);
- LocatorFilterEntry entry;
- entry.displayName = text;
- entry.acceptor = [line, targetColumn = column - 1] {
- IEditor *editor = EditorManager::currentEditor();
- if (!editor)
- return AcceptResult();
- EditorManager::addCurrentPositionToNavigationHistory();
- editor->gotoLine(line < 1 ? editor->currentLine() : line, targetColumn);
- EditorManager::activateEditor(editor);
- return AcceptResult();
- };
- value.append(entry);
- }
- return value;
-}
-
-} // TextEditor::Internal
+} // namespace TextEditor::Internal
diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h
index 5717da176d..ec72c1bb02 100644
--- a/src/plugins/texteditor/linenumberfilter.h
+++ b/src/plugins/texteditor/linenumberfilter.h
@@ -5,25 +5,15 @@
#include <coreplugin/locator/ilocatorfilter.h>
-namespace Core { class IEditor; }
-
-namespace TextEditor {
-namespace Internal {
+namespace TextEditor::Internal {
class LineNumberFilter : public Core::ILocatorFilter
{
- Q_OBJECT
-
public:
- explicit LineNumberFilter(QObject *parent = nullptr);
+ LineNumberFilter();
- void prepareSearch(const QString &entry) override;
- QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
- const QString &entry) override;
private:
Core::LocatorMatcherTasks matchers() final;
- bool m_hasCurrentEditor = false;
};
-} // namespace Internal
-} // namespace TextEditor
+} // namespace TextEditor::Internal