Skip to content

Commit 4c96640

Browse files
committed
fix bugs
1 parent 6657a34 commit 4c96640

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
group 'com.xstudio'
7-
version '1.0.2'
7+
version '1.0.3'
88

99
repositories {
1010
mavenCentral()

src/main/java/com/xstudio/plugin/idea/sj/RequestPathUtil.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
import com.intellij.openapi.module.Module;
44
import com.intellij.openapi.module.ModuleManager;
55
import com.intellij.openapi.project.Project;
6-
import com.intellij.psi.PsiAnnotation;
7-
import com.intellij.psi.PsiAnnotationMemberValue;
8-
import com.intellij.psi.PsiElement;
9-
import com.intellij.psi.PsiMethod;
6+
import com.intellij.psi.*;
107
import com.intellij.psi.impl.java.stubs.index.JavaAnnotationIndex;
118
import com.intellij.psi.impl.source.PsiClassImpl;
129
import com.intellij.psi.impl.source.tree.java.PsiArrayInitializerMemberValueImpl;
10+
import com.intellij.psi.impl.source.tree.java.PsiBinaryExpressionImpl;
1311
import com.intellij.psi.impl.source.tree.java.PsiLiteralExpressionImpl;
1412
import com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl;
1513
import com.intellij.psi.search.GlobalSearchScope;
@@ -133,7 +131,13 @@ private static List<String> getPath(PsiAnnotation psiAnnotation, Mapping mapping
133131
PsiAnnotationMemberValue[] values = ((PsiArrayInitializerMemberValueImpl) value).getInitializers();
134132
StringBuilder sb = new StringBuilder();
135133
for (PsiAnnotationMemberValue path : values) {
136-
paths.add((String) ((PsiLiteralExpressionImpl) path).getValue());
134+
if (path instanceof PsiBinaryExpressionImpl) {
135+
// todo get the PsiBinaryExpressionImpl const value
136+
// PsiReferenceExpression ?
137+
paths.add(((PsiBinaryExpressionImpl) path).getText());
138+
} else {
139+
paths.add((String) ((PsiLiteralExpressionImpl) path).getValue());
140+
}
137141
}
138142
return paths;
139143
}

src/main/resources/META-INF/plugin.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212

1313
<change-notes>
1414
<![CDATA[
15-
1.0.2:
15+
1.0.3:
1616
<ul>
17-
<li>fix when open two or more project</li>
18-
<li>fix when method have more than one value</li>
17+
<li>fix PsiBinaryExpression type method value</li>
1918
</ul>
2019
]]>
2120
</change-notes>

0 commit comments

Comments
 (0)