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

correctly discriminate read/write Java field from injected javascript

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-05-31 12:16:31 +03:00
parent 9619298bd7
commit c3a00b0e5b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RefCountHolder.java
+11 -8
View File
@@ -19,7 +19,6 @@ import com.intellij.codeInsight.daemon.impl.DaemonProgressIndicator;
import com.intellij.codeInsight.daemon.impl.FileStatusMap;
import com.intellij.codeInsight.daemon.impl.GlobalUsageHelper;
import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector;
import com.intellij.codeInsight.highlighting.ReadWriteUtil;
import com.intellij.codeInspection.deadCode.UnusedDeclarationInspectionBase;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.project.Project;
@@ -282,7 +281,7 @@ class RefCountHolder {
PsiElement refElement = ref.getElement();
PsiElement resolved = ref.resolve();
if (resolved != null) {
ReadWriteAccessDetector.Access access = ReadWriteUtil.getReadWriteAccess(new PsiElement[]{resolved}, refElement);
ReadWriteAccessDetector.Access access = getAccess(ref, resolved);
if (access == ReadWriteAccessDetector.Access.Read || access == ReadWriteAccessDetector.Access.ReadWrite) {
if (isJustIncremented(access, refElement)) continue;
return true;
@@ -292,6 +291,15 @@ class RefCountHolder {
return false;
}
private static ReadWriteAccessDetector.Access getAccess(@NotNull PsiReference ref, @NotNull PsiElement resolved) {
PsiElement start = resolved.getLanguage() == ref.getElement().getLanguage() ? resolved : ref.getElement();
ReadWriteAccessDetector detector = ReadWriteAccessDetector.findDetector(start);
if (detector != null) {
return detector.getReferenceAccess(resolved, ref);
}
return null;
}
// "var++;"
private static boolean isJustIncremented(@NotNull ReadWriteAccessDetector.Access access, @NotNull PsiElement refElement) {
if (access == ReadWriteAccessDetector.Access.ReadWrite &&
@@ -310,14 +318,9 @@ class RefCountHolder {
}
if (array.isEmpty()) return false;
for (PsiReference ref : array) {
final PsiElement refElement = ref.getElement();
if (!(refElement instanceof PsiExpression)) { // possible with incomplete code
return true;
}
PsiElement resolved = ref.resolve();
if (resolved != null) {
ReadWriteAccessDetector.Access access = ReadWriteUtil.getReadWriteAccess(new PsiElement[]{resolved}, refElement);
ReadWriteAccessDetector.Access access = getAccess(ref, resolved);
if (access == ReadWriteAccessDetector.Access.Write || access == ReadWriteAccessDetector.Access.ReadWrite) {
return true;
}