1 files changed, 15 insertions, 1 deletions
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index d1035bc197..a9a9faa993 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -58,6 +58,19 @@ public:
     JavaEditor()
     {
         setDuplicateSupported(true);
+    }
+};
+
+
+//
+// JavaEditorWidget
+//
+
+class JavaEditorWidget : public TextEditor::BaseTextEditorWidget
+{
+public:
+    JavaEditorWidget()
+    {
         setCompletionAssistProvider(ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>());
     }
 };
@@ -106,8 +119,9 @@ JavaEditorFactory::JavaEditorFactory()
     setDisplayName(tr("Java Editor"));
     addMimeType(Constants::JAVA_MIMETYPE);
 
-    setEditorCreator([]() { return new JavaEditor; });
     setDocumentCreator([]() { return new JavaDocument; });
+    setEditorWidgetCreator([]() { return new JavaEditorWidget; });
+    setEditorCreator([]() { return new JavaEditor; });
     setAutoCompleterCreator([]() { return new JavaAutoCompleter; });
     setGenericSyntaxHighlighter(QLatin1String(Constants::JAVA_MIMETYPE));
     setCommentStyle(Utils::CommentDefinition::CppStyle);