apply code cleanup; fix couple of deprecations manually

5 files changed, 6 insertions, 6 deletions

diff --git a/src/Formats/FormatService.kt b/src/Formats/FormatService.kt
index cc190346..93470a4c 100644
--- a/src/Formats/FormatService.kt
+++ b/src/Formats/FormatService.kt
@@ -8,7 +8,7 @@ package org.jetbrains.dokka
  * * [MarkdownFormatService] – outputs documentation in Markdown format
  * * [TextFormatService] – outputs documentation in Text format
  */
-public trait FormatService {
+public interface FormatService {
     /** Returns extension for output files */
     val extension: String
 
diff --git a/src/Formats/HtmlTemplateService.kt b/src/Formats/HtmlTemplateService.kt
index 246bd11e..b9900757 100644
--- a/src/Formats/HtmlTemplateService.kt
+++ b/src/Formats/HtmlTemplateService.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.dokka
 
-public trait HtmlTemplateService {
+public interface HtmlTemplateService {
     fun appendHeader(to: StringBuilder, title: String?)
     fun appendFooter(to: StringBuilder)
 
diff --git a/src/Formats/KotlinWebsiteFormatService.kt b/src/Formats/KotlinWebsiteFormatService.kt
index 3b95a915..21fc9dae 100644
--- a/src/Formats/KotlinWebsiteFormatService.kt
+++ b/src/Formats/KotlinWebsiteFormatService.kt
@@ -71,7 +71,7 @@ public class KotlinWebsiteFormatService(locationService: LocationService,
             super.appendBlockCode(to, line, language)
         } else {
             to.append("<pre markdown=\"1\">")
-            to.append(line.trimLeading())
+            to.append(line.trimStart())
             to.append("</pre>")
         }
     }
diff --git a/src/Formats/OutlineService.kt b/src/Formats/OutlineService.kt
index 9f25da50..6c7e882e 100644
--- a/src/Formats/OutlineService.kt
+++ b/src/Formats/OutlineService.kt
@@ -5,7 +5,7 @@ import java.io.File
 /**
  * Service for building the outline of the package contents.
  */
-public trait OutlineFormatService {
+public interface OutlineFormatService {
     fun getOutlineFileName(location: Location): File
 
     public fun appendOutlineHeader(location: Location, node: DocumentationNode, to: StringBuilder)
diff --git a/src/Formats/StructuredFormatService.kt b/src/Formats/StructuredFormatService.kt
index 0ee3c888..a90c60b1 100644
--- a/src/Formats/StructuredFormatService.kt
+++ b/src/Formats/StructuredFormatService.kt
@@ -6,7 +6,7 @@ import org.jetbrains.dokka.LanguageService.RenderMode
 public data class FormatLink(val text: String, val href: String)
 
 enum class ListKind {
-    Ordered
+    Ordered,
     Unordered
 }
 
@@ -183,7 +183,7 @@ public abstract class StructuredFormatService(locationService: LocationService,
             val deprecationValue = deprecationParameter?.details(DocumentationNode.Kind.Value)?.firstOrNull()
             if (deprecationValue != null) {
                 to.append(formatStrong("Deprecated:")).append(" ")
-                appendLine(to, formatText(deprecationValue.name.trim("\"")))
+                appendLine(to, formatText(deprecationValue.name.removeSurrounding("\"")))
                 appendLine(to)
             } else if (deprecation?.content != Content.Empty) {
                 to.append(formatStrong("Deprecated:")).append(" ")