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

Create from usage: Fixed up assertions.

Browse Source
This commit is contained in:
Jack Zhou
2013-04-21 12:51:33 -04:00
parent a80ea6904a
commit d20e3413e0
1 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java
+42 -30
View File
@@ -294,8 +294,9 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
private final Map<String, String[]> parameterTypeToNamesMap; private final Map<String, String[]> parameterTypeToNamesMap;
public ParameterNameExpression(@NotNull String[] names, @NotNull Map<String, String[]> parameterTypeToNamesMap) { public ParameterNameExpression(@NotNull String[] names, @NotNull Map<String, String[]> parameterTypeToNamesMap) {
for (String name : names) for (String name : names) {
assert name != null && !name.isEmpty(); assert name != null && !name.isEmpty();
}
this.names = names; this.names = names;
this.parameterTypeToNamesMap = parameterTypeToNamesMap; this.parameterTypeToNamesMap = parameterTypeToNamesMap;
} }
@@ -331,7 +332,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
assert file != null && file instanceof JetFile; assert file != null && file instanceof JetFile;
PsiElement elementAt = file.findElementAt(offset); PsiElement elementAt = file.findElementAt(offset);
JetFunction func = PsiTreeUtil.getParentOfType(elementAt, JetFunction.class); JetFunction func = PsiTreeUtil.getParentOfType(elementAt, JetFunction.class);
assert func != null; if (func == null) return new LookupElement[0];
JetParameterList parameterList = func.getValueParameterList(); JetParameterList parameterList = func.getValueParameterList();
assert parameterList != null; assert parameterList != null;
@@ -339,17 +340,18 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
JetParameter parameter = PsiTreeUtil.getParentOfType(elementAt, JetParameter.class); JetParameter parameter = PsiTreeUtil.getParentOfType(elementAt, JetParameter.class);
if (parameter != null) { if (parameter != null) {
JetTypeReference parameterTypeRef = parameter.getTypeReference(); JetTypeReference parameterTypeRef = parameter.getTypeReference();
assert parameterTypeRef != null; if (parameterTypeRef != null) {
String[] suggestedNamesBasedOnType = parameterTypeToNamesMap.get(parameterTypeRef.getText()); String[] suggestedNamesBasedOnType = parameterTypeToNamesMap.get(parameterTypeRef.getText());
if (suggestedNamesBasedOnType != null) { if (suggestedNamesBasedOnType != null) {
Collections.addAll(names, suggestedNamesBasedOnType); Collections.addAll(names, suggestedNamesBasedOnType);
}
} }
} }
// remember other parameter names for later use // remember other parameter names for later use
Set<String> parameterNames = new HashSet<String>(); Set<String> parameterNames = new HashSet<String>();
for (JetParameter jetParameter : parameterList.getParameters()) { for (JetParameter jetParameter : parameterList.getParameters()) {
if (jetParameter == parameter) continue; if (jetParameter == parameter || jetParameter.getName() == null) continue;
parameterNames.add(jetParameter.getName()); parameterNames.add(jetParameter.getName());
} }
@@ -451,17 +453,20 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
assert file != null && file instanceof JetFile; assert file != null && file instanceof JetFile;
PsiElement elementAt = file.findElementAt(offset); PsiElement elementAt = file.findElementAt(offset);
JetFunction func = PsiTreeUtil.getParentOfType(elementAt, JetFunction.class); JetFunction func = PsiTreeUtil.getParentOfType(elementAt, JetFunction.class);
assert func != null; if (func == null) {
return new TextResult("");
}
List<JetParameter> parameters = func.getValueParameters(); List<JetParameter> parameters = func.getValueParameters();
Set<String> typeParameterNames = new LinkedHashSet<String>(); Set<String> typeParameterNames = new LinkedHashSet<String>();
Collections.addAll(typeParameterNames, typeParameterNamesFromReceiverType); Collections.addAll(typeParameterNames, typeParameterNamesFromReceiverType);
for (JetParameter parameter : parameters) { for (JetParameter parameter : parameters) {
JetTypeReference parameterTypeRef = parameter.getTypeReference(); JetTypeReference parameterTypeRef = parameter.getTypeReference();
assert parameterTypeRef != null; if (parameterTypeRef != null) {
String[] typeParameterNamesFromParameter = parameterTypeToTypeParameterNamesMap.get(parameterTypeRef.getText()); String[] typeParameterNamesFromParameter = parameterTypeToTypeParameterNamesMap.get(parameterTypeRef.getText());
if (typeParameterNamesFromParameter != null) { if (typeParameterNamesFromParameter != null) {
Collections.addAll(typeParameterNames, typeParameterNamesFromParameter); Collections.addAll(typeParameterNames, typeParameterNamesFromParameter);
}
} }
} }
JetTypeReference returnTypeRef = func.getReturnTypeRef(); JetTypeReference returnTypeRef = func.getReturnTypeRef();
@@ -545,7 +550,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
@Override @Override
public void invoke(@NotNull final Project project, Editor editor, PsiFile file) throws IncorrectOperationException { public void invoke(@NotNull final Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
assert file != null && file instanceof JetFile; // TODO: change some assertions to notifications assert file != null && file instanceof JetFile;
currentFile = (JetFile) file; currentFile = (JetFile) file;
currentFileEditor = editor; currentFileEditor = editor;
currentFileContext = AnalyzerFacadeWithCache.analyzeFileWithCache(currentFile).getBindingContext(); currentFileContext = AnalyzerFacadeWithCache.analyzeFileWithCache(currentFile).getBindingContext();
@@ -693,7 +698,10 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
containingFileEditor = fileEditorManager.getSelectedTextEditor(); containingFileEditor = fileEditorManager.getSelectedTextEditor();
JetClassBody classBody = ownerClass.getBody(); JetClassBody classBody = ownerClass.getBody();
assert classBody != null; if (classBody == null) {
classBody = (JetClassBody) ownerClass.add(JetPsiFactory.createEmptyClassBody(project));
ownerClass.addBefore(JetPsiFactory.createWhiteSpace(project), classBody);
}
PsiElement rBrace = classBody.getRBrace(); PsiElement rBrace = classBody.getRBrace();
assert rBrace != null; assert rBrace != null;
func = (JetNamedFunction) classBody.addBefore(func, rBrace); func = (JetNamedFunction) classBody.addBefore(func, rBrace);
@@ -806,20 +814,22 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
replaceWithLongerName(project, receiverTypeRef, selectedReceiverType.getType()); replaceWithLongerName(project, receiverTypeRef, selectedReceiverType.getType());
receiverTypeRef = func.getReceiverTypeRef(); receiverTypeRef = func.getReceiverTypeRef();
assert receiverTypeRef != null; if (receiverTypeRef != null) {
typeRefsToShorten.add(receiverTypeRef); typeRefsToShorten.add(receiverTypeRef);
}
} }
if (!isUnit) { if (!isUnit) {
assert returnTypeExpression != null; assert returnTypeExpression != null;
JetTypeReference returnTypeRef = func.getReturnTypeRef(); JetTypeReference returnTypeRef = func.getReturnTypeRef();
assert returnTypeRef != null; if (returnTypeRef != null) {
JetType returnType = returnTypeExpression.getTypeFromSelection(returnTypeRef.getText()); JetType returnType = returnTypeExpression.getTypeFromSelection(returnTypeRef.getText());
if (returnType != null) { // user selected a given type if (returnType != null) { // user selected a given type
replaceWithLongerName(project, returnTypeRef, returnType); replaceWithLongerName(project, returnTypeRef, returnType);
returnTypeRef = func.getReturnTypeRef(); returnTypeRef = func.getReturnTypeRef();
assert returnTypeRef != null; assert returnTypeRef != null;
typeRefsToShorten.add(returnTypeRef); typeRefsToShorten.add(returnTypeRef);
}
} }
} }
@@ -829,18 +839,20 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
for (int i = 0; i < valueParameters.size(); i++) { for (int i = 0; i < valueParameters.size(); i++) {
JetParameter parameter = valueParameters.get(i); JetParameter parameter = valueParameters.get(i);
JetTypeReference parameterTypeRef = parameter.getTypeReference(); JetTypeReference parameterTypeRef = parameter.getTypeReference();
assert parameterTypeRef != null; if (parameterTypeRef != null) {
JetType parameterType = parameterTypeExpressions[i].getTypeFromSelection(parameterTypeRef.getText()); JetType parameterType = parameterTypeExpressions[i].getTypeFromSelection(parameterTypeRef.getText());
if (parameterType != null) { if (parameterType != null) {
replaceWithLongerName(project, parameterTypeRef, parameterType); replaceWithLongerName(project, parameterTypeRef, parameterType);
parameterIndicesToShorten.add(i); parameterIndicesToShorten.add(i);
}
} }
} }
valueParameters = func.getValueParameters(); valueParameters = func.getValueParameters();
for (int i : parameterIndicesToShorten) { for (int i : parameterIndicesToShorten) {
JetTypeReference parameterTypeRef = valueParameters.get(i).getTypeReference(); JetTypeReference parameterTypeRef = valueParameters.get(i).getTypeReference();
assert parameterTypeRef != null; if (parameterTypeRef != null) {
typeRefsToShorten.add(parameterTypeRef); typeRefsToShorten.add(parameterTypeRef);
}
} }
} }