diff options
| author | David Schulz <david.schulz@qt.io> | 2017-07-26 11:07:32 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2017-07-27 11:42:15 +0000 |
| commit | b1390a07ca3f4f31b2d6bfc9a330485df2940d39 (patch) | |
| tree | 2238072282f664d5fdb54f6b1e4ae176115aef85 /src/plugins/android/javaeditor.cpp | |
| parent | 9205bc7aeb9ff33565dc0ddec621c2b773da46ab (diff) | |
Android: Simplify code assist by using KeywordsCompletionProvider
Change-Id: I566e54e8cb539227019fd9cf94113924d1ac9822
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src/plugins/android/javaeditor.cpp')
| -rw-r--r-- | src/plugins/android/javaeditor.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp index 6cddfa95a6a..81c3112219f 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/src/plugins/android/javaeditor.cpp @@ -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 |