Small refactoring

This commit is contained in:
Mikhael Bogdanov
2013-02-07 20:33:10 +01:00
committed by Dmitry Jemerov
parent 6fb52b41bc
commit 6f1f173553
2 changed files with 8 additions and 5 deletions
@@ -142,11 +142,7 @@ public class CoreJavaFileManager implements JavaFileManager {
int newComponentStart = 0;
int lookupStart = 0;
while (true) {
if (lookupStart > className.length()) {
return newComponentStart != lookupStart ? null : curClass;
}
while (lookupStart <= className.length()) {
int b = className.indexOf("$", lookupStart);
b = b < 0 ? className.length(): b;
@@ -161,6 +157,10 @@ public class CoreJavaFileManager implements JavaFileManager {
newComponentStart = lookupStart;
curClass = inner;
}
if (lookupStart != newComponentStart) {
return null;
}
}
@@ -45,6 +45,9 @@ public class NotNullInnerClass extends PsiTestCase {
PsiClass clazzInner$Wrong2 = manager.findClass("foo.Nested.Inner$$X", scope);
assertNull(clazzInner$Wrong2);
PsiClass clazzInner$Wrong3 = manager.findClass("foo.Nested.Inner$$", scope);
assertNull(clazzInner$Wrong3);
}
}