CppEditor: add default RefactoringEngine

..and use it when we don't have refactoring plug-in

Change-Id: Ibe317a9728d439b9c5e05271d92a330d22eaacb9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-08-03 14:13:42 +02:00
parent 62ada96091
commit 76d12dc2d5
14 changed files with 226 additions and 83 deletions

View File

@@ -87,7 +87,8 @@ HEADERS += \
cppprojectfilecategorizer.h \
clangcompileroptionsbuilder.h \
cppprojectpartchooser.h \
cppsymbolinfo.h
cppsymbolinfo.h \
cursorineditor.h
SOURCES += \
abstracteditorsupport.cpp \

View File

@@ -159,6 +159,7 @@ Project {
"cpptoolssettings.h",
"cppworkingcopy.cpp",
"cppworkingcopy.h",
"cursorineditor.h",
"doxygengenerator.cpp",
"doxygengenerator.h",
"editordocumenthandle.cpp",

View File

@@ -0,0 +1,55 @@
/****************************************************************************
**
** Copyright (C) 2017 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 <QTextCursor>
#include <utils/fileutils.h>
namespace TextEditor {
class TextEditorWidget;
} // namespace TextEditor
namespace CppTools {
class CursorInEditor
{
public:
CursorInEditor(const QTextCursor &cursor, const Utils::FileName &filePath,
TextEditor::TextEditorWidget *editorWidget = nullptr)
: m_cursor(cursor)
, m_filePath(filePath)
, m_editorWidget(editorWidget)
{}
TextEditor::TextEditorWidget *editorWidget() const { return m_editorWidget; }
const QTextCursor &cursor() const { return m_cursor; }
const Utils::FileName &filePath() const { return m_filePath; }
private:
QTextCursor m_cursor;
Utils::FileName m_filePath;
TextEditor::TextEditorWidget *m_editorWidget = nullptr;
};
} // namespace CppTools

View File

@@ -25,18 +25,18 @@
#pragma once
#include "cursorineditor.h"
#include <utils/fileutils.h>
#include <clangsupport/sourcelocationscontainer.h>
#include <clangsupport/refactoringclientinterface.h>
QT_BEGIN_NAMESPACE
class QTextCursor;
QT_END_NAMESPACE
namespace TextEditor {
class TextEditorWidget;
} // namespace TextEditor
namespace CppTools {
class CppEditorWidget;
class ProjectPart;
enum class CallType
@@ -45,19 +45,17 @@ enum class CallType
Asynchronous
};
// NOTE: This interface is not supposed to be owned as an interface pointer
class RefactoringEngineInterface
{
public:
using RenameCallback = ClangBackEnd::RefactoringClientInterface::RenameCallback;
virtual void startLocalRenaming(const QTextCursor &textCursor,
const Utils::FileName &filePath,
int revision,
virtual void startLocalRenaming(const CursorInEditor &data,
CppTools::ProjectPart *projectPart,
RenameCallback &&renameSymbolsCallback) = 0;
virtual bool isUsable() const = 0;
};
} // namespace CppTools