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

Reserve "async* {}", extend the quick-fix

Browse Source
This commit is contained in:
Andrey Breslav
2015-12-21 06:52:49 +03:00
parent 45074841a4
commit a7e7d53e2b
13 changed files with 102 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java
+2 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.cfg;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
@@ -285,6 +286,6 @@ public final class WhenChecker {
}
public static void checkReservedPrefix(@NotNull BindingTrace trace, @NotNull KtWhenExpression expression) {
KtPsiUtilKt.checkReservedPrefixWord(trace, expression.getWhenKeyword(), "sealed", "sealed when");
KtPsiUtilKt.checkReservedPrefixWord(trace, expression.getWhenKeyword(), "sealed", TokenSet.EMPTY, "sealed when");
}
}
compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java
+5 -1
View File
@@ -241,11 +241,15 @@ public interface KtTokens {
TokenSet OPERATIONS = TokenSet.create(AS_KEYWORD, AS_SAFE, IS_KEYWORD, IN_KEYWORD, DOT, PLUSPLUS, MINUSMINUS, EXCLEXCL, MUL, PLUS,
MINUS, EXCL, DIV, PERC, LT, GT, LTEQ, GTEQ, EQEQEQ, EXCLEQEQEQ, EQEQ, EXCLEQ, ANDAND, OROR,
SAFE_ACCESS, ELVIS,
// MAP, FILTER,
RANGE, EQ, MULTEQ, DIVEQ, PERCEQ, PLUSEQ, MINUSEQ,
NOT_IN, NOT_IS,
IDENTIFIER);
TokenSet BINARY_OPERATIONS = TokenSet.create(AS_KEYWORD, AS_SAFE, IS_KEYWORD, IN_KEYWORD, MUL, PLUS,
MINUS, DIV, PERC, LT, GT, LTEQ, GTEQ, EQEQEQ, EXCLEQEQEQ, EQEQ, EXCLEQ, ANDAND, OROR,
ELVIS, RANGE, EQ, MULTEQ, DIVEQ, PERCEQ, PLUSEQ, MINUSEQ,
NOT_IN, NOT_IS);
TokenSet AUGMENTED_ASSIGNMENTS = TokenSet.create(PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, DIVEQ);
TokenSet ALL_ASSIGNMENTS = TokenSet.create(EQ, PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, DIVEQ);
}
compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+14 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.codeInsight.CommentUtilCore;
import com.intellij.util.containers.ContainerUtil;
@@ -608,9 +609,21 @@ public class KtPsiUtil {
return prev;
}
/**
* Example:
* code: async* {}
* element = "{}"
* word = "async"
* suffixTokens = [+, -, *, /, %]
*
* result = async
*/
@Nullable
public static PsiElement getPreviousWord(@NotNull PsiElement element, @NotNull String word) {
public static PsiElement getPreviousWord(@NotNull PsiElement element, @NotNull String word, @NotNull TokenSet suffixTokens) {
PsiElement prev = prevLeafIgnoringWhitespaceAndComments(element);
if (prev != null && suffixTokens.contains(prev.getNode().getElementType())) {
prev = PsiTreeUtil.prevLeaf(prev, false);
}
if (prev != null && prev.getNode().getElementType() == KtTokens.IDENTIFIER && word.equals(prev.getText())) {
return prev;
}
compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
+3 -2
View File
@@ -23,6 +23,7 @@ import com.intellij.psi.PsiParameter
import com.intellij.psi.PsiParameterList
import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.stubs.StubElement
import com.intellij.psi.tree.TokenSet
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.KtNodeTypes
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
@@ -434,8 +435,8 @@ fun canPlaceAfterSimpleNameEntry(element: PsiElement?): Boolean {
return !BAD_NEIGHBOUR_FOR_SIMPLE_TEMPLATE_ENTRY_PATTERN.matches(entryText)
}
fun checkReservedPrefixWord(sink: DiagnosticSink, element: PsiElement, word: String, message: String) {
KtPsiUtil.getPreviousWord(element, word)?.let {
fun checkReservedPrefixWord(sink: DiagnosticSink, element: PsiElement, word: String, suffixTokens: TokenSet, message: String) {
KtPsiUtil.getPreviousWord(element, word, suffixTokens)?.let {
sink.report(Errors.UNSUPPORTED.on(it, message))
}
}
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt
+1 -1
View File
@@ -159,7 +159,7 @@ internal class FunctionsTypingVisitor(facade: ExpressionTypingInternals) : Expre
}
private fun checkReservedAsync(context: ExpressionTypingContext, expression: PsiElement) {
checkReservedPrefixWord(context.trace, expression, "async", "async block/lambda. Use 'async() { ... }' or 'async(fun...)'")
checkReservedPrefixWord(context.trace, expression, "async", KtTokens.BINARY_OPERATIONS, "async block/lambda. Use 'async() { ... }' or 'async(fun...)'")
}
private fun createFunctionLiteralDescriptor(
compiler/testData/diagnostics/tests/ReservedAsync.kt
Vendored
+22
View File
@@ -20,4 +20,26 @@ fun test(foo: Any) {
foo async (fun () {})
async (fun () {})
}
object async {
operator fun plus(f: () -> Unit) = f()
operator fun minus(f: () -> Unit) = f()
operator fun times(f: () -> Unit) = f()
operator fun div(f: () -> Unit) = f()
operator fun mod(f: () -> Unit) = f()
}
fun test() {
<!UNSUPPORTED!>async<!>+ {}
<!UNSUPPORTED!>async<!>- {}
<!UNSUPPORTED!>async<!>* {}
<!UNSUPPORTED!>async<!>/ {}
<!UNSUPPORTED!>async<!>% {}
async + {}
async - {}
async * {}
async / {}
async % {}
}
compiler/testData/diagnostics/tests/ReservedAsync.txt
Vendored
+13
View File
@@ -1,5 +1,18 @@
package
public fun async(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
public fun test(): kotlin.Unit
public fun test(/*0*/ foo: kotlin.Any): kotlin.Unit
public infix fun kotlin.Any.async(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
public object async {
private constructor async()
public final operator fun div(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final operator fun minus(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
public final operator fun mod(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
public final operator fun plus(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
public final operator fun times(/*0*/ f: () -> kotlin.Unit): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
idea/src/org/jetbrains/kotlin/idea/quickfix/UnsupportedAsyncFix.kt
+10 -2
View File
@@ -23,6 +23,7 @@ import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.codeInsight.surroundWith.expression.KotlinParenthesesSurrounder
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtBinaryExpression
import org.jetbrains.kotlin.psi.KtCallExpression
import org.jetbrains.kotlin.psi.KtFile
@@ -33,8 +34,15 @@ public class UnsupportedAsyncFix(val psiElement: PsiElement): KotlinQuickFixActi
override fun getText(): String = familyName
override fun invoke(project: Project, editor: Editor?, file: KtFile) {
if (element is KtBinaryExpression && element.right != null) {
KotlinParenthesesSurrounder.surroundWithParentheses(element.right!!)
if (element is KtBinaryExpression) {
if (element.operationToken != KtTokens.IDENTIFIER) {
// async+ {}
element.addBefore(KtPsiFactory(element).createWhiteSpace(), element.operationReference)
}
else if (element.right != null) {
// foo async {}
KotlinParenthesesSurrounder.surroundWithParentheses(element.right!!)
}
}
if (element is KtCallExpression) {
idea/testData/inspections/cleanup/cleanup.kt
Vendored
+5
View File
@@ -79,6 +79,9 @@ fun infixTest() {
fun async(f: () -> Unit) {}
infix fun Any.async(f: () -> Unit) {}
object async {
operator fun times(f: () -> Unit) = f()
}
fun test(foo: Any) {
async { }
@@ -94,5 +97,7 @@ fun test(foo: Any) {
foo async (fun () {})
async (fun () {})
async* {}
}
idea/testData/inspections/cleanup/cleanup.kt.after
Vendored
+5
View File
@@ -78,6 +78,9 @@ fun infixTest() {
fun async(f: () -> Unit) {}
infix fun Any.async(f: () -> Unit) {}
object async {
operator fun times(f: () -> Unit) = f()
}
fun test(foo: Any) {
async() { }
@@ -93,5 +96,7 @@ fun test(foo: Any) {
foo async (fun () {})
async (fun () {})
async * {}
}
idea/testData/quickfix/asyncUnsupported/asyncWithTimes.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// "Migrate unsupported async syntax" "true"
object async {
operator fun times(f: () -> Unit) = f()
}
fun test() {
asy<caret>nc* { }
}
idea/testData/quickfix/asyncUnsupported/asyncWithTimes.kt.after
Vendored
+8
View File
@@ -0,0 +1,8 @@
// "Migrate unsupported async syntax" "true"
object async {
operator fun times(f: () -> Unit) = f()
}
fun test() {
asy<caret>nc * { }
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+6
View File
@@ -540,6 +540,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/asyncUnsupported/asyncWithLambdaAndComment.kt");
doTest(fileName);
}
@TestMetadata("asyncWithTimes.kt")
public void testAsyncWithTimes() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/asyncUnsupported/asyncWithTimes.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/quickfix/autoImports")