From 30e097a1e05f85b06d3907f516fba68d40b220b5 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 15 May 2019 15:43:45 +0300 Subject: [PATCH] Fix modifiers order and repeating in html fir dump --- .../jetbrains/kotlin/fir/dump/HtmlFirDump.kt | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt index b75519cad09..c4df15f4beb 100644 --- a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt +++ b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt @@ -469,15 +469,6 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver ws modality(status.modality) ws - if (status.isCompanion) { - keyword("companion ") - } - if (status.isInline) { - keyword("inline ") - } - if (status.isInner) { - keyword("inner ") - } if (status.isExpect) { keyword("expect ") } @@ -487,33 +478,33 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver if (status.isOverride) { keyword("override ") } - if (status.isOperator) { - keyword("operator ") + if (status.isInner) { + keyword("inner ") } - if (status.isInfix) { - keyword("infix ") + if (status.isCompanion) { + keyword("companion ") } if (status.isInline) { keyword("inline ") } - if (status.isTailRec) { - keyword("tailrec ") + if (status.isInfix) { + keyword("infix ") } if (status.isExternal) { keyword("external ") } + if (status.isTailRec) { + keyword("tailrec ") + } + if (status.isOperator) { + keyword("operator ") + } if (status.isConst) { keyword("const ") } if (status.isLateInit) { keyword("lateinit ") } - if (status.isInner) { - keyword("inner ") - } - if (status.isCompanion) { - keyword("companion ") - } if (status.isData) { keyword("data ") }