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

type comments are included in method completion

Browse Source
This commit is contained in:
aleksei.kniazev
2019-02-07 13:38:54 +03:00
committed by Aleksei Kniazev
parent dff84e5cf5
commit b81cefd91f
6 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
python/src/com/jetbrains/python/codeInsight/completion/PySuperMethodCompletionContributor.java
View File

@@ -65,12 +65,21 @@ public class PySuperMethodCompletionContributor extends CompletionContributor {
for (PyClass ancestor : containingClass.getAncestorClasses(null)) {
for (PyFunction superMethod : ancestor.getMethods()) {
if (!seenNames.contains(superMethod.getName())) {
String text = superMethod.getName() + superMethod.getParameterList().getText();
if (languageLevel.isAtLeast(LanguageLevel.PYTHON35) && superMethod.getAnnotation() != null) {
text += " " + superMethod.getAnnotation().getText();
StringBuilder builder = new StringBuilder();
builder.append(superMethod.getName())
.append(superMethod.getParameterList().getText());
if (superMethod.getAnnotation() != null) {
builder.append(" ")
.append(superMethod.getAnnotation().getText())
.append(":");
} else if (superMethod.getTypeComment() != null) {
builder.append(": ")
.append(superMethod.getTypeComment().getText());
} else {
builder.append(":");
}
LookupElementBuilder element = LookupElementBuilder.create(text);
result.addElement(TailTypeDecorator.withTail(element, TailType.CASE_COLON));
LookupElementBuilder element = LookupElementBuilder.create(builder.toString());
result.addElement(TailTypeDecorator.withTail(element, TailType.NONE));
seenNames.add(superMethod.getName());
}
}

6
python/testData/completion/superMethodWithAnnotation.after.py
View File

@@ -1,7 +1,9 @@
from typing import Dict
class Parent:
def overridable_method(param: str) -> Dict[str, str]:
def overridable_method(self, param: str) -> Dict[str, str]:
pass
class Child(Parent):
def overridable_method(param: str) -> Dict[str, str]:
def overridable_method(self, param: str) -> Dict[str, str]:

4
python/testData/completion/superMethodWithAnnotation.py
View File

@@ -1,5 +1,7 @@
from typing import Dict
class Parent:
def overridable_method(param: str) -> Dict[str, str]:
def overridable_method(self, param: str) -> Dict[str, str]:
pass

13
python/testData/completion/superMethodWithCommentAnnotation.after.py Normal file
View File

@@ -0,0 +1,13 @@
from typing import Dict
class Parent:
def overridable_method(self,
param # type: str
): # type: (...) -> Dict[str, str]
pass
class Child(Parent):
def overridable_method(self,
param # type: str
): # type: (...) -> Dict[str, str]

11
python/testData/completion/superMethodWithCommentAnnotation.py Normal file
View File

@@ -0,0 +1,11 @@
from typing import Dict
class Parent:
def overridable_method(self,
param # type: str
): # type: (...) -> Dict[str, str]
pass
class Child(Parent):
def over<caret>

6
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
View File

@@ -315,7 +315,11 @@ public class PythonCompletionTest extends PyTestCase {
}
public void testSuperMethodWithAnnotation() {
runWithLanguageLevel(LanguageLevel.PYTHON35, this::doTest);
doTest();
}
public void testSuperMethodWithCommentAnnotation() {
doTest();
}
public void testLocalVarInDictKey() { // PY-2558