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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Alex Tkachman
2011-12-29 18:39:03 +02:00
parent 12ba58d876 c6caffe02d
commit f632feb4f9
3 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
+2 -1
View File
@@ -79,7 +79,8 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
@Override
public boolean isAcceptable(Object element, PsiElement context) {
//noinspection unchecked
return PsiTreeUtil.getParentOfType(context, JetFile.class, false, JetClass.class, JetFunction.class) != null;
return PsiTreeUtil.getParentOfType(context, JetFile.class, false, JetClassBody.class, JetBlockExpression.class) != null &&
PsiTreeUtil.getParentOfType(context, JetParameterList.class, JetTypeParameterList.class) == null;
}
@Override
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+25 -15
View File
@@ -5,6 +5,7 @@ import com.intellij.debugger.PositionManager;
import com.intellij.debugger.SourcePosition;
import com.intellij.debugger.engine.DebugProcess;
import com.intellij.debugger.requests.ClassPrepareRequestor;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiFile;
@@ -101,23 +102,32 @@ public class JetPositionManager implements PositionManager {
return result;
}
private Collection<String> classNamesForPosition(SourcePosition sourcePosition) {
final JetFile file = (JetFile) sourcePosition.getFile();
JetTypeMapper typeMapper = prepareTypeMapper(file);
private Collection<String> classNamesForPosition(final SourcePosition sourcePosition) {
final Collection<String> names = new ArrayList<String>();
JetClassOrObject jetClass = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetClassOrObject.class);
if (jetClass != null) {
names.addAll(typeMapper.allJvmNames(jetClass));
}
else {
JetFile namespace = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetFile.class);
if (namespace != null) {
names.add(NamespaceCodegen.getJVMClassName(JetPsiUtil.getFQName(namespace)));
ApplicationManager.getApplication().runReadAction(new Runnable() {
@Override
public void run() {
final JetFile file = (JetFile) sourcePosition.getFile();
JetTypeMapper typeMapper = prepareTypeMapper(file);
JetClassOrObject jetClass = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetClassOrObject.class);
if (jetClass != null) {
names.addAll(typeMapper.allJvmNames(jetClass));
}
else {
JetFile namespace = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetFile.class);
if (namespace != null) {
names.add(NamespaceCodegen.getJVMClassName(JetPsiUtil.getFQName(namespace)));
}
else {
names.add(NamespaceCodegen.getJVMClassName(JetPsiUtil.getFQName(file)));
}
}
}
else {
names.add(NamespaceCodegen.getJVMClassName(JetPsiUtil.getFQName(file)));
}
}
});
return names;
}
idea/testData/completion/keywords/InTopScopeAfterPackage.kt
+9
View File
@@ -0,0 +1,9 @@
package Test
<caret>
// EXIST: enum
// EXIST: trait
// EXIST: class
// EXIST: fun