forked from qt-creator/qt-creator
ClangCodeModel: Remove dead code
None of this had any affect after switching to clangd. Change-Id: I806682fecff84bf6eb0b0eb382e096fc9a25fa3d Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -59,26 +59,6 @@ void ClangEditorDocumentProcessor::semanticRehighlight()
|
|||||||
BuiltinEditorDocumentProcessor::semanticRehighlight();
|
BuiltinEditorDocumentProcessor::semanticRehighlight();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ClangEditorDocumentProcessor::hasProjectPart() const
|
|
||||||
{
|
|
||||||
return !m_projectPart.isNull();
|
|
||||||
}
|
|
||||||
|
|
||||||
CppEditor::ProjectPart::ConstPtr ClangEditorDocumentProcessor::projectPart() const
|
|
||||||
{
|
|
||||||
return m_projectPart;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ClangEditorDocumentProcessor::clearProjectPart()
|
|
||||||
{
|
|
||||||
m_projectPart.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
::Utils::Id ClangEditorDocumentProcessor::diagnosticConfigId() const
|
|
||||||
{
|
|
||||||
return m_diagnosticConfigId;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ClangEditorDocumentProcessor::setParserConfig(
|
void ClangEditorDocumentProcessor::setParserConfig(
|
||||||
const CppEditor::BaseEditorDocumentParser::Configuration &config)
|
const CppEditor::BaseEditorDocumentParser::Configuration &config)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -19,12 +19,6 @@ public:
|
|||||||
|
|
||||||
void semanticRehighlight() override;
|
void semanticRehighlight() override;
|
||||||
|
|
||||||
bool hasProjectPart() const;
|
|
||||||
CppEditor::ProjectPart::ConstPtr projectPart() const;
|
|
||||||
void clearProjectPart();
|
|
||||||
|
|
||||||
::Utils::Id diagnosticConfigId() const;
|
|
||||||
|
|
||||||
void setParserConfig(const CppEditor::BaseEditorDocumentParser::Configuration &config) override;
|
void setParserConfig(const CppEditor::BaseEditorDocumentParser::Configuration &config) override;
|
||||||
CppEditor::BaseEditorDocumentParser::Configuration parserConfig();
|
CppEditor::BaseEditorDocumentParser::Configuration parserConfig();
|
||||||
|
|
||||||
@@ -37,8 +31,6 @@ signals:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
TextEditor::TextDocument &m_document;
|
TextEditor::TextDocument &m_document;
|
||||||
CppEditor::ProjectPart::ConstPtr m_projectPart;
|
|
||||||
::Utils::Id m_diagnosticConfigId;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
|
|||||||
@@ -232,9 +232,7 @@ ClangModelManagerSupport::ClangModelManagerSupport()
|
|||||||
connect(modelManager, &CppModelManager::abstractEditorSupportRemoved,
|
connect(modelManager, &CppModelManager::abstractEditorSupportRemoved,
|
||||||
this, &ClangModelManagerSupport::onAbstractEditorSupportRemoved);
|
this, &ClangModelManagerSupport::onAbstractEditorSupportRemoved);
|
||||||
connect(modelManager, &CppModelManager::projectPartsUpdated,
|
connect(modelManager, &CppModelManager::projectPartsUpdated,
|
||||||
this, &ClangModelManagerSupport::onProjectPartsUpdated);
|
this, &ClangModelManagerSupport::updateLanguageClient);
|
||||||
connect(modelManager, &CppModelManager::projectPartsRemoved,
|
|
||||||
this, &ClangModelManagerSupport::onProjectPartsRemoved);
|
|
||||||
connect(modelManager, &CppModelManager::fallbackProjectPartUpdated, this, [this] {
|
connect(modelManager, &CppModelManager::fallbackProjectPartUpdated, this, [this] {
|
||||||
if (sessionModeEnabled())
|
if (sessionModeEnabled())
|
||||||
return;
|
return;
|
||||||
@@ -861,37 +859,6 @@ void ClangModelManagerSupport::onTextMarkContextMenuRequested(TextEditor::TextEd
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
using ClangEditorDocumentProcessors = QVector<ClangEditorDocumentProcessor *>;
|
|
||||||
static ClangEditorDocumentProcessors clangProcessors()
|
|
||||||
{
|
|
||||||
ClangEditorDocumentProcessors result;
|
|
||||||
for (const CppEditorDocumentHandle *editorDocument : cppModelManager()->cppEditorDocuments())
|
|
||||||
result.append(qobject_cast<ClangEditorDocumentProcessor *>(editorDocument->processor()));
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ClangModelManagerSupport::onProjectPartsUpdated(Project *project)
|
|
||||||
{
|
|
||||||
QTC_ASSERT(project, return);
|
|
||||||
|
|
||||||
updateLanguageClient(project);
|
|
||||||
|
|
||||||
QStringList projectPartIds;
|
|
||||||
const ProjectInfo::ConstPtr projectInfo = cppModelManager()->projectInfo(project);
|
|
||||||
QTC_ASSERT(projectInfo, return);
|
|
||||||
|
|
||||||
for (const ProjectPart::ConstPtr &projectPart : projectInfo->projectParts())
|
|
||||||
projectPartIds.append(projectPart->id());
|
|
||||||
onProjectPartsRemoved(projectPartIds);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ClangModelManagerSupport::onProjectPartsRemoved(const QStringList &projectPartIds)
|
|
||||||
{
|
|
||||||
if (!projectPartIds.isEmpty())
|
|
||||||
reinitializeBackendDocuments(projectPartIds);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ClangModelManagerSupport::onClangdSettingsChanged()
|
void ClangModelManagerSupport::onClangdSettingsChanged()
|
||||||
{
|
{
|
||||||
const bool sessionMode = sessionModeEnabled();
|
const bool sessionMode = sessionModeEnabled();
|
||||||
@@ -940,21 +907,4 @@ void ClangModelManagerSupport::onClangdSettingsChanged()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static ClangEditorDocumentProcessors
|
|
||||||
clangProcessorsWithProjectParts(const QStringList &projectPartIds)
|
|
||||||
{
|
|
||||||
return ::Utils::filtered(clangProcessors(), [projectPartIds](ClangEditorDocumentProcessor *p) {
|
|
||||||
return p->hasProjectPart() && projectPartIds.contains(p->projectPart()->id());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void ClangModelManagerSupport::reinitializeBackendDocuments(const QStringList &projectPartIds)
|
|
||||||
{
|
|
||||||
const ClangEditorDocumentProcessors processors = clangProcessorsWithProjectParts(projectPartIds);
|
|
||||||
for (ClangEditorDocumentProcessor *processor : processors) {
|
|
||||||
processor->clearProjectPart();
|
|
||||||
processor->run();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // ClangCodeModel::Internal
|
} // ClangCodeModel::Internal
|
||||||
|
|||||||
@@ -81,12 +81,8 @@ private:
|
|||||||
int lineNumber,
|
int lineNumber,
|
||||||
QMenu *menu);
|
QMenu *menu);
|
||||||
|
|
||||||
void onProjectPartsUpdated(ProjectExplorer::Project *project);
|
|
||||||
void onProjectPartsRemoved(const QStringList &projectPartIds);
|
|
||||||
void onClangdSettingsChanged();
|
void onClangdSettingsChanged();
|
||||||
|
|
||||||
void reinitializeBackendDocuments(const QStringList &projectPartIds);
|
|
||||||
|
|
||||||
void connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument);
|
void connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument);
|
||||||
void connectToWidgetsMarkContextMenuRequested(QWidget *editorWidget);
|
void connectToWidgetsMarkContextMenuRequested(QWidget *editorWidget);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user