Drop package facades: code cleanup in Kotlin project.

This commit is contained in:
Dmitry Petrov
2015-10-13 14:50:49 +03:00
parent 57869d85e8
commit 8cd624a58a
301 changed files with 1285 additions and 1362 deletions
@@ -25,6 +25,6 @@ import java.util.List;
public class KotlinOutputParser implements PatternAwareOutputParser {
@Override
public boolean parse(String s, OutputLineReader reader, List list, ILogger logger) {
return AndroidPackage.parse(s, reader, list, logger);
return KotlinOutputParserHelperKt.parse(s, reader, list, logger);
}
}
@@ -46,7 +46,7 @@ import java.util.List;
public class KotlinAndroidGotoDeclarationHandler implements GotoDeclarationHandler {
@Override
public PsiElement[] getGotoDeclarationTargets(@Nullable PsiElement sourceElement, int offset, Editor editor) {
JetSimpleNameExpression referenceExpression = NavigationPackage.getReferenceExpression(sourceElement);
JetSimpleNameExpression referenceExpression = GotoResourceHelperKt.getReferenceExpression(sourceElement);
if (referenceExpression == null) {
return null;
}
@@ -61,7 +61,7 @@ public class KotlinAndroidGotoDeclarationHandler implements GotoDeclarationHandl
return null;
}
AndroidResourceUtil.MyReferredResourceFieldInfo info = NavigationPackage.getInfo(referenceExpression, facet);
AndroidResourceUtil.MyReferredResourceFieldInfo info = GotoResourceHelperKt.getInfo(referenceExpression, facet);
if (info == null) return null;