MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

[javadoc] Rename DIV_TOKEN to SLASH

Browse Source 
IJ-CR-159259

GitOrigin-RevId: 9c25fead8e96712d6d5f341494072b18999eec8a
This commit is contained in:
Louis Vignier
2025-05-08 11:35:47 +00:00
committed by intellij-monorepo-bot
parent 3fb1e43d0d
commit e14ae0356b
16 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-frontback-psi-api/src/com/intellij/lexer/JavaDocTokenTypes.java
+1 -1
View File
@@ -68,7 +68,7 @@ public final class JavaDocTokenTypes implements JavaDocCommentTokenTypes {
@Override
public IElementType tagValueDiv() {
return JavaDocTokenType.DOC_TAG_VALUE_DIV_TOKEN;
return JavaDocTokenType.DOC_TAG_VALUE_SLASH;
}
@Override
java/java-frontback-psi-api/src/com/intellij/psi/JavaDocTokenType.java
+6 -6
View File
@@ -28,7 +28,7 @@ public interface JavaDocTokenType {
IElementType DOC_TAG_VALUE_LT = new IJavaDocElementType("DOC_TAG_VALUE_LT");
IElementType DOC_TAG_VALUE_GT = new IJavaDocElementType("DOC_TAG_VALUE_GT");
IElementType DOC_TAG_VALUE_SHARP_TOKEN = new IJavaDocElementType("DOC_TAG_VALUE_SHARP_TOKEN");
IElementType DOC_TAG_VALUE_DIV_TOKEN = new IJavaDocElementType("DOC_TAG_VALUE_DIV_TOKEN");
IElementType DOC_TAG_VALUE_SLASH = new IJavaDocElementType("DOC_TAG_VALUE_SLASH");
// Additional tokens for java 23 markdown
IElementType DOC_CODE_FENCE = new IJavaDocElementType("DOC_CODE_FENCE");
@@ -43,10 +43,10 @@ public interface JavaDocTokenType {
IElementType DOC_COMMENT_BAD_CHARACTER = new IJavaDocElementType("DOC_COMMENT_BAD_CHARACTER");
TokenSet ALL_JAVADOC_TOKENS = TokenSet.create(
DOC_COMMENT_START, DOC_COMMENT_END, DOC_COMMENT_DATA, DOC_SPACE, DOC_COMMENT_LEADING_ASTERISKS, DOC_TAG_NAME,
DOC_INLINE_TAG_START, DOC_INLINE_TAG_END, DOC_TAG_VALUE_TOKEN, DOC_TAG_VALUE_DOT, DOC_TAG_VALUE_COMMA,
DOC_TAG_VALUE_LPAREN, DOC_TAG_VALUE_RPAREN, DOC_TAG_VALUE_SHARP_TOKEN, DOC_TAG_VALUE_DIV_TOKEN, DOC_TAG_VALUE_QUOTE, DOC_TAG_VALUE_COLON,
DOC_TAG_ATTRIBUTE_NAME, DOC_TAG_ATTRIBUTE_VALUE, DOC_CODE_FENCE, DOC_RBRACKET, DOC_LBRACKET, DOC_LPAREN, DOC_RPAREN,
DOC_SHARP, DOC_INLINE_CODE_FENCE, DOC_COMMA
DOC_COMMENT_START, DOC_COMMENT_END, DOC_COMMENT_DATA, DOC_SPACE, DOC_COMMENT_LEADING_ASTERISKS, DOC_TAG_NAME,
DOC_INLINE_TAG_START, DOC_INLINE_TAG_END, DOC_TAG_VALUE_TOKEN, DOC_TAG_VALUE_DOT, DOC_TAG_VALUE_COMMA,
DOC_TAG_VALUE_LPAREN, DOC_TAG_VALUE_RPAREN, DOC_TAG_VALUE_SHARP_TOKEN, DOC_TAG_VALUE_SLASH, DOC_TAG_VALUE_QUOTE, DOC_TAG_VALUE_COLON,
DOC_TAG_ATTRIBUTE_NAME, DOC_TAG_ATTRIBUTE_VALUE, DOC_CODE_FENCE, DOC_RBRACKET, DOC_LBRACKET, DOC_LPAREN, DOC_RPAREN,
DOC_SHARP, DOC_INLINE_CODE_FENCE, DOC_COMMA
);
}
java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicJavaDocParser.java
+1 -1
View File
@@ -27,7 +27,7 @@ public final class BasicJavaDocParser {
private static final TokenSet TAG_VALUES_SET = TokenSet.create(
JavaDocTokenType.DOC_TAG_VALUE_TOKEN, JavaDocTokenType.DOC_TAG_VALUE_COMMA, JavaDocTokenType.DOC_TAG_VALUE_DOT,
JavaDocTokenType.DOC_TAG_VALUE_LPAREN, JavaDocTokenType.DOC_TAG_VALUE_RPAREN,
JavaDocTokenType.DOC_TAG_VALUE_SHARP_TOKEN, JavaDocTokenType.DOC_TAG_VALUE_DIV_TOKEN,
JavaDocTokenType.DOC_TAG_VALUE_SHARP_TOKEN, JavaDocTokenType.DOC_TAG_VALUE_SLASH,
JavaDocTokenType.DOC_TAG_VALUE_LT, JavaDocTokenType.DOC_TAG_VALUE_GT, JavaDocTokenType.DOC_TAG_VALUE_COLON,
JavaDocTokenType.DOC_TAG_VALUE_QUOTE
);
java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt
+1 -1
View File
@@ -309,7 +309,7 @@ class JavaElementTypeConverterExtension : ElementTypeConverterFactory {
JavaDocSyntaxTokenType.DOC_TAG_ATTRIBUTE_VALUE to JavaDocTokenType.DOC_TAG_ATTRIBUTE_VALUE,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_LT to JavaDocTokenType.DOC_TAG_VALUE_LT,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_GT to JavaDocTokenType.DOC_TAG_VALUE_GT,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_DIV_TOKEN to JavaDocTokenType.DOC_TAG_VALUE_DIV_TOKEN,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_SLASH to JavaDocTokenType.DOC_TAG_VALUE_SLASH,
JavaDocSyntaxTokenType.DOC_TAG_VALUE_SHARP_TOKEN to JavaDocTokenType.DOC_TAG_VALUE_SHARP_TOKEN,
JavaDocSyntaxTokenType.DOC_CODE_FENCE to JavaDocTokenType.DOC_CODE_FENCE,
JavaDocSyntaxTokenType.DOC_RBRACKET to JavaDocTokenType.DOC_RBRACKET,
java/java-syntax/gen/com/intellij/java/syntax/lexer/_JavaDocLexer.kt
+1 -1
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
java/java-syntax/src/com/intellij/java/syntax/element/JavaDocSyntaxTokenType.kt
+1 -2
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
java/java-syntax/src/com/intellij/java/syntax/lexer/_JavaDocLexer.flex
+1 -4
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; }
java/java-syntax/src/com/intellij/java/syntax/parser/JavaDocParser.kt
+2 -2
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
)
java/java-tests/testData/psi/parser-full/javadocParsing/LinkTag7.txt
+1 -1
View File
@@ -14,7 +14,7 @@ PsiJavaFile:LinkTag7.java
PsiElement(DOC_TAG_VALUE_ELEMENT)
PsiJavaModuleReference
PsiDocToken:DOC_TAG_VALUE_TOKEN('java.util')
PsiDocToken:DOC_TAG_VALUE_DIV_TOKEN('/')
PsiDocToken:DOC_TAG_VALUE_SLASH('/')
PsiDocToken:DOC_INLINE_TAG_END('}')
PsiDocToken:DOC_COMMENT_DATA(' text')
PsiWhiteSpace('\n ')
java/java-tests/testData/psi/parser-full/javadocParsing/LinkTag7_node.txt
+1 -1
View File
@@ -14,7 +14,7 @@ java.FILE
DOC_TAG_VALUE_ELEMENT
MODULE_REFERENCE
DOC_TAG_VALUE_TOKEN
DOC_TAG_VALUE_DIV_TOKEN
DOC_TAG_VALUE_SLASH
DOC_INLINE_TAG_END
DOC_COMMENT_DATA
WHITE_SPACE
java/java-tests/testData/psi/parser-full/javadocParsing/LinkTag8.txt
+1 -1
View File
@@ -32,7 +32,7 @@ PsiJavaFile:LinkTag8.java
PsiElement(DOC_TAG_VALUE_ELEMENT)
PsiJavaModuleReference
PsiDocToken:DOC_TAG_VALUE_TOKEN('java.base')
PsiDocToken:DOC_TAG_VALUE_DIV_TOKEN('/')
PsiDocToken:DOC_TAG_VALUE_SLASH('/')
PsiElement(DOC_METHOD_OR_FIELD_REF)
PsiElement(DOC_REFERENCE_HOLDER)
PsiJavaCodeReferenceElement:java.lang.String
java/java-tests/testData/psi/parser-full/javadocParsing/LinkTag8_node.txt
+1 -1
View File
@@ -32,7 +32,7 @@ java.FILE
DOC_TAG_VALUE_ELEMENT
MODULE_REFERENCE
DOC_TAG_VALUE_TOKEN
DOC_TAG_VALUE_DIV_TOKEN
DOC_TAG_VALUE_SLASH
DOC_METHOD_OR_FIELD_REF
DOC_REFERENCE_HOLDER
JAVA_CODE_REFERENCE
java/java-tests/testData/psi/parser-full/javadocParsing/SeeTag17.txt
+1 -1
View File
@@ -13,7 +13,7 @@ PsiJavaFile:SeeTag17.java
PsiElement(DOC_TAG_VALUE_ELEMENT)
PsiJavaModuleReference
PsiDocToken:DOC_TAG_VALUE_TOKEN('java.base')
PsiDocToken:DOC_TAG_VALUE_DIV_TOKEN('/')
PsiDocToken:DOC_TAG_VALUE_SLASH('/')
PsiWhiteSpace('\n ')
PsiDocToken:DOC_COMMENT_END('*/')
PsiWhiteSpace('\n')
java/java-tests/testData/psi/parser-full/javadocParsing/SeeTag17_node.txt
+1 -1
View File
@@ -13,7 +13,7 @@ java.FILE
DOC_TAG_VALUE_ELEMENT
MODULE_REFERENCE
DOC_TAG_VALUE_TOKEN
DOC_TAG_VALUE_DIV_TOKEN
DOC_TAG_VALUE_SLASH
WHITE_SPACE
DOC_COMMENT_END
WHITE_SPACE
java/java-tests/testData/psi/parser-full/javadocParsing/SeeTag18.txt
+1 -1
View File
@@ -13,7 +13,7 @@ PsiJavaFile:SeeTag18.java
PsiElement(DOC_TAG_VALUE_ELEMENT)
PsiJavaModuleReference
PsiDocToken:DOC_TAG_VALUE_TOKEN('java.base')
PsiDocToken:DOC_TAG_VALUE_DIV_TOKEN('/')
PsiDocToken:DOC_TAG_VALUE_SLASH('/')
PsiElement(DOC_METHOD_OR_FIELD_REF)
PsiElement(DOC_REFERENCE_HOLDER)
PsiJavaCodeReferenceElement:java.util.ArrayList
java/java-tests/testData/psi/parser-full/javadocParsing/SeeTag18_node.txt
+1 -1
View File
@@ -13,7 +13,7 @@ java.FILE
DOC_TAG_VALUE_ELEMENT
MODULE_REFERENCE
DOC_TAG_VALUE_TOKEN
DOC_TAG_VALUE_DIV_TOKEN
DOC_TAG_VALUE_SLASH
DOC_METHOD_OR_FIELD_REF
DOC_REFERENCE_HOLDER
JAVA_CODE_REFERENCE