azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-06 13:03:56 +02:00
parent 5a0c98ca81
commit 203c8ea125
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
+6 -6
View File
@@ -33,10 +33,10 @@ object PrecedingCommentsBinder : WhitespacesAndCommentsBinder {
// 2. bind plain comments // 2. bind plain comments
var result = tokens.size() var result = tokens.size()
for (idx in tokens.indices.reversed()) { @tokens for (idx in tokens.indices.reversed()) {
val tokenType = tokens[idx] val tokenType = tokens[idx]
when (tokenType) { 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 -> { in JetTokens.COMMENTS -> {
if (idx == 0 || tokens[idx - 1] == JetTokens.WHITE_SPACE && StringUtil.containsLineBreak(getter[idx - 1])) { 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 if (tokens.isEmpty()) return 0
var result = 0 var result = 0
for (idx in tokens.indices) { @tokens for (idx in tokens.indices) {
val tokenType = tokens[idx] val tokenType = tokens[idx]
when (tokenType) { 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 JetTokens.EOL_COMMENT, JetTokens.BLOCK_COMMENT -> result = idx + 1
else -> break else -> break@tokens
} }
} }