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

Rename method

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-04-09 10:28:07 +04:00
parent eb768ea59a
commit a943e68225
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
+2 -2
View File
@@ -99,7 +99,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
for (JetClassOrObject declaration : classOrObjectDeclarations) {
if (!(declaration instanceof JetEnumEntry)) {
PsiClass lightClass = LightClassUtil.createLightClass(declaration);
PsiClass lightClass = LightClassUtil.getPsiClass(declaration);
if (lightClass != null) {
answer.add(lightClass);
}
@@ -189,7 +189,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
Collection<JetClassOrObject> declarations = lightClassGenerationSupport.findClassOrObjectDeclarationsInPackage(packageFQN, scope);
for (JetClassOrObject declaration : declarations) {
PsiClass aClass = LightClassUtil.createLightClass(declaration);
PsiClass aClass = LightClassUtil.getPsiClass(declaration);
if (aClass != null) {
answer.add(aClass);
}
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java
+2 -2
View File
@@ -111,7 +111,7 @@ public class LightClassUtil {
}
@Nullable
public static PsiClass createLightClass(@Nullable JetClassOrObject classOrObject) {
public static PsiClass getPsiClass(@Nullable JetClassOrObject classOrObject) {
if (classOrObject == null) return null;
return LightClassGenerationSupport.getInstance(classOrObject.getProject()).getPsiClass(classOrObject);
}
@@ -143,7 +143,7 @@ public class LightClassUtil {
// function in a class
JetClassOrObject classOrObject = (JetClassOrObject) parent.getParent();
psiClass = createLightClass(classOrObject);
psiClass = getPsiClass(classOrObject);
}
if (psiClass == null) return null;
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+2 -2
View File
@@ -79,7 +79,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
return null;
}
}
PsiClass lightClass = LightClassUtil.createLightClass((JetClass) element);
PsiClass lightClass = LightClassUtil.getPsiClass((JetClass) element);
if (lightClass == null) {
return null;
}
@@ -250,7 +250,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
element.hasModifier(JetTokens.ABSTRACT_KEYWORD))) {
return;
}
PsiClass lightClass = LightClassUtil.createLightClass(element);
PsiClass lightClass = LightClassUtil.getPsiClass(element);
if (lightClass == null) {
return;
}
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+1 -1
View File
@@ -366,7 +366,7 @@ public class JetSourceNavigationHelper {
}
}
if (!JetPsiUtil.isLocalClass(classOrObject)) {
return LightClassUtil.createLightClass(classOrObject);
return LightClassUtil.getPsiClass(classOrObject);
}
return null;
}
idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java
+2 -2
View File
@@ -64,7 +64,7 @@ public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer
JetElement owner = PsiTreeUtil.getParentOfType(function, JetFunction.class, JetClass.class);
if (owner instanceof JetClass) {
PsiClass delegate = LightClassUtil.createLightClass((JetClass) owner);
PsiClass delegate = LightClassUtil.getPsiClass((JetClass) owner);
if (delegate != null) {
for (PsiMethod method : delegate.getMethods()) {
if (method.getNavigationElement() == function) {
@@ -95,7 +95,7 @@ public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer
if (jetClass != null) {
myElement = jetClass;
PsiClass delegate = LightClassUtil.createLightClass(jetClass);
PsiClass delegate = LightClassUtil.getPsiClass(jetClass);
if (delegate != null && JUnitUtil.isTestClass(delegate)) {
RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(context.getProject(), context);
idea/src/org/jetbrains/jet/plugin/search/KotlinAnnotatedElementsSearcher.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class KotlinAnnotatedElementsSearcher extends AnnotatedElementsSearcher {
if (!(DescriptorUtils.getFQName(descriptor).getFqName().equals(annotationFQN))) return;
if (parentOfType instanceof JetClass) {
PsiClass lightClass = LightClassUtil.createLightClass((JetClass) parentOfType);
PsiClass lightClass = LightClassUtil.getPsiClass((JetClass) parentOfType);
consumer.process(lightClass);
}
else if (parentOfType instanceof JetNamedFunction) {
idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class KotlinDefinitionsSearcher extends QueryExecutorBase<PsiElement, Psi
PsiClass psiClass = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass>() {
@Override
public PsiClass compute() {
return LightClassUtil.createLightClass((JetClass) queryParameters);
return LightClassUtil.getPsiClass((JetClass) queryParameters);
}
});
if (psiClass != null) {
idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase<PsiReference, Re
PsiClass lightClass = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass>() {
@Override
public PsiClass compute() {
return LightClassUtil.createLightClass((JetClass) element);
return LightClassUtil.getPsiClass((JetClass) element);
}
});
if (lightClass != null) {
idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java
+2 -2
View File
@@ -149,7 +149,7 @@ public class JetJavaFacadeTest extends LightCodeInsightFixtureTestCase {
assertInstanceOf(element, JetClass.class);
JetClass aClass = (JetClass) element;
PsiClass createdByWrapDelegate = LightClassUtil.createLightClass(aClass);
PsiClass createdByWrapDelegate = LightClassUtil.getPsiClass(aClass);
assertNull(createdByWrapDelegate);
}
@@ -189,7 +189,7 @@ public class JetJavaFacadeTest extends LightCodeInsightFixtureTestCase {
assertNotNull("Caret should be placed to class definition", jetClass);
// Should not fail!
KotlinLightClass lightClass = (KotlinLightClass) LightClassUtil.createLightClass(jetClass);
KotlinLightClass lightClass = (KotlinLightClass) LightClassUtil.getPsiClass(jetClass);
assertNotNull(String.format("Failed to wrap jetClass '%s' to class", jetClass.getText()), lightClass);
idea/tests/org/jetbrains/jet/plugin/lightClasses/LightClassForLibrarySourceFileTest.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class LightClassForLibrarySourceFileTest extends NavigateToStdlibSourceRe
public void testLightClassForFileFromLibrarySource() throws Exception {
PsiElement navigationElement = getNavigationElement("libraries/stdlib/src/kotlin/Iterators.kt", "FunctionIterator");
assertTrue("FunctionIterator should navigate to JetClassOrObject", navigationElement instanceof JetClassOrObject);
PsiClass lightClass = LightClassUtil.createLightClass((JetClassOrObject) navigationElement);
PsiClass lightClass = LightClassUtil.getPsiClass((JetClassOrObject) navigationElement);
assertTrue("Do not create Kotlin Light Class for file from library sources", !(lightClass instanceof KotlinLightClass));
}