MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-168214 Unexpected live templates in extends <caret> completion

Browse Source
This commit is contained in:
peter
2017-02-15 16:49:03 +01:00
parent 851ffd9ea1
commit 5a3132419e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java
+1 -1
View File
@@ -129,7 +129,7 @@ public abstract class JavaCodeContextType extends TemplateContextType {
if (((PsiJavaCodeReferenceElement)parent).isQualified()) {
return false;
}
if (parent.getParent() instanceof PsiMethodCallExpression) {
if (parent.getParent() instanceof PsiMethodCallExpression || parent.getParent() instanceof PsiReferenceList) {
return false;
}
java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
+7 -6
View File
@@ -593,12 +593,13 @@ class Outer {
void testJavaExpressionContext() {
final TemplateImpl template = TemplateSettings.getInstance().getTemplate("toar", "other")
assertFalse(isApplicable("class Foo {{ if (a <caret>toar) }}", template))
assertTrue(isApplicable("class Foo {{ <caret>toar }}", template))
assertTrue(isApplicable("class Foo {{ return (<caret>toar) }}", template))
assertFalse(isApplicable("class Foo {{ return (aaa <caret>toar) }}", template))
assertTrue(isApplicable("class Foo {{ Runnable r = () -> { <caret>System.out.println(\"foo\"); }; ) }}", template))
assertTrue(isApplicable("class Foo {{ Runnable r = () -> <caret>System.out.println(\"foo\"); ) }}", template))
assert !isApplicable("class Foo {{ if (a <caret>toar) }}", template)
assert isApplicable("class Foo {{ <caret>toar }}", template)
assert isApplicable("class Foo {{ return (<caret>toar) }}", template)
assert !isApplicable("class Foo {{ return (aaa <caret>toar) }}", template)
assert isApplicable("class Foo {{ Runnable r = () -> { <caret>System.out.println(\"foo\"); }; ) }}", template)
assert isApplicable("class Foo {{ Runnable r = () -> <caret>System.out.println(\"foo\"); ) }}", template)
assert !isApplicable("class Foo extends <caret>t {}", template)
}
void testJavaDeclarationContext() {