Refactoring: rename weight result enums

This commit is contained in:
Nikolay Krasko
2014-03-18 18:51:11 +04:00
parent 607314989c
commit 3b60dfa45b
2 changed files with 14 additions and 14 deletions
@@ -38,7 +38,7 @@ public class JetDeclarationRemotenessWeigher extends LookupElementWeigher {
this.file = file; this.file = file;
} }
private enum MyResult { private enum Weight {
kotlinDefaultImport, kotlinDefaultImport,
thisFile, thisFile,
imported, imported,
@@ -57,7 +57,7 @@ public class JetDeclarationRemotenessWeigher extends LookupElementWeigher {
if (psiElement != null) { if (psiElement != null) {
PsiFile elementFile = psiElement.getContainingFile(); PsiFile elementFile = psiElement.getContainingFile();
if (elementFile instanceof JetFile && elementFile.getOriginalFile() == file) { if (elementFile instanceof JetFile && elementFile.getOriginalFile() == file) {
return MyResult.thisFile; return Weight.thisFile;
} }
} }
@@ -68,18 +68,18 @@ public class JetDeclarationRemotenessWeigher extends LookupElementWeigher {
if (NamePackage.isValidJavaFqName(fqName.toString())) { if (NamePackage.isValidJavaFqName(fqName.toString())) {
ImportPath importPath = new ImportPath(fqName.toString()); ImportPath importPath = new ImportPath(fqName.toString());
if (ImportInsertHelper.needImport(importPath, file)) { if (ImportInsertHelper.needImport(importPath, file)) {
return MyResult.notImported; return Weight.notImported;
} }
else { else {
if (ImportInsertHelper.isImportedWithDefault(importPath, file)) { if (ImportInsertHelper.isImportedWithDefault(importPath, file)) {
return MyResult.kotlinDefaultImport; return Weight.kotlinDefaultImport;
} }
return MyResult.imported; return Weight.imported;
} }
} }
} }
} }
return MyResult.normal; return Weight.normal;
} }
} }
@@ -32,7 +32,7 @@ class JetKindWeigher extends LookupElementWeigher {
super(JetKindWeigher.class.getSimpleName()); super(JetKindWeigher.class.getSimpleName());
} }
private enum MyResult { private enum Weight {
localOrParameter, localOrParameter,
property, property,
namedParameter, namedParameter,
@@ -43,31 +43,31 @@ class JetKindWeigher extends LookupElementWeigher {
@NotNull @NotNull
@Override @Override
public MyResult weigh(@NotNull LookupElement element) { public Weight weigh(@NotNull LookupElement element) {
Object object = element.getObject(); Object object = element.getObject();
if (object instanceof JetLookupObject) { if (object instanceof JetLookupObject) {
JetLookupObject lookupObject = (JetLookupObject) object; JetLookupObject lookupObject = (JetLookupObject) object;
DeclarationDescriptor descriptor = lookupObject.getDescriptor(); DeclarationDescriptor descriptor = lookupObject.getDescriptor();
if (descriptor != null) { if (descriptor != null) {
if (descriptor instanceof LocalVariableDescriptor || descriptor instanceof ValueParameterDescriptor) { if (descriptor instanceof LocalVariableDescriptor || descriptor instanceof ValueParameterDescriptor) {
return MyResult.localOrParameter; return Weight.localOrParameter;
} }
else if (descriptor instanceof PropertyDescriptor) { else if (descriptor instanceof PropertyDescriptor) {
return MyResult.property; return Weight.property;
} }
else if (descriptor instanceof PackageViewDescriptor) { else if (descriptor instanceof PackageViewDescriptor) {
return MyResult.packages; return Weight.packages;
} }
} }
} }
else if (object instanceof KotlinNamedParametersContributor.NamedParameterLookupObject) { else if (object instanceof KotlinNamedParametersContributor.NamedParameterLookupObject) {
return MyResult.namedParameter; return Weight.namedParameter;
} }
else if (object instanceof String) { else if (object instanceof String) {
return MyResult.probableKeyword; return Weight.probableKeyword;
} }
return MyResult.normal; return Weight.normal;
} }
@Override @Override