fix: refresh symbol input view when files are opened

AndroidIDEOfficial · Nov 10, 2023 · 5ec2401 · 5ec2401
1 parent 15e29ae
commit 5ec2401
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt
@@ -393,6 +393,10 @@ abstract class BaseEditorActivity :
     }
   }
 
+  protected fun refreshSymbolInput(editor: CodeEditorView) {
+    binding.bottomSheet.refreshSymbolInput(editor)
+  }
+
   private fun handleUiDesignerResult(result: ActivityResult) {
     if (result.resultCode != RESULT_OK || result.data == null) {
       log.warn("UI Designer returned invalid result", result.resultCode, result.data)
@@ -555,10 +559,6 @@ abstract class BaseEditorActivity :
     }
   }
 
-  private fun refreshSymbolInput(editor: CodeEditorView) {
-    binding.bottomSheet.refreshSymbolInput(editor)
-  }
-
   private fun setupDiagnosticInfo() {
     val gd = GradientDrawable()
     gd.shape = GradientDrawable.RECTANGLE

diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
@@ -279,15 +279,18 @@ open class EditorHandlerActivity : ProjectHandlerActivity(), IEditorHandler {
   override fun openFileAndSelect(file: File, selection: Range?) {
     openFile(file, selection)
 
-    getEditorForFile(file)?.editor?.also { editor ->
-      editor.postInLifecycle {
-        if (selection == null) {
-          editor.setSelection(0, 0)
-          return@postInLifecycle
-        }
+    getEditorForFile(file)?.also {
+      refreshSymbolInput(it)
+      it.editor?.also { editor ->
+        editor.postInLifecycle {
+          if (selection == null) {
+            editor.setSelection(0, 0)
+            return@postInLifecycle
+          }
 
-        editor.validateRange(selection)
-        editor.setSelection(selection)
+          editor.validateRange(selection)
+          editor.setSelection(selection)
+        }
       }
     }
   }