From 6f1f173553a6604a06e4a90b1fa5bc1f91d56db2 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 7 Feb 2013 10:58:52 +0400 Subject: [PATCH] Small refactoring --- .../src/com/intellij/core/CoreJavaFileManager.java | 10 +++++----- .../testSrc/com/intellij/psi/NotNullInnerClass.java | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java b/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java index 848557cc219f..1df60969e17e 100644 --- a/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java +++ b/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java @@ -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; + } } diff --git a/java/java-tests/testSrc/com/intellij/psi/NotNullInnerClass.java b/java/java-tests/testSrc/com/intellij/psi/NotNullInnerClass.java index efd15f247c13..5600b1acd76d 100644 --- a/java/java-tests/testSrc/com/intellij/psi/NotNullInnerClass.java +++ b/java/java-tests/testSrc/com/intellij/psi/NotNullInnerClass.java @@ -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); } }