Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class ModelSyncStatusWidget(val project: Project) : CustomStatusBarWidget, Statu
IBinding.Status.Disabled -> "Disabled"
IBinding.Status.Initializing -> "Initializing"
is IBinding.Status.Synced -> "Synchronized: ${status.versionHash.take(5)}"
is IBinding.Status.Syncing -> "Synchronizing: ${status.progress()}"
is IBinding.Status.Syncing -> formatSyncingStatusText(status.progress())
is IBinding.Status.Error -> "Synchronization failed: ${status.message}"
is IBinding.Status.NoPermission -> "${status.user} has no permission on ${binding.getBranchRef().repositoryId}"
}
Expand All @@ -281,3 +281,7 @@ class ModelSyncStatusWidget(val project: Project) : CustomStatusBarWidget, Statu
var kotlinx.html.HTMLTag.styleX: String
get() = attributes.get("style") ?: ""
set(value) = attributes.set("style", value)

internal fun formatSyncingStatusText(progress: String?): String {
return progress?.let { "Synchronizing: $it" } ?: "Synchronizing"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.modelix.mps.sync3.ui

import kotlin.test.Test
import kotlin.test.assertEquals

class ModelSyncStatusWidgetTest {
@Test
fun `syncing text omits null progress`() {
assertEquals("Synchronizing", formatSyncingStatusText(null))
}

@Test
fun `syncing text keeps non-null progress`() {
assertEquals("Synchronizing: abcde", formatSyncingStatusText("abcde"))
}
}
Loading