From 203c8ea1256b8d7ffb3e68455c5fc7822bbe8873 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 6 Apr 2015 13:03:56 +0200 Subject: [PATCH] compilation fix --- .../org/jetbrains/kotlin/parsing/CommentBinders.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt index 17bec9da4bd..0c791b8a605 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt @@ -33,10 +33,10 @@ object PrecedingCommentsBinder : WhitespacesAndCommentsBinder { // 2. bind plain comments var result = tokens.size() - for (idx in tokens.indices.reversed()) { + @tokens for (idx in tokens.indices.reversed()) { val tokenType = tokens[idx] when (tokenType) { - JetTokens.WHITE_SPACE -> if (StringUtil.getLineBreakCount(getter[idx]) > 1) break + JetTokens.WHITE_SPACE -> if (StringUtil.getLineBreakCount(getter[idx]) > 1) break@tokens in JetTokens.COMMENTS -> { if (idx == 0 || tokens[idx - 1] == JetTokens.WHITE_SPACE && StringUtil.containsLineBreak(getter[idx - 1])) { @@ -44,7 +44,7 @@ object PrecedingCommentsBinder : WhitespacesAndCommentsBinder { } } - else -> break + else -> break@tokens } } @@ -72,14 +72,14 @@ object TrailingCommentsBinder : WhitespacesAndCommentsBinder { if (tokens.isEmpty()) return 0 var result = 0 - for (idx in tokens.indices) { + @tokens for (idx in tokens.indices) { val tokenType = tokens[idx] when (tokenType) { - JetTokens.WHITE_SPACE -> if (StringUtil.containsLineBreak(getter[idx])) break + JetTokens.WHITE_SPACE -> if (StringUtil.containsLineBreak(getter[idx])) break@tokens JetTokens.EOL_COMMENT, JetTokens.BLOCK_COMMENT -> result = idx + 1 - else -> break + else -> break@tokens } }