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

PSI: Add parentheses around annotated expressions in returns

Browse Source 
#KT-8260 Fixed
This commit is contained in:
Alexey Sedunov
2015-06-26 14:19:25 +03:00
parent 8c9863e759
commit f6965b5004
6 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
+2 -3
View File
@@ -549,9 +549,8 @@ public class JetPsiUtil {
IElementType parentOperation = getOperation(parentExpression);
// 'return (@label{...})' case
if (parentExpression instanceof JetReturnExpression && innerExpression instanceof JetLabeledExpression) {
return true;
}
if (parentExpression instanceof JetReturnExpression
&& (innerExpression instanceof JetLabeledExpression || innerExpression instanceof JetAnnotatedExpression)) return true;
// '(x: Int) < y' case
if (innerExpression instanceof JetBinaryExpressionWithTypeRHS && parentOperation == JetTokens.LT) {