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

[cmake] Fix follow symbol for add_subdirectory to not jump to target

Browse Source 
Skip targets list if function name is add_subdirectory

Fixes: QTCREATORBUG-30510
Change-Id: I8c601fb2134fc8a9b2814df01f6ec5eec380c51a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Volodymyr Zibarov
2024-03-08 12:55:42 +02:00
parent f4916b3125
commit 5895ad5659
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
View File

@@ -353,18 +353,25 @@ void CMakeEditorWidget::findLinkAt(const QTextCursor &cursor,
if (buffer.startsWith("${") && buffer.endsWith("}")) if (buffer.startsWith("${") && buffer.endsWith("}"))
buffer = buffer.mid(2, buffer.size() - 3); buffer = buffer.mid(2, buffer.size() - 3);
if (cbs->cmakeSymbolsHash().contains(buffer)) { QString functionName;
if (funcStart > funcEnd) {
int funcStartPos = findWordStart(funcStart);
functionName = textDocument()->textAt(funcStartPos, funcStart - funcStartPos);
}
bool skipTarget = false;
if (functionName.toLower() == "add_subdirectory") {
skipTarget = cbs->projectImportedTargets().contains(buffer)
|| cbs->buildTargetTitles().contains(buffer);
}
if (!skipTarget && cbs->cmakeSymbolsHash().contains(buffer)) {
link = cbs->cmakeSymbolsHash().value(buffer); link = cbs->cmakeSymbolsHash().value(buffer);
addTextStartEndToLink(link); addTextStartEndToLink(link);
return processLinkCallback(link); return processLinkCallback(link);
} }
// Handle include(CMakeFileWithoutSuffix) and find_package(Package) // Handle include(CMakeFileWithoutSuffix) and find_package(Package)
QString functionName; if (!functionName.isEmpty()) {
if (funcStart > funcEnd) {
int funcStartPos = findWordStart(funcStart);
functionName = textDocument()->textAt(funcStartPos, funcStart - funcStartPos);
struct FunctionToHash struct FunctionToHash
{ {
QString functionName; QString functionName;