Fixed KT-5826 Keyword completion shouldn't kick in in comments

#KT-5826 Fixed
This commit is contained in:
valentin
2014-09-24 21:35:34 +04:00
parent b4909cc849
commit 6e7e13d320
4 changed files with 24 additions and 0 deletions
@@ -42,6 +42,7 @@ import org.jetbrains.jet.lang.psi.JetProperty
import org.jetbrains.jet.lang.psi.JetPsiFactory
import com.intellij.psi.PsiErrorElement
import com.intellij.psi.search.PsiElementProcessor
import com.intellij.psi.PsiComment
public class JetCompletionContributor : CompletionContributor() {
@@ -192,6 +193,10 @@ public class JetCompletionContributor : CompletionContributor() {
val position = parameters.getPosition()
val invocationCount = parameters.getInvocationCount()
// no completion in comments
// TODO: this must be changed if we will have references in doc-comments
if (PsiTreeUtil.getParentOfType(position, javaClass<PsiComment>(), false) != null) return true
// no completion inside number literals
if (AFTER_NUMBER_LITERAL.accepts(position)) return true
@@ -0,0 +1,7 @@
/**
* <caret>
*/
class C
// INVOCATION_COUNT: 1
// NUMBER: 0
@@ -528,6 +528,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
doTest(fileName);
}
@TestMetadata("NoCompletionInDocComment.kt")
public void testNoCompletionInDocComment() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionInDocComment.kt");
doTest(fileName);
}
@TestMetadata("NoEmptyPackage.kt")
public void testNoEmptyPackage() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoEmptyPackage.kt");
@@ -528,6 +528,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
doTest(fileName);
}
@TestMetadata("NoCompletionInDocComment.kt")
public void testNoCompletionInDocComment() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionInDocComment.kt");
doTest(fileName);
}
@TestMetadata("NoEmptyPackage.kt")
public void testNoEmptyPackage() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoEmptyPackage.kt");