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

CppEditor: Move CppHoverHandler to its only point of use

Browse Source 
No need to compile an extra translation unit for this.

Change-Id: Ie21346700818ccadab864b77f13f167bd27a457a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-09-02 07:56:27 +02:00
parent 0a7aca5a71
commit 1d88a65747
8 changed files with 46 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/clangcodemodel/clanghoverhandler.h
View File

@@ -26,7 +26,6 @@
#pragma once
#include <cppeditor/baseeditordocumentprocessor.h>
#include <cppeditor/cpphoverhandler.h>
#include <texteditor/basehoverhandler.h>
namespace ClangCodeModel {

1
src/plugins/cppeditor/CMakeLists.txt
View File

@@ -59,7 +59,6 @@ add_qtc_plugin(CppEditor
cppfunctiondecldeflink.cpp cppfunctiondecldeflink.h
cppfunctionsfilter.cpp cppfunctionsfilter.h
cpphighlighter.cpp cpphighlighter.h
cpphoverhandler.cpp cpphoverhandler.h
cppincludehierarchy.cpp cppincludehierarchy.h
cppincludesfilter.cpp cppincludesfilter.h
cppindexingsupport.cpp cppindexingsupport.h

49
src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
View File

@@ -23,19 +23,62 @@
**
****************************************************************************/
#include "cppcompletionassist.h"
#include "cppbuiltinmodelmanagersupport.h"
#include "builtineditordocumentprocessor.h"
#include "cppcompletionassist.h"
#include "cppelementevaluator.h"
#include "cppfollowsymbolundercursor.h"
#include "cpphoverhandler.h"
#include "cppoverviewmodel.h"
#include "cpprefactoringengine.h"
#include "builtineditordocumentprocessor.h"
#include "cpptoolsreuse.h"
#include <app/app_version.h>
#include <texteditor/basehoverhandler.h>
#include <utils/executeondestruction.h>
#include <QCoreApplication>
using namespace Core;
using namespace TextEditor;
namespace CppEditor::Internal {
namespace {
class CppHoverHandler : public TextEditor::BaseHoverHandler
{
private:
void identifyMatch(TextEditor::TextEditorWidget *editorWidget,
int pos,
ReportPriority report) override
{
Utils::ExecuteOnDestruction reportPriority([this, report](){ report(priority()); });
QTextCursor tc(editorWidget->document());
tc.setPosition(pos);
CppElementEvaluator evaluator(editorWidget);
evaluator.setTextCursor(tc);
evaluator.execute();
QString tip;
if (evaluator.hasDiagnosis()) {
tip += evaluator.diagnosis();
setPriority(Priority_Diagnostic);
}
const QStringList fallback = identifierWordsUnderCursor(tc);
if (evaluator.identifiedCppElement()) {
const QSharedPointer<CppElement> &cppElement = evaluator.cppElement();
const QStringList candidates = cppElement->helpIdCandidates;
const HelpItem helpItem(candidates + fallback, cppElement->helpMark, cppElement->helpCategory);
setLastHelpItemIdentified(helpItem);
if (!helpItem.isValid())
tip += cppElement->tooltip;
} else {
setLastHelpItemIdentified({fallback, {}, HelpItem::Unknown});
}
setToolTip(tip);
}
};
} // anonymous namespace
QString BuiltinModelManagerSupportProvider::id() const
{

2
src/plugins/cppeditor/cppeditor.pro
View File

@@ -55,7 +55,6 @@ HEADERS += \
cppfunctiondecldeflink.h \
cppfunctionsfilter.h \
cpphighlighter.h \
cpphoverhandler.h \
cppincludehierarchy.h \
cppincludesfilter.h \
cppindexingsupport.h \
@@ -174,7 +173,6 @@ SOURCES += \
cppfunctiondecldeflink.cpp \
cppfunctionsfilter.cpp \
cpphighlighter.cpp \
cpphoverhandler.cpp \
cppincludehierarchy.cpp \
cppincludesfilter.cpp \
cppindexingsupport.cpp \

2
src/plugins/cppeditor/cppeditor.qbs
View File

@@ -132,8 +132,6 @@ QtcPlugin {
"cppfunctionsfilter.h",
"cpphighlighter.cpp",
"cpphighlighter.h",
"cpphoverhandler.cpp",
"cpphoverhandler.h",
"cppincludehierarchy.cpp",
"cppincludehierarchy.h",
"cppincludesfilter.cpp",

1
src/plugins/cppeditor/cppeditorplugin.cpp
View File

@@ -35,7 +35,6 @@
#include "cppeditorwidget.h"
#include "cppfilesettingspage.h"
#include "cpphighlighter.h"
#include "cpphoverhandler.h"
#include "cppincludehierarchy.h"
#include "cppmodelmanager.h"
#include "cppoutline.h"

74
src/plugins/cppeditor/cpphoverhandler.cpp
View File

@@ -1,74 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "cpphoverhandler.h"
#include "cppelementevaluator.h"
#include "cpptoolsreuse.h"
#include <coreplugin/helpmanager.h>
#include <texteditor/texteditor.h>
#include <utils/textutils.h>
#include <utils/executeondestruction.h>
#include <QTextCursor>
#include <QUrl>
using namespace Core;
using namespace TextEditor;
namespace CppEditor {
void CppHoverHandler::identifyMatch(TextEditorWidget *editorWidget, int pos, ReportPriority report)
{
Utils::ExecuteOnDestruction reportPriority([this, report](){ report(priority()); });
QTextCursor tc(editorWidget->document());
tc.setPosition(pos);
CppElementEvaluator evaluator(editorWidget);
evaluator.setTextCursor(tc);
evaluator.execute();
QString tip;
if (evaluator.hasDiagnosis()) {
tip += evaluator.diagnosis();
setPriority(Priority_Diagnostic);
}
const QStringList fallback = identifierWordsUnderCursor(tc);
if (evaluator.identifiedCppElement()) {
const QSharedPointer<CppElement> &cppElement = evaluator.cppElement();
const QStringList candidates = cppElement->helpIdCandidates;
const HelpItem helpItem(candidates + fallback, cppElement->helpMark, cppElement->helpCategory);
setLastHelpItemIdentified(helpItem);
if (!helpItem.isValid())
tip += cppElement->tooltip;
} else {
setLastHelpItemIdentified({fallback, {}, HelpItem::Unknown});
}
setToolTip(tip);
}
} // namespace CppEditor

42
src/plugins/cppeditor/cpphoverhandler.h
View File

@@ -1,42 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include "cppeditor_global.h"
#include <texteditor/basehoverhandler.h>
namespace CppEditor {
class CPPEDITOR_EXPORT CppHoverHandler : public TextEditor::BaseHoverHandler
{
private:
void identifyMatch(TextEditor::TextEditorWidget *editorWidget,
int pos,
ReportPriority report) override;
};
} // namespace CppEditor