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 index 812c443225..8046ef0e36 100644 --- a/app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt +++ b/app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt @@ -1320,7 +1320,13 @@ abstract class BaseEditorActivity : } } + protected var isRemovingTab: Boolean = false + override fun onTabSelected(tab: Tab) { + if (isRemovingTab) { + return + } + val position = tab.position content.editorContainer.displayedChild = position @@ -1405,6 +1411,8 @@ abstract class BaseEditorActivity : ) } + protected abstract fun updateTabVisibility() + override fun onGroupClick(group: DiagnosticGroup?) { if (group?.file?.exists() == true && FileUtils.isUtf8(group.file)) { doOpenFile(group.file, null) @@ -1720,21 +1728,8 @@ abstract class BaseEditorActivity : ) } - editorViewModel.observeFiles(this) { files -> - if (this is EditorHandlerActivity) { - this.updateTabVisibility() - } else { - content.apply { - if (files.isNullOrEmpty()) { - tabs.visibility = View.GONE - viewContainer.displayedChild = 1 - } else { - tabs.visibility = View.VISIBLE - viewContainer.displayedChild = 0 - } - } - } - + editorViewModel.observeFiles(this) { + updateTabVisibility() invalidateOptionsMenu() } } 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 index 40f2dc6425..ef07c9e5b1 100644 --- a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt +++ b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt @@ -1765,14 +1765,18 @@ open class EditorHandlerActivity : } val tabPosition = getTabPositionForFileIndex(index) - editorViewModel.removeFile(index) + removingTab { + editorViewModel.removeFile(index) - if (tabPosition >= 0) { - content.tabs.removeTabAt(tabPosition) - content.editorContainer.removeViewAt(tabPosition) - shiftPluginIndices(tabPosition + 1, -1) + if (tabPosition >= 0) { + content.editorContainer.removeViewAt(tabPosition) + shiftPluginIndices(tabPosition + 1, -1) + content.tabs.removeTabAt(tabPosition) + } } + syncSelectedTab() + editorViewModel.areFilesModified = hasUnsavedFiles() updateTabs() runAfter() @@ -1865,6 +1869,26 @@ open class EditorHandlerActivity : } } + // Suppresses onTabSelected while tab, view and index state are mid-update. + private inline fun removingTab(block: () -> Unit) { + isRemovingTab = true + try { + block() + } finally { + isRemovingTab = false + } + } + + private fun syncSelectedTab() { + val safeContent = contentOrNull ?: return + if (safeContent.tabs.tabCount > 0) { + safeContent.tabs.getTabAt(safeContent.tabs.selectedTabPosition)?.let(::onTabSelected) + } else { + editorViewModel.setCurrentFile(-1, null) + updateTabVisibility() + } + } + private fun closePluginTab(tabPosition: Int) { val pluginId = tabIndexToPluginId[tabPosition] ?: return @@ -1883,13 +1907,17 @@ open class EditorHandlerActivity : Log.e("EditorHandlerActivity", "Error cleaning up plugin tab $pluginId", e) } - content.tabs.removeTabAt(tabPosition) - content.editorContainer.removeViewAt(tabPosition) + removingTab { + content.editorContainer.removeViewAt(tabPosition) + + pluginTabIndices.remove(pluginId) + tabIndexToPluginId.remove(tabPosition) - pluginTabIndices.remove(pluginId) - tabIndexToPluginId.remove(tabPosition) + shiftPluginIndices(tabPosition + 1, -1) + content.tabs.removeTabAt(tabPosition) + } - shiftPluginIndices(tabPosition + 1, -1) + syncSelectedTab() updateTabVisibility() invalidateOptionsMenu() @@ -2388,7 +2416,7 @@ open class EditorHandlerActivity : return tabManager.canCloseTab(pluginId) } - fun updateTabVisibility() { + override fun updateTabVisibility() { val safeContent = contentOrNull ?: return val hasFiles = editorViewModel.getOpenedFileCount() > 0 val hasPluginTabs = pluginTabIndices.isNotEmpty() diff --git a/app/src/test/java/com/itsaky/androidide/activities/editor/EditorCloseTabTest.kt b/app/src/test/java/com/itsaky/androidide/activities/editor/EditorCloseTabTest.kt new file mode 100644 index 0000000000..68685c708b --- /dev/null +++ b/app/src/test/java/com/itsaky/androidide/activities/editor/EditorCloseTabTest.kt @@ -0,0 +1,200 @@ +package com.itsaky.androidide.activities.editor + +import android.view.View +import com.google.common.truth.Truth.assertThat +import com.itsaky.androidide.app.BaseApplication +import com.itsaky.androidide.databinding.ActivityEditorBinding +import com.itsaky.androidide.databinding.ContentEditorBinding +import com.itsaky.androidide.ui.CodeEditorView +import io.mockk.every +import io.mockk.mockk +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.io.File + +/** + * Verifies tab closing and current file synchronization (ADFA-7144). + */ +@RunWith(RobolectricTestRunner::class) +@Config(application = EditorCloseTabTest.TestApp::class) +class EditorCloseTabTest { + open class TestApp : BaseApplication() + + private lateinit var activity: EditorHandlerActivity + private lateinit var binding: ActivityEditorBinding + + private val fileA = File("/tmp/test/A.kt") + private val fileB = File("/tmp/test/B.kt") + private val fileC = File("/tmp/test/C.kt") + + @Before + fun setUp() { + activity = Robolectric.buildActivity(EditorHandlerActivity::class.java).get() + val activityBinding = mockk(relaxed = true) + val contentBinding = ContentEditorBinding.inflate(activity.layoutInflater) + ActivityEditorBinding::class.java + .getDeclaredField("content") + .apply { isAccessible = true } + .set(activityBinding, contentBinding) + activity._binding = activityBinding + binding = activityBinding + binding.content.tabs.addOnTabSelectedListener(activity) + } + + private fun addFileTab(file: File): CodeEditorView { + val editor = mockk(relaxed = true) + every { editor.parent } returns null + every { editor.file } returns file + every { editor.isModified } returns false + + activity.editorViewModel.addFile(file) + binding.content.editorContainer.addView(editor) + + val tab = + binding.content.tabs + .newTab() + .apply { text = file.name } + binding.content.tabs.addTab(tab) + return editor + } + + @Suppress("UNCHECKED_CAST") + private fun addPluginTab(pluginId: String) { + val pluginIndicesField = + EditorHandlerActivity::class.java.getDeclaredField("pluginTabIndices").apply { + isAccessible = true + } + val tabIndexToPluginIdField = + EditorHandlerActivity::class.java.getDeclaredField("tabIndexToPluginId").apply { + isAccessible = true + } + + val pluginIndices = pluginIndicesField.get(activity) as MutableMap + val tabIndexToPluginId = tabIndexToPluginIdField.get(activity) as MutableMap + + val pos = binding.content.tabs.tabCount + pluginIndices[pluginId] = pos + tabIndexToPluginId[pos] = pluginId + + val dummyView = View(activity) + binding.content.editorContainer.addView(dummyView) + + val tab = + binding.content.tabs + .newTab() + .apply { text = pluginId } + binding.content.tabs.addTab(tab) + } + + @Test + fun `closing active tab updates current file and displayed child to newly shown tab`() { + addFileTab(fileA) + addFileTab(fileB) + + // Select tab 1 (fileB) + binding.content.tabs + .getTabAt(1)!! + .select() + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileB) + assertThat(binding.content.editorContainer.displayedChild).isEqualTo(1) + + // Close fileB (index 1) + activity.closeFile(1) + + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileA) + assertThat(activity.editorViewModel.getCurrentFileIndex()).isEqualTo(0) + assertThat(binding.content.editorContainer.displayedChild).isEqualTo(0) + assertThat(binding.content.tabs.selectedTabPosition).isEqualTo(0) + } + + @Test + fun `closeOthers after closing active tab keeps the shown tab`() { + addFileTab(fileA) + addFileTab(fileB) + addFileTab(fileC) + + // Select tab 0 (fileA) + binding.content.tabs + .getTabAt(0)!! + .select() + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileA) + + // Close fileA. TabLayout selects tab 0 which is now fileB. + activity.closeFile(0) + + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileB) + assertThat(activity.editorViewModel.getCurrentFileIndex()).isEqualTo(0) + assertThat(binding.content.editorContainer.displayedChild).isEqualTo(0) + assertThat(binding.content.tabs.selectedTabPosition).isEqualTo(0) + + // Calling closeOthers should preserve the shown tab (fileB) and close fileC + activity.closeOthers() + + assertThat(activity.editorViewModel.getOpenedFiles()).containsExactly(fileB) + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileB) + } + + @Test + fun `closing a tab to the left of the active tab keeps the active tab and updates indices`() { + addFileTab(fileA) + addFileTab(fileB) + addFileTab(fileC) + + // Select tab 2 (fileC) + binding.content.tabs + .getTabAt(2)!! + .select() + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileC) + assertThat(binding.content.editorContainer.displayedChild).isEqualTo(2) + + // Close fileA (index 0) + activity.closeFile(0) + + assertThat(activity.editorViewModel.getOpenedFiles()).containsExactly(fileB, fileC).inOrder() + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileC) + assertThat(activity.editorViewModel.getCurrentFileIndex()).isEqualTo(1) + assertThat(binding.content.editorContainer.displayedChild).isEqualTo(1) + assertThat(binding.content.tabs.selectedTabPosition).isEqualTo(1) + } + + @Test + fun `closing the last remaining tab clears current file and hides tabs`() { + addFileTab(fileA) + binding.content.tabs + .getTabAt(0)!! + .select() + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileA) + + activity.closeFile(0) + + assertThat(activity.editorViewModel.getCurrentFile()).isNull() + assertThat(activity.editorViewModel.getCurrentFileIndex()).isEqualTo(-1) + assertThat(binding.content.tabs.tabCount).isEqualTo(0) + assertThat(binding.content.tabs.visibility).isEqualTo(View.GONE) + assertThat(binding.content.viewContainer.displayedChild).isEqualTo(1) + } + + @Test + fun `closing an active plugin tab selects neighbouring file tab without desync`() { + addFileTab(fileA) + addPluginTab("plugin.tools") + + // Select plugin tab at position 1 + binding.content.tabs + .getTabAt(1)!! + .select() + assertThat(binding.content.editorContainer.displayedChild).isEqualTo(1) + + // Close current tab (the plugin tab) + activity.closeCurrentFile() + + assertThat(binding.content.tabs.selectedTabPosition).isEqualTo(0) + assertThat(binding.content.editorContainer.displayedChild).isEqualTo(0) + assertThat(activity.editorViewModel.getCurrentFile()).isEqualTo(fileA) + assertThat(activity.editorViewModel.getCurrentFileIndex()).isEqualTo(0) + } +} diff --git a/assets/core.cgt b/assets/core.cgt index 765e26d66f..f9f895770c 100644 Binary files a/assets/core.cgt and b/assets/core.cgt differ