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

Fixed KT-5142 Code completion of parameter type inserts FQ-name

Browse Source 
#KT-5142 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-05-30 19:28:06 +04:00
parent 7973c9bfca
commit 4a7d4dffdf
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java
+7 -8
View File
@@ -43,23 +43,22 @@ public class JetClassInsertHandler implements InsertHandler<LookupElement> {
int startOffset = context.getStartOffset();
Document document = context.getDocument();
if (!isAfterDot(document, startOffset)) {
String text = DescriptorUtils.getFqName(descriptor).asString();
String fqName = DescriptorUtils.getFqName(descriptor).asString();
// insert dot after because otherwise parser can sometimes produce no suitable reference here
document.replaceString(startOffset, context.getTailOffset(), text + ".");
String tempSuffix = ".xxx"; // we add "xxx" after dot because of some bugs in resolve (see KT-5145)
document.replaceString(startOffset, context.getTailOffset(), fqName + tempSuffix);
int classNameEnd = startOffset + fqName.length();
PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(context.getProject());
psiDocumentManager.commitAllDocuments();
RangeMarker rangeMarker = document.createRangeMarker(startOffset, startOffset + text.length());
RangeMarker rangeMarker = document.createRangeMarker(classNameEnd, classNameEnd + tempSuffix.length());
ShortenReferences.instance$.process((JetFile) context.getFile(), startOffset, startOffset + text.length());
ShortenReferences.instance$.process((JetFile) context.getFile(), startOffset, classNameEnd);
psiDocumentManager.commitAllDocuments();
psiDocumentManager.doPostponedOperationsAndUnblockDocument(document);
if (rangeMarker.isValid()) {
int endOffset = rangeMarker.getEndOffset();
if (endOffset < document.getTextLength() && document.getCharsSequence().charAt(endOffset) == '.') {
document.deleteString(endOffset, endOffset + 1);
}
document.deleteString(rangeMarker.getStartOffset(), rangeMarker.getEndOffset());
}
}
}
idea/testData/completion/handlers/ParameterType.kt
+2
View File
@@ -0,0 +1,2 @@
fun foo(p: StringB<caret>) {
}
idea/testData/completion/handlers/ParameterType.kt.after
+2
View File
@@ -0,0 +1,2 @@
fun foo(p: StringBuilder<caret>) {
}
idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
+2
View File
@@ -137,4 +137,6 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
fun testEnumMember() = doTest(1, "A", null, '\n')
fun testEnumMember1() = doTest(1, "A", null, '\n')
fun testClassFromClassObject() = doTest(1, "Some", null, '\n')
fun testParameterType() = doTest(1, "StringBuilder", " (java.lang)", '\n')
}