forked from qt-creator/qt-creator
Clang: Add Symbol Indexing
It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -11,7 +11,8 @@ HEADERS += \
|
||||
$$PWD/clangqueryexamplehighlightmarker.h \
|
||||
$$PWD/clangqueryhighlightmarker.h \
|
||||
$$PWD/clangqueryexamplehighlighter.h \
|
||||
$$PWD/clangqueryhighlighter.h
|
||||
$$PWD/clangqueryhighlighter.h \
|
||||
$$PWD/refactoringprojectupdater.h
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/refactoringengine.cpp \
|
||||
@@ -22,4 +23,5 @@ SOURCES += \
|
||||
$$PWD/projectpartutilities.cpp \
|
||||
$$PWD/clangqueryprojectsfindfilter.cpp \
|
||||
$$PWD/clangqueryexamplehighlighter.cpp \
|
||||
$$PWD/clangqueryhighlighter.cpp
|
||||
$$PWD/clangqueryhighlighter.cpp \
|
||||
$$PWD/refactoringprojectupdater.cpp
|
||||
|
||||
@@ -5,4 +5,5 @@ QTC_LIB_DEPENDS += \
|
||||
QTC_PLUGIN_DEPENDS += \
|
||||
coreplugin \
|
||||
cpptools \
|
||||
texteditor
|
||||
texteditor \
|
||||
clangpchmanager
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
#include "clangrefactoringplugin.h"
|
||||
|
||||
#include <clangpchmanager/qtcreatorprojectupdater.h>
|
||||
|
||||
#include <cpptools/cppmodelmanager.h>
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
@@ -50,6 +52,7 @@ std::unique_ptr<ClangRefactoringPluginData> ClangRefactoringPlugin::d;
|
||||
|
||||
class ClangRefactoringPluginData
|
||||
{
|
||||
using ProjectUpdater = ClangPchManager::QtCreatorProjectUpdater<ClangPchManager::ProjectUpdater>;
|
||||
public:
|
||||
RefactoringClient refactoringClient;
|
||||
ClangBackEnd::RefactoringConnectionClient connectionClient{&refactoringClient};
|
||||
@@ -58,6 +61,9 @@ public:
|
||||
QtCreatorClangQueryFindFilter qtCreatorfindFilter{connectionClient.serverProxy(),
|
||||
qtCreatorSearch,
|
||||
refactoringClient};
|
||||
ProjectUpdater projectUpdate{connectionClient.serverProxy()};
|
||||
|
||||
|
||||
};
|
||||
|
||||
ClangRefactoringPlugin::ClangRefactoringPlugin()
|
||||
|
||||
37
src/plugins/clangrefactoring/refactoringprojectupdater.cpp
Normal file
37
src/plugins/clangrefactoring/refactoringprojectupdater.cpp
Normal file
@@ -0,0 +1,37 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** 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.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "refactoringprojectupdater.h"
|
||||
|
||||
namespace ClangRefactoring {
|
||||
|
||||
RefactoringProjectUpdater::RefactoringProjectUpdater(ClangBackEnd::ProjectManagementServerInterface &server,
|
||||
RefactoringClient &)
|
||||
: ClangPchManager::ProjectUpdater(server)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
} // namespace ClangRefactoring
|
||||
41
src/plugins/clangrefactoring/refactoringprojectupdater.h
Normal file
41
src/plugins/clangrefactoring/refactoringprojectupdater.h
Normal file
@@ -0,0 +1,41 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** 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 <clangpchmanager/projectupdater.h>
|
||||
|
||||
namespace ClangRefactoring {
|
||||
|
||||
class RefactoringClient;
|
||||
|
||||
class RefactoringProjectUpdater : public ClangPchManager::ProjectUpdater
|
||||
{
|
||||
public:
|
||||
RefactoringProjectUpdater(ClangBackEnd::ProjectManagementServerInterface &server,
|
||||
RefactoringClient &client);
|
||||
};
|
||||
|
||||
} // namespace ClangRefactoring
|
||||
@@ -50,6 +50,13 @@ public:
|
||||
Utils::PathString sourcePath;
|
||||
};
|
||||
|
||||
enum LocationGetter
|
||||
{
|
||||
SourceId = 0,
|
||||
Line,
|
||||
Column
|
||||
};
|
||||
|
||||
std::vector<Location> locations;
|
||||
std::unordered_map<qint64, Utils::PathString> sources;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user