[javadoc] Rename DIV_TOKEN to SLASH

IJ-CR-159259

GitOrigin-RevId: 9c25fead8e96712d6d5f341494072b18999eec8a
This commit is contained in:
Louis Vignier
2025-05-07 18:24:13 +02:00
committed by intellij-monorepo-bot
parent 3fb1e43d0d
commit e14ae0356b
16 changed files with 22 additions and 26 deletions

View File

@@ -1058,7 +1058,7 @@ companion object {
// fall through
63 -> break
21 -> {
return JavaDocSyntaxTokenType.DOC_TAG_VALUE_DIV_TOKEN;
return JavaDocSyntaxTokenType.DOC_TAG_VALUE_SLASH;
}
// fall through
64 -> break

View File

@@ -2,7 +2,6 @@
package com.intellij.java.syntax.element
import com.intellij.platform.syntax.SyntaxElementType
import kotlin.jvm.JvmField
/**
* @see com.intellij.psi.JavaDocTokenType
@@ -28,7 +27,7 @@ object JavaDocSyntaxTokenType {
@JvmField val DOC_TAG_ATTRIBUTE_VALUE: SyntaxElementType = SyntaxElementType("DOC_TAG_ATTRIBUTE_VALUE")
@JvmField val DOC_TAG_VALUE_LT: SyntaxElementType = SyntaxElementType("DOC_TAG_VALUE_LT")
@JvmField val DOC_TAG_VALUE_GT: SyntaxElementType = SyntaxElementType("DOC_TAG_VALUE_GT")
@JvmField val DOC_TAG_VALUE_DIV_TOKEN: SyntaxElementType = SyntaxElementType("DOC_TAG_VALUE_DIV_TOKEN")
@JvmField val DOC_TAG_VALUE_SLASH: SyntaxElementType = SyntaxElementType("DOC_TAG_VALUE_SLASH")
@JvmField val DOC_TAG_VALUE_SHARP_TOKEN: SyntaxElementType = SyntaxElementType("DOC_TAG_VALUE_SHARP_TOKEN")
// Additional tokens for java 23 markdown

View File

@@ -2,9 +2,6 @@ package com.intellij.java.syntax.lexer;
import com.intellij.java.syntax.element.JavaDocSyntaxTokenType
import com.intellij.platform.syntax.SyntaxElementType;
import com.intellij.platform.syntax.util.lexer.FlexLexer
import kotlin.jvm.JvmField
import kotlin.jvm.JvmStatic
@Suppress("ALL")
%%
@@ -101,7 +98,7 @@ LEADING_TOKEN_MARKDOWN="///"
<DOC_TAG_VALUE, DOC_TAG_VALUE_IN_PAREN> ({ALPHA}|[_0-9\."$"\[\]])+ { return JavaDocSyntaxTokenType.DOC_TAG_VALUE_TOKEN; }
<DOC_TAG_VALUE> [\(] { yybegin(DOC_TAG_VALUE_IN_PAREN); return JavaDocSyntaxTokenType.DOC_TAG_VALUE_LPAREN; }
<DOC_TAG_VALUE_IN_PAREN> [\)] { yybegin(DOC_TAG_VALUE); return JavaDocSyntaxTokenType.DOC_TAG_VALUE_RPAREN; }
<DOC_TAG_VALUE> [/] { return JavaDocSyntaxTokenType.DOC_TAG_VALUE_DIV_TOKEN; }
<DOC_TAG_VALUE> [/] { return JavaDocSyntaxTokenType.DOC_TAG_VALUE_SLASH; }
<DOC_TAG_VALUE> [#] { return JavaDocSyntaxTokenType.DOC_TAG_VALUE_SHARP_TOKEN; }
<DOC_TAG_VALUE, DOC_TAG_VALUE_IN_PAREN> [,] { return JavaDocSyntaxTokenType.DOC_TAG_VALUE_COMMA; }
<DOC_TAG_VALUE_IN_PAREN> {WHITE_DOC_SPACE_CHAR}+ { return JavaDocSyntaxTokenType.DOC_SPACE; }

View File

@@ -515,7 +515,7 @@ class JavaDocParser(
refStart: SyntaxTreeBuilder.Marker,
): SyntaxTreeBuilder.Marker? {
builder.advanceLexer()
if (getTokenType() === JavaDocSyntaxTokenType.DOC_TAG_VALUE_DIV_TOKEN) {
if (getTokenType() === JavaDocSyntaxTokenType.DOC_TAG_VALUE_SLASH) {
refStart.rollbackTo()
val containerRef = builder.mark()
val moduleRef = builder.mark()
@@ -627,7 +627,7 @@ class JavaDocParser(
private val TAG_VALUES_SET: SyntaxElementTypeSet = syntaxElementTypeSetOf(
JavaDocSyntaxTokenType.DOC_TAG_VALUE_TOKEN, JavaDocSyntaxTokenType.DOC_TAG_VALUE_COMMA, JavaDocSyntaxTokenType.DOC_TAG_VALUE_DOT,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_LPAREN, JavaDocSyntaxTokenType.DOC_TAG_VALUE_RPAREN,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_DIV_TOKEN, JavaDocSyntaxTokenType.DOC_TAG_VALUE_SHARP_TOKEN,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_SLASH, JavaDocSyntaxTokenType.DOC_TAG_VALUE_SHARP_TOKEN,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_LT, JavaDocSyntaxTokenType.DOC_TAG_VALUE_GT, JavaDocSyntaxTokenType.DOC_TAG_VALUE_COLON,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_QUOTE
)