From bd3d1ef84f303dfe14845e866444bb7ed855365a Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Fri, 22 Aug 2025 16:55:37 +0200 Subject: [PATCH] [syntax, xml] multiplatform xml syntax module GitOrigin-RevId: 98d661e9eda7eafc98877341cebb8b96c9295e18 --- xml/xml-syntax/gen/.pseudoCommonKotlinSourceSet | 0 .../gen/com/intellij/xml/syntax/lexer/__XmlLexer.kt | 1 + .../src/com/intellij/xml/syntax/XmlSyntaxBundle.kt | 8 ++------ .../src/com/intellij/xml/syntax/lexer/XmlLexer.kt | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 xml/xml-syntax/gen/.pseudoCommonKotlinSourceSet diff --git a/xml/xml-syntax/gen/.pseudoCommonKotlinSourceSet b/xml/xml-syntax/gen/.pseudoCommonKotlinSourceSet new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/xml/xml-syntax/gen/com/intellij/xml/syntax/lexer/__XmlLexer.kt b/xml/xml-syntax/gen/com/intellij/xml/syntax/lexer/__XmlLexer.kt index ee1652983fbc..11e31c192f13 100644 --- a/xml/xml-syntax/gen/com/intellij/xml/syntax/lexer/__XmlLexer.kt +++ b/xml/xml-syntax/gen/com/intellij/xml/syntax/lexer/__XmlLexer.kt @@ -8,6 +8,7 @@ import com.intellij.platform.syntax.SyntaxElementType import com.intellij.platform.syntax.util.lexer.FlexLexer import com.intellij.xml.syntax.XmlSyntaxTokenType import com.intellij.xml.syntax.XmlSyntaxElementType +import kotlin.jvm.JvmStatic class __XmlLexer : FlexLexer { companion object { diff --git a/xml/xml-syntax/src/com/intellij/xml/syntax/XmlSyntaxBundle.kt b/xml/xml-syntax/src/com/intellij/xml/syntax/XmlSyntaxBundle.kt index d7af47f75a73..71527e308c44 100644 --- a/xml/xml-syntax/src/com/intellij/xml/syntax/XmlSyntaxBundle.kt +++ b/xml/xml-syntax/src/com/intellij/xml/syntax/XmlSyntaxBundle.kt @@ -2,11 +2,7 @@ package com.intellij.xml.syntax import com.intellij.platform.syntax.i18n.ResourceBundle -import org.jetbrains.annotations.ApiStatus -import org.jetbrains.annotations.Nls -import org.jetbrains.annotations.NonNls -import org.jetbrains.annotations.PropertyKey -import org.jetbrains.annotations.VisibleForTesting +import org.jetbrains.annotations.* import kotlin.jvm.JvmStatic object XmlSyntaxBundle { @@ -37,5 +33,5 @@ object XmlSyntaxBundle { @ApiStatus.Internal object DefaultXmlSyntaxResourcesTestAccessor { val mappings: Map get() = DefaultXmlSyntaxResources.mappings - val defaultJavaSyntaxResourcesName: String get() = DefaultXmlSyntaxResources::class.qualifiedName!! + val defaultJavaSyntaxResourcesName: String get() = "com.intellij.xml.syntax.DefaultXmlSyntaxResources" } diff --git a/xml/xml-syntax/src/com/intellij/xml/syntax/lexer/XmlLexer.kt b/xml/xml-syntax/src/com/intellij/xml/syntax/lexer/XmlLexer.kt index ca762de0c6d7..7011b5ea9d43 100644 --- a/xml/xml-syntax/src/com/intellij/xml/syntax/lexer/XmlLexer.kt +++ b/xml/xml-syntax/src/com/intellij/xml/syntax/lexer/XmlLexer.kt @@ -67,7 +67,7 @@ class _XmlLexer @JvmOverloads constructor( private val STATE_MASK = (1 shl STATE_SHIFT) - 1 init { - assert((STATE_MASK shl 1) <= HtmlLexerConstants.BASE_STATE_MASK) + require((STATE_MASK shl 1) <= HtmlLexerConstants.BASE_STATE_MASK) } } } \ No newline at end of file