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

Make work inserting fqnames for js lib classes

Browse Source
This commit is contained in:
Nikolay Krasko
2012-06-08 12:48:57 +04:00
parent bd068b750c
commit 9987a7f554
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java
+10 -2
View File
@@ -26,6 +26,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.completion.JetLookupObject; import org.jetbrains.jet.plugin.completion.JetLookupObject;
import org.jetbrains.jet.plugin.project.JsModuleDetector;
import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
/** /**
@@ -52,9 +53,16 @@ public class JetClassInsertHandler implements InsertHandler<LookupElement> {
JetLookupObject lookupObject = (JetLookupObject)item.getObject(); JetLookupObject lookupObject = (JetLookupObject)item.getObject();
final DeclarationDescriptor descriptor = lookupObject.getDescriptor(); final DeclarationDescriptor descriptor = lookupObject.getDescriptor();
PsiElement targetElement = lookupObject.getPsiElement(); PsiElement targetElement = lookupObject.getPsiElement();
if (descriptor != null && targetElement != null) { if (descriptor != null) {
final FqName fqn = DescriptorUtils.getFQName(descriptor).toSafe(); final FqName fqn = DescriptorUtils.getFQName(descriptor).toSafe();
ImportInsertHelper.addImportDirectiveOrChangeToFqName(fqn, jetFile, context.getStartOffset(), targetElement);
// TODO: Find out the way for getting psi element for JS libs
if (targetElement != null) {
ImportInsertHelper.addImportDirectiveOrChangeToFqName(fqn, jetFile, context.getStartOffset(), targetElement);
}
else if (JsModuleDetector.isJsModule(jetFile)) {
ImportInsertHelper.addImportDirective(fqn, jetFile);
}
} }
} }
} }