From 1a476dd11440c1fa1b917c9c6dd758b4fa87015a Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 30 Jul 2019 17:29:53 +0200
Subject: [PATCH] cleanup

GitOrigin-RevId: 034169c14d41e0c736e7bc7e133718b084c149ff
---
 .../settings-repository/src/IcsSettings.kt    | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/plugins/settings-repository/src/IcsSettings.kt b/plugins/settings-repository/src/IcsSettings.kt
index ca44832f6ddd..e51f58cab617 100644
--- a/plugins/settings-repository/src/IcsSettings.kt
+++ b/plugins/settings-repository/src/IcsSettings.kt
@@ -23,7 +23,7 @@ class MyPrettyPrinter : DefaultPrettyPrinter() {
     _arrayIndenter = NopIndenter.instance
   }
 
-  override fun createInstance(): MyPrettyPrinter = MyPrettyPrinter()
+  override fun createInstance() = MyPrettyPrinter()
 
   override fun writeObjectFieldValueSeparator(jg: JsonGenerator) {
     jg.writeRaw(": ")
@@ -86,17 +86,12 @@ class ReadonlySource(var url: String? = null, var active: Boolean = true) {
   val path: String?
     @JsonIgnore
     get() {
-      if (url == null) {
-        return null
-      }
-      else {
-        var fileName = PathUtilRt.getFileName(url!!)
-        val suffix = ".git"
-        if (fileName.endsWith(suffix)) {
-          fileName = fileName.substring(0, fileName.length - suffix.length)
-        }
-        // the convention is that the .git extension should be used for bare repositories
-        return "${sanitizeFileName(fileName)}.${Integer.toHexString(url!!.hashCode())}.git"
+      var fileName = PathUtilRt.getFileName(url ?: return null)
+      val suffix = ".git"
+      if (fileName.endsWith(suffix)) {
+        fileName = fileName.substring(0, fileName.length - suffix.length)
       }
+      // the convention is that the .git extension should be used for bare repositories
+      return "${sanitizeFileName(fileName)}.${Integer.toHexString(url!!.hashCode())}.git"
     }
 }
\ No newline at end of file