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

colon is a tail type, not part of the lookup text (PY-2652)

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-06-28 21:26:20 +02:00
parent d6b38bf165
commit b6e322ba95
5 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/PySpecialMethodNamesCompletionContributor.java
+4 -2
View File
@@ -1,8 +1,10 @@
package com.jetbrains.python.codeInsight;
import com.intellij.codeInsight.TailType;
import com.intellij.codeInsight.completion.*;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.codeInsight.lookup.TailTypeDecorator;
import com.intellij.psi.filters.position.FilterPattern;
import com.intellij.util.ProcessingContext;
import com.jetbrains.python.PyIcons;
@@ -53,12 +55,12 @@ public class PySpecialMethodNamesCompletionContributor extends PySeeingOriginalC
for (Map.Entry<String, PyNames.BuiltinDescription> entry: PyNames.BuiltinMethods.entrySet()) {
LookupElementBuilder item;
item = LookupElementBuilder
.create(entry.getKey() + entry.getValue().getSignature() + ":")
.create(entry.getKey() + entry.getValue().getSignature())
.setBold()
.setTypeText("predefined")
.setIcon(PyIcons.PREDEFINED)
;
result.addElement(item);
result.addElement(TailTypeDecorator.withTail(item, TailType.CASE_COLON));
}
}
}
python/src/com/jetbrains/python/codeInsight/PySuperMethodCompletionContributor.java
+5 -1
View File
@@ -1,7 +1,9 @@
package com.jetbrains.python.codeInsight;
import com.intellij.codeInsight.TailType;
import com.intellij.codeInsight.completion.*;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.codeInsight.lookup.TailTypeDecorator;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.util.PsiTreeUtil;
@@ -44,7 +46,9 @@ public class PySuperMethodCompletionContributor extends CompletionContributor {
for (PyClass ancestor : containingClass.iterateAncestorClasses()) {
for (PyFunction superMethod : ancestor.getMethods()) {
if (!seenNames.contains(superMethod.getName())) {
result.addElement(LookupElementBuilder.create(superMethod.getName() + superMethod.getParameterList().getText() + ":"));
String text = superMethod.getName() + superMethod.getParameterList().getText();
LookupElementBuilder element = LookupElementBuilder.create(text);
result.addElement(TailTypeDecorator.withTail(element, TailType.CASE_COLON));
seenNames.add(superMethod.getName());
}
}
python/testData/completion/duplicateColon.after.py
+2
View File
@@ -0,0 +1,2 @@
class C:
def __init__(self):
python/testData/completion/duplicateColon.py
+2
View File
@@ -0,0 +1,2 @@
class C:
def __ini<caret>:
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+4
View File
@@ -388,4 +388,8 @@ public class PythonCompletionTest extends PyLightFixtureTestCase {
public void testAlias() { // PY-3672
doTest();
}
public void testDuplicateColon() { // PY-2652
doTest();
}
}