CMakePM: Jump to function/macro/option definitions in CMake editor

Fixes: QTCREATORBUG-25523
Change-Id: If9ab6651a858e5fa08e8a1c321cb1f757831e14a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2023-09-14 16:22:25 +02:00
parent 8f2221cee8
commit 4d358ae337
3 changed files with 42 additions and 4 deletions

View File

@@ -4,6 +4,7 @@
#include "cmakeeditor.h"
#include "cmakeautocompleter.h"
#include "cmakebuildsystem.h"
#include "cmakefilecompletionassist.h"
#include "cmakeindenter.h"
#include "cmakeprojectconstants.h"
@@ -206,6 +207,11 @@ void CMakeEditorWidget::findLinkAt(const QTextCursor &cursor,
->buildDirectory()
.pathAppended(relativePathSuffix)
.path());
// Check if the symbols is a user defined function or macro
const CMakeBuildSystem *cbs = static_cast<const CMakeBuildSystem *>(bs);
if (cbs->cmakeSymbolsHash().contains(buffer))
return processLinkCallback(cbs->cmakeSymbolsHash().value(buffer));
}
}
// TODO: Resolve more variables
@@ -259,11 +265,11 @@ CMakeEditorFactory::CMakeEditorFactory()
setAutoCompleterCreator([] { return new CMakeAutoCompleter; });
setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
| TextEditorActionHandler::JumpToFileUnderCursor
| TextEditorActionHandler::Format);
| TextEditorActionHandler::FollowSymbolUnderCursor
| TextEditorActionHandler::Format);
ActionContainer *contextMenu = ActionManager::createMenu(Constants::M_CONTEXT);
contextMenu->addAction(ActionManager::command(TextEditor::Constants::JUMP_TO_FILE_UNDER_CURSOR));
contextMenu->addAction(ActionManager::command(TextEditor::Constants::FOLLOW_SYMBOL_UNDER_CURSOR));
contextMenu->addSeparator(Context(Constants::CMAKE_EDITOR_ID));
contextMenu->addAction(ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION));
}