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

Allow for snippets in cmake and qmake project files

Browse Source 
Change-Id: I593595ad130b3fc7b86e22dc2c6fc4cf2c8935bf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-18 15:39:13 +02:00
parent 59bab5e0ac
commit 05a965f161
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp
View File

@@ -59,7 +59,9 @@ IAssistProcessor *CMakeFileCompletionAssistProvider::createProcessor() const
CMakeFileCompletionAssist::CMakeFileCompletionAssist() : CMakeFileCompletionAssist::CMakeFileCompletionAssist() :
KeywordsCompletionAssistProcessor(Keywords()) KeywordsCompletionAssistProcessor(Keywords())
{} {
setSnippetGroup(Constants::CMAKE_SNIPPETS_GROUP_ID);
}
IAssistProposal *CMakeFileCompletionAssist::perform(const AssistInterface *interface) IAssistProposal *CMakeFileCompletionAssist::perform(const AssistInterface *interface)
{ {

5
src/plugins/qmakeprojectmanager/profilecompletionassist.cpp
View File

@@ -28,6 +28,7 @@
#include <texteditor/codeassist/assistinterface.h> #include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/keywordscompletionassist.h> #include <texteditor/codeassist/keywordscompletionassist.h>
#include <texteditor/texteditorconstants.h>
#include <coreplugin/id.h> #include <coreplugin/id.h>
@@ -335,7 +336,9 @@ IAssistProcessor *ProFileCompletionAssistProvider::createProcessor() const
if (m_variables.isEmpty()) if (m_variables.isEmpty())
const_cast<ProFileCompletionAssistProvider *>(this)->init(); const_cast<ProFileCompletionAssistProvider *>(this)->init();
TextEditor::Keywords keywords = TextEditor::Keywords(m_variables, m_functions, QMap<QString, QStringList>()); TextEditor::Keywords keywords = TextEditor::Keywords(m_variables, m_functions, QMap<QString, QStringList>());
return new KeywordsCompletionAssistProcessor(keywords); auto processor = new KeywordsCompletionAssistProcessor(keywords);
processor->setSnippetGroup(TextEditor::Constants::TEXT_SNIPPET_GROUP_ID);
return processor;
} }
QStringList ProFileCompletionAssistProvider::variables() const QStringList ProFileCompletionAssistProvider::variables() const