MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Given "com.Outer<A, B>.Inner" as input getClassParametersText must return empty results. Those A and B are parameters of Outer, not Inner

Browse Source
This commit is contained in:
Maxim Shafirov
2012-04-18 22:08:21 +04:00
parent 098a48cb50
commit 4afdd61d8d
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java
+35 -15
View File
@@ -172,43 +172,63 @@ public abstract class PsiNameHelper {
if (referenceText.indexOf('<') < 0) return ArrayUtil.EMPTY_STRING_ARRAY;
referenceText = removeWhitespace(referenceText);
final char[] chars = referenceText.toCharArray();
int count = 0;
int dim = 0;
for (final char aChar : chars) {
int afterLastDotIndex = 0;
int level = 0;
for (int i = 0; i < chars.length; i++) {
char aChar = chars[i];
switch (aChar) {
case '<':
count++;
if (count == 1) dim++;
level++;
break;
case ',':
if (count == 1) dim++;
case '.':
if (level == 0) afterLastDotIndex = i + 1;
break;
case '>':
count--;
level--;
break;
}
}
if (count != 0 || dim == 0) return ArrayUtil.EMPTY_STRING_ARRAY;
if (level != 0) return ArrayUtil.EMPTY_STRING_ARRAY;
int dim = 0;
for (int i = afterLastDotIndex; i < chars.length; i++) {
char aChar = chars[i];
switch (aChar) {
case '<':
level++;
if (level == 1) dim++;
break;
case ',':
if (level == 1) dim++;
break;
case '>':
level--;
break;
}
}
if (level != 0 || dim == 0) return ArrayUtil.EMPTY_STRING_ARRAY;
final String[] result = new String[dim];
dim = 0;
int ltPos = 0;
for (int i = 0; i < chars.length; i++) {
for (int i = afterLastDotIndex; i < chars.length; i++) {
final char aChar = chars[i];
switch (aChar) {
case '<':
count++;
if (count == 1) ltPos = i;
level++;
if (level == 1) ltPos = i;
break;
case ',':
if (count == 1) {
if (level == 1) {
result[dim++] = new String(chars, ltPos + 1, i - ltPos - 1);
ltPos = i;
}
break;
case '>':
count--;
if (count == 0) result[dim++] = new String(chars, ltPos + 1, i - ltPos - 1);
level--;
if (level == 0) result[dim++] = new String(chars, ltPos + 1, i - ltPos - 1);
break;
}
}