From 4f33807e8a65da74b63b9254c32684124b03ba7f Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Sun, 11 Dec 2022 23:02:48 +0530
Subject: [PATCH] feat: do not create XMLLanguage reflectively in UI Designer

---
 uidesigner/build.gradle                                  | 1 +
 .../com/itsaky/androidide/uidesigner/ShowXmlActivity.kt  | 9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/uidesigner/build.gradle b/uidesigner/build.gradle
index 3e7414881..6083608db 100644
--- a/uidesigner/build.gradle
+++ b/uidesigner/build.gradle
@@ -47,6 +47,7 @@ dependencies {
     implementation project(path: ':actions')
     implementation project(path: ':common')
     implementation project(path: ':editor')
+    implementation project(path: ':editor-languages')
     implementation project(path: ':logger')
     implementation project(path: ':lookup')
     implementation project(path: ':lsp:api')
diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt b/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt
index ae529cbcc..f673ceac2 100644
--- a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt
+++ b/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt
@@ -21,9 +21,9 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import com.blankj.utilcode.util.ReflectUtils
 import com.itsaky.androidide.app.BaseIDEActivity
 import com.itsaky.androidide.editor.IEditorProvider
+import com.itsaky.androidide.language.xml.XMLLanguage
 import com.itsaky.androidide.lookup.Lookup
 import com.itsaky.androidide.preferences.internal.fontSize
 import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE
@@ -63,12 +63,7 @@ class ShowXmlActivity : BaseIDEActivity() {
       editor.editable = false
       editor.typefaceText = jetbrainsMono()
       editor.typefaceLineNumber = jetbrainsMono()
-
-      // TODO(itsaky): Move language implementations to separate module
-      editor.setEditorLanguage(
-        ReflectUtils.reflect("com.itsaky.androidide.language.xml.XMLLanguage").newInstance().get()
-      )
-
+      editor.setEditorLanguage(XMLLanguage())
       editor.setText(intent?.getStringExtra(KEY_XML) ?: "")
       editor.setTextSize(fontSize)
       editor.subscribeEvent(ScrollEvent::class.java) { event, unsubscribe ->