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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
anna
2011-12-13 13:20:02 +01:00
parent b4523b4b7a 29f1ebc2c6
commit 9d0822aa5c
59 changed files with 732 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPassFactory.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.codeHighlighting.MainHighlightingPassFactory;
import com.intellij.codeHighlighting.Pass;
import com.intellij.codeHighlighting.TextEditorHighlightingPass;
import com.intellij.codeHighlighting.TextEditorHighlightingPassRegistrar;
import com.intellij.codeInsight.daemon.ProblemHighlightFilter;
import com.intellij.openapi.components.AbstractProjectComponent;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -55,7 +56,7 @@ public class PostHighlightingPassFactory extends AbstractProjectComponent implem
if (textRange == null) {
Long lastStamp = file.getUserData(LAST_POST_PASS_TIMESTAMP);
long currentStamp = PsiModificationTracker.SERVICE.getInstance(myProject).getModificationCount();
if (lastStamp != null && lastStamp == currentStamp) {
if (lastStamp != null && lastStamp == currentStamp || !ProblemHighlightFilter.shouldHighlightFile(file)) {
return null;
}
}
java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
+2 -3
View File
@@ -176,7 +176,7 @@ public class SameParameterValueInspection extends GlobalJavaInspectionTool {
public static void inlineSameParameterValue(final PsiMethod method, final PsiParameter parameter, final PsiExpression defToInline) {
final Collection<PsiReference> refsToInline = ReferencesSearch.search(parameter).findAll();
final Runnable runnable = new Runnable() {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
try {
PsiExpression[] exprs = new PsiExpression[refsToInline.size()];
@@ -195,8 +195,7 @@ public class SameParameterValueInspection extends GlobalJavaInspectionTool {
LOG.error(e);
}
}
};
ApplicationManager.getApplication().runWriteAction(runnable);
});
removeParameter(method, parameter);
}