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

Android: Simplify code assist by using KeywordsCompletionProvider

Browse Source 
Change-Id: I566e54e8cb539227019fd9cf94113924d1ac9822
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
David Schulz
2017-07-26 11:07:32 +02:00
parent 9205bc7aeb
commit b1390a07ca
6 changed files with 10 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/javaeditor.cpp
View File

@@ -26,8 +26,8 @@
#include "javaeditor.h"
#include "javaindenter.h"
#include "androidconstants.h"
#include "javacompletionassistprovider.h"
#include <texteditor/codeassist/keywordscompletionassist.h>
#include <coreplugin/editormanager/ieditorfactory.h>
#include <texteditor/normalindenter.h>
#include <texteditor/textdocument.h>
@@ -59,6 +59,14 @@ static TextEditor::TextDocument *createJavaDocument()
JavaEditorFactory::JavaEditorFactory()
{
static QStringList keywords = {
"abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const",
"continue", "default", "do", "double", "else", "enum", "extends", "final", "finally",
"float", "for", "goto", "if", "implements", "import", "instanceof", "int", "interface",
"long", "native", "new", "package", "private", "protected", "public", "return", "short",
"static", "strictfp", "super", "switch", "synchronized", "this", "throw", "throws",
"transient", "try", "void", "volatile", "while"
};
setId(Constants::JAVA_EDITOR_ID);
setDisplayName(tr("Java Editor"));
addMimeType(Constants::JAVA_MIMETYPE);
@@ -67,8 +75,8 @@ JavaEditorFactory::JavaEditorFactory()
setUseGenericHighlighter(true);
setCommentDefinition(Utils::CommentDefinition::CppStyle);
setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection);
setCompletionAssistProvider(new JavaCompletionAssistProvider);
setMarksVisible(true);
setCompletionAssistProvider(new TextEditor::KeywordsCompletionAssistProvider(keywords));
}
} // namespace Internal