From 6361dd32aaf567c8e03e4aa63006193dc67cca7b Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Sat, 5 May 2018 01:54:31 +0300
Subject: Fix relative uri's generation

when there is matching trailing segments
---
 core/src/main/kotlin/Utilities/Uri.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src')

diff --git a/core/src/main/kotlin/Utilities/Uri.kt b/core/src/main/kotlin/Utilities/Uri.kt
index 5b520188..9827c624 100644
--- a/core/src/main/kotlin/Utilities/Uri.kt
+++ b/core/src/main/kotlin/Utilities/Uri.kt
@@ -19,7 +19,7 @@ fun URI.relativeTo(uri: URI): URI {
         }
 
         // Compute common prefix
-        val commonPartsSize = bParts.zip(cParts).count { (basePart, childPart) -> basePart == childPart }
+        val commonPartsSize = bParts.zip(cParts).takeWhile { (basePart, childPart) -> basePart == childPart }.count()
         bParts.drop(commonPartsSize).joinTo(this, separator = "") { "../" }
         cParts.drop(commonPartsSize).joinTo(this, separator = "/")
     }
-- 
cgit