From b6337c5e396d51128c9cdf4f03ef5f2335047141 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Fri, 16 May 2025 21:20:57 +0200 Subject: [PATCH] get rid of companion object in XMLParserDefinition GitOrigin-RevId: 8dd0722e11fe159beec7bd28e10a2025f2428235 --- .../lang/html/HTMLParserDefinition.kt | 2 +- .../intellij/lang/xml/XMLParserDefinition.kt | 45 +++++++++---------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/xml/xml-frontback-impl/src/com/intellij/lang/html/HTMLParserDefinition.kt b/xml/xml-frontback-impl/src/com/intellij/lang/html/HTMLParserDefinition.kt index ee9391e85bef..508477d51299 100644 --- a/xml/xml-frontback-impl/src/com/intellij/lang/html/HTMLParserDefinition.kt +++ b/xml/xml-frontback-impl/src/com/intellij/lang/html/HTMLParserDefinition.kt @@ -5,7 +5,7 @@ import com.intellij.lang.ASTNode import com.intellij.lang.ParserDefinition import com.intellij.lang.ParserDefinition.SpaceRequirements import com.intellij.lang.PsiParser -import com.intellij.lang.xml.XMLParserDefinition.Companion.canStickTokensTogether +import com.intellij.lang.xml.canStickTokensTogether import com.intellij.lexer.HtmlLexer import com.intellij.lexer.Lexer import com.intellij.openapi.components.service diff --git a/xml/xml-frontback-impl/src/com/intellij/lang/xml/XMLParserDefinition.kt b/xml/xml-frontback-impl/src/com/intellij/lang/xml/XMLParserDefinition.kt index 1b0752885366..831af20135c0 100644 --- a/xml/xml-frontback-impl/src/com/intellij/lang/xml/XMLParserDefinition.kt +++ b/xml/xml-frontback-impl/src/com/intellij/lang/xml/XMLParserDefinition.kt @@ -51,28 +51,25 @@ open class XMLParserDefinition : override fun spaceExistenceTypeBetweenTokens(left: ASTNode, right: ASTNode): SpaceRequirements = canStickTokensTogether(left, right) - - companion object { - @JvmStatic - fun canStickTokensTogether(left: ASTNode, right: ASTNode): SpaceRequirements = - when { - left.elementType === XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN - || right.elementType === XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN - -> SpaceRequirements.MUST_NOT - - left.elementType === XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER - && right.elementType === XmlTokenType.XML_NAME - -> SpaceRequirements.MUST - - left.elementType === XmlTokenType.XML_NAME - && right.elementType === XmlTokenType.XML_NAME - -> SpaceRequirements.MUST - - left.elementType === XmlTokenType.XML_TAG_NAME - && right.elementType === XmlTokenType.XML_NAME - -> SpaceRequirements.MUST - - else -> SpaceRequirements.MAY - } - } } + +fun canStickTokensTogether(left: ASTNode, right: ASTNode): SpaceRequirements = + when { + left.elementType === XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN + || right.elementType === XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN + -> SpaceRequirements.MUST_NOT + + left.elementType === XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER + && right.elementType === XmlTokenType.XML_NAME + -> SpaceRequirements.MUST + + left.elementType === XmlTokenType.XML_NAME + && right.elementType === XmlTokenType.XML_NAME + -> SpaceRequirements.MUST + + left.elementType === XmlTokenType.XML_TAG_NAME + && right.elementType === XmlTokenType.XML_NAME + -> SpaceRequirements.MUST + + else -> SpaceRequirements.MAY + }