Update GitLab URL template

ben-gibson · Aug 29, 2024 · 525b5cf · 525b5cf
1 parent 13296a0
commit 525b5cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/platform/PlatformDetector.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/platform/PlatformDetector.kt
@@ -26,9 +26,7 @@ class PlatformDetector(val project: Project) {
         getRepositoryForFile(projectDirectory) { repository -> getPlatformForRepository(repository).let(consumer) }
     }
 
-    private fun getPlatformForRepository(repository: GitRepository?): Platform? {
-        repository ?: return null
-
+    private fun getPlatformForRepository(repository: GitRepository): Platform? {
         val settings = project.service<ProjectSettings>()
 
         val remote = repository.locateRemote(settings.remote) ?: return null
@@ -41,7 +39,7 @@ class PlatformDetector(val project: Project) {
         }
     }
 
-    private fun getRepositoryForFile(projectDirectory: VirtualFile, consumer: (GitRepository?) -> Unit) {
+    private fun getRepositoryForFile(projectDirectory: VirtualFile, consumer: (GitRepository) -> Unit) {
         val gitRepositoryManager = GitRepositoryManager.getInstance(project)
         val repository = gitRepositoryManager.getRepositoryForFile(projectDirectory)
         if (repository != null) {
@@ -55,7 +53,7 @@ class PlatformDetector(val project: Project) {
                 VcsRepositoryManager.VCS_REPOSITORY_MAPPING_UPDATED,
                 VcsRepositoryMappingListener {
                     busConnection.disconnect()
-                    gitRepositoryManager.getRepositoryForFile(projectDirectory).let(consumer)
+                    gitRepositoryManager.getRepositoryForFile(projectDirectory)?.let(consumer)
                 }
             )
     }

diff --git a/src/main/kotlin/uk/co/ben_gibson/git/link/url/template/UrlTemplates.kt b/src/main/kotlin/uk/co/ben_gibson/git/link/url/template/UrlTemplates.kt
@@ -12,9 +12,9 @@ data class UrlTemplates(val fileAtBranch: String, val fileAtCommit : String, val
 
         fun gitLab(): UrlTemplates {
             return UrlTemplates(
-                "{remote:url}/-/{object}/{branch}/{file:path}/{file:name}{line-block:start}#L{line:start}-{line:end}{line-block:end}",
-                "{remote:url}/-/{object}/{commit}/{file:path}/{file:name}{line-block:start}#L{line:start}-{line:end}{line-block:end}",
-                "{remote:url}/-/commit/{commit}"
+                "{remote:url}/{object}/{branch}/{file:path}/{file:name}{line-block:start}#L{line:start}-{line:end}{line-block:end}",
+                "{remote:url}/{object}/{commit}/{file:path}/{file:name}{line-block:start}#L{line:start}-{line:end}{line-block:end}",
+                "{remote:url}/commit/{commit}"
             )
         }