MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

get rid of companion object in XMLParserDefinition

Browse Source 
GitOrigin-RevId: 8dd0722e11fe159beec7bd28e10a2025f2428235
This commit is contained in:
Max Medvedev
2025-05-16 21:20:57 +02:00
committed by intellij-monorepo-bot
parent 3cf70a24d4
commit b6337c5e39
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xml/xml-frontback-impl/src/com/intellij/lang/html/HTMLParserDefinition.kt
View File

@@ -5,7 +5,7 @@ import com.intellij.lang.ASTNode
import com.intellij.lang.ParserDefinition import com.intellij.lang.ParserDefinition
import com.intellij.lang.ParserDefinition.SpaceRequirements import com.intellij.lang.ParserDefinition.SpaceRequirements
import com.intellij.lang.PsiParser 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.HtmlLexer
import com.intellij.lexer.Lexer import com.intellij.lexer.Lexer
import com.intellij.openapi.components.service import com.intellij.openapi.components.service

45
xml/xml-frontback-impl/src/com/intellij/lang/xml/XMLParserDefinition.kt
View File

@@ -51,28 +51,25 @@ open class XMLParserDefinition :
override fun spaceExistenceTypeBetweenTokens(left: ASTNode, right: ASTNode): SpaceRequirements = override fun spaceExistenceTypeBetweenTokens(left: ASTNode, right: ASTNode): SpaceRequirements =
canStickTokensTogether(left, right) 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
}