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

IDEA-359853 move function on top level, get rid of companion

Browse Source 
GitOrigin-RevId: 314acae6e31cc5eb149c6e3913860a5a7f0b158b
This commit is contained in:
Max Medvedev
2025-04-03 11:33:32 +00:00
committed by intellij-monorepo-bot
parent cd5849015b
commit 7e71653ee6
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-syntax/src/com/intellij/java/syntax/parser/DeclarationParser.kt
+14 -17
View File
@@ -1012,25 +1012,22 @@ open class DeclarationParser(private val myParser: JavaParser) {
else -> myParser.expressionParser.parseConditional(builder)
}
}
}
companion object {
// todo move out companion object???
fun isNonSealedToken(builder: SyntaxTreeBuilder, tokenType: SyntaxElementType?, level: LanguageLevel): Boolean {
if (!JavaFeature.SEALED_CLASSES.isSufficient(level) ||
tokenType !== JavaSyntaxTokenType.IDENTIFIER ||
"non" != builder.tokenText ||
builder.lookAhead(1) !== JavaSyntaxTokenType.MINUS ||
builder.lookAhead(2) !== JavaSyntaxTokenType.IDENTIFIER
) {
return false
}
val maybeNonSealed = builder.mark()
builder.advance(2)
val isNonSealed = PsiKeywords.SEALED == builder.tokenText
maybeNonSealed.rollbackTo()
return isNonSealed
}
fun isNonSealedToken(builder: SyntaxTreeBuilder, tokenType: SyntaxElementType?, level: LanguageLevel): Boolean {
if (!JavaFeature.SEALED_CLASSES.isSufficient(level) ||
tokenType !== JavaSyntaxTokenType.IDENTIFIER ||
"non" != builder.tokenText ||
builder.lookAhead(1) !== JavaSyntaxTokenType.MINUS ||
builder.lookAhead(2) !== JavaSyntaxTokenType.IDENTIFIER
) {
return false
}
val maybeNonSealed = builder.mark()
builder.advance(2)
val isNonSealed = PsiKeywords.SEALED == builder.tokenText
maybeNonSealed.rollbackTo()
return isNonSealed
}
private val TYPE_START: SyntaxElementTypeSet = PRIMITIVE_TYPE_BIT_SET + setOf(JavaSyntaxTokenType.IDENTIFIER, JavaSyntaxTokenType.AT, JavaSyntaxTokenType.VAR_KEYWORD)
java/java-syntax/src/com/intellij/java/syntax/parser/StatementParser.kt
+1 -2
View File
@@ -141,8 +141,7 @@ class StatementParser(private val myParser: JavaParser) {
}
else if (tokenType === JavaSyntaxTokenType.IDENTIFIER || tokenType === JavaSyntaxTokenType.AT) {
val refPos = builder.mark()
val nonSealed = DeclarationParser.isNonSealedToken(builder, tokenType,
this.languageLevel)
val nonSealed = isNonSealedToken(builder, tokenType, languageLevel)
myParser.declarationParser.parseAnnotations(builder)
skipQualifiedName(builder)
val current = builder.tokenType