From 8de6017e53eb9615019fcdb391cdb6319d3e3bda Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 3 Aug 2017 15:41:37 +0300 Subject: [PATCH] Minor: rename comments and whitespace binders file --- .../org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java | 4 +++- ...ommentBinders.kt => KotlinWhitespaceAndCommentsBinders.kt} | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename compiler/frontend/src/org/jetbrains/kotlin/parsing/{CommentBinders.kt => KotlinWhitespaceAndCommentsBinders.kt} (100%) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java index c2e7c364a2e..4531d49f5c1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java @@ -35,6 +35,8 @@ import java.util.Set; import static org.jetbrains.kotlin.KtNodeTypes.*; import static org.jetbrains.kotlin.lexer.KtTokens.*; import static org.jetbrains.kotlin.parsing.KotlinParsing.AnnotationParsingMode.DEFAULT; +import static org.jetbrains.kotlin.parsing.KotlinWhitespaceAndCommentsBindersKt.PRECEDING_ALL_COMMENTS_BINDER; +import static org.jetbrains.kotlin.parsing.KotlinWhitespaceAndCommentsBindersKt.TRAILING_ALL_COMMENTS_BINDER; public class KotlinExpressionParsing extends AbstractKotlinParsing { private static final TokenSet WHEN_CONDITION_RECOVERY_SET = TokenSet.create(RBRACE, IN_KEYWORD, NOT_IN, IS_KEYWORD, NOT_IS, ELSE_KEYWORD); @@ -1145,7 +1147,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing { parseStatements(); body.done(BLOCK); - body.setCustomEdgeTokenBinders(CommentBindersKt.PRECEDING_ALL_COMMENTS_BINDER, CommentBindersKt.TRAILING_ALL_COMMENTS_BINDER); + body.setCustomEdgeTokenBinders(PRECEDING_ALL_COMMENTS_BINDER, TRAILING_ALL_COMMENTS_BINDER); expect(RBRACE, "Expecting '}'"); literal.done(FUNCTION_LITERAL); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinWhitespaceAndCommentsBinders.kt similarity index 100% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinWhitespaceAndCommentsBinders.kt