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

Mark string prefixes and suffixes as unsupported

Browse Source
This commit is contained in:
Andrey Breslav
2015-10-15 16:06:18 +03:00
parent 267ec2724e
commit b050324869
4 changed files with 81 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+31 -2
View File
@@ -31,6 +31,8 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.annotations.Annotations;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.lexer.JetKeywordToken;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*;
@@ -73,8 +75,7 @@ import java.util.Iterator;
import java.util.List;
import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.lexer.JetTokens.AS_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.AS_SAFE;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
import static org.jetbrains.kotlin.resolve.BindingContext.*;
import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.DEPENDENT;
import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT;
@@ -115,6 +116,10 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
@Override
public JetTypeInfo visitConstantExpression(@NotNull JetConstantExpression expression, ExpressionTypingContext context) {
if (expression.getNode().getElementType() == JetNodeTypes.CHARACTER_CONSTANT) {
checkStringPrefixAndSuffix(expression, context);
}
CompileTimeConstant<?> compileTimeConstant = components.constantExpressionEvaluator.evaluateExpression(
expression, context.trace, context.expectedType
);
@@ -1372,6 +1377,9 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
@Override
public JetTypeInfo visitStringTemplateExpression(@NotNull JetStringTemplateExpression expression, ExpressionTypingContext contextWithExpectedType) {
final ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(NO_EXPECTED_TYPE).replaceContextDependency(INDEPENDENT);
checkStringPrefixAndSuffix(expression, context);
class StringTemplateVisitor extends JetVisitorVoid {
private JetTypeInfo typeInfo = TypeInfoFactoryKt.noTypeInfo(context);
@@ -1402,6 +1410,27 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
contextWithExpectedType);
}
private static void checkStringPrefixAndSuffix(@NotNull PsiElement expression, ExpressionTypingContext context) {
checkStringPrefixOrSuffix(PsiTreeUtil.prevLeaf(expression), context);
checkStringPrefixOrSuffix(PsiTreeUtil.nextLeaf(expression), context);
}
private static void checkStringPrefixOrSuffix(PsiElement prefixOrSuffix, ExpressionTypingContext context) {
if (illegalStringPrefixOrSuffix(prefixOrSuffix)) {
context.trace.report(Errors.UNSUPPORTED.on(prefixOrSuffix, "string prefixes and suffixes"));
}
}
private static boolean illegalStringPrefixOrSuffix(@Nullable PsiElement element) {
if (element == null) return false;
IElementType elementType = element.getNode().getElementType();
return elementType == IDENTIFIER ||
elementType == INTEGER_LITERAL ||
elementType == FLOAT_LITERAL ||
elementType instanceof JetKeywordToken;
}
@Override
public JetTypeInfo visitAnnotatedExpression(@NotNull JetAnnotatedExpression expression, ExpressionTypingContext context) {
return visitAnnotatedExpression(expression, context, false);
compiler/testData/diagnostics/tests/StringPrefixAndSuffix.kt
Vendored
+39
View File
@@ -0,0 +1,39 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
infix fun Any?.foo(a: Any) {}
operator fun Any?.contains(a: Any): Boolean = true
fun test(a: Any) {
a <!UNSUPPORTED!>foo<!>""
a <!UNSUPPORTED!>foo<!>"asd"
a <!UNSUPPORTED!>foo<!>"$a"
a <!UNSUPPORTED!>foo<!>"asd${a}sfsa"
a <!UNSUPPORTED!>foo<!>"""sdf"""
a <!UNSUPPORTED!>foo<!>'d'
a <!UNSUPPORTED!>foo<!><!EMPTY_CHARACTER_LITERAL!>''<!>
a <!UNSUPPORTED!>foo<!>""<!UNSUPPORTED!>foo<!> a
a <!UNSUPPORTED!>foo<!>"asd"<!UNSUPPORTED!>foo<!> a
a <!UNSUPPORTED!>foo<!>"$a"<!UNSUPPORTED!>foo<!> a
a <!UNSUPPORTED!>foo<!>"asd${a}sfsa"<!UNSUPPORTED!>foo<!> a
a <!UNSUPPORTED!>foo<!>"""sdf"""<!UNSUPPORTED!>foo<!> a
a <!UNSUPPORTED!>foo<!>'d'<!UNSUPPORTED!>foo<!> a
a <!UNSUPPORTED!>foo<!><!EMPTY_CHARACTER_LITERAL!>''<!><!UNSUPPORTED!>foo<!> a
a <!UNSUPPORTED!>in<!>"foo"
a <!UNSUPPORTED!>in<!>"""foo"""
a <!UNSUPPORTED!>in<!>'s'
a <!UNSUPPORTED!>in<!><!EMPTY_CHARACTER_LITERAL!>''<!>
a <!UNSUPPORTED!>!in<!>"foo"
a <!UNSUPPORTED!>!in<!>"""foo"""
a <!UNSUPPORTED!>!in<!>'s'
a <!UNSUPPORTED!>!in<!><!EMPTY_CHARACTER_LITERAL!>''<!>
if("s"<!UNSUPPORTED!>is<!> Any) {}
test("s"<!UNSUPPORTED!>as<!> Any)
a <!UNSUPPORTED!>foo<!>""<!UNSUPPORTED, SYNTAX!>1<!>
a <!UNSUPPORTED!>foo<!>""<!UNSUPPORTED, SYNTAX!>1.0<!>
}
compiler/testData/diagnostics/tests/StringPrefixAndSuffix.txt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package
public fun test(/*0*/ a: kotlin.Any): kotlin.Unit
public operator fun kotlin.Any?.contains(/*0*/ a: kotlin.Any): kotlin.Boolean
public infix fun kotlin.Any?.foo(/*0*/ a: kotlin.Any): kotlin.Unit
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+6
View File
@@ -589,6 +589,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("StringPrefixAndSuffix.kt")
public void testStringPrefixAndSuffix() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StringPrefixAndSuffix.kt");
doTest(fileName);
}
@TestMetadata("StringTemplates.kt")
public void testStringTemplates() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StringTemplates.kt");