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

rewire logic for ignoring changes in whitespace and comment into the ChangeLocalityDetector.

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-05-18 16:09:23 +04:00
parent 7dd0bb241c
commit a6657f836d
9 changed files with 112 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaChangeLocalityDetector.java
+8 -3
View File
@@ -21,15 +21,20 @@ package com.intellij.codeInsight.daemon.impl;
import com.intellij.codeInsight.daemon.ChangeLocalityDetector;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class JavaChangeLocalityDetector implements ChangeLocalityDetector {
@Override
@Nullable
public PsiElement getChangeHighlightingDirtyScopeFor(final PsiElement element) {
public PsiElement getChangeHighlightingDirtyScopeFor(@NotNull final PsiElement element) {
// optimization
PsiElement parent = element.getParent();
if (element instanceof PsiCodeBlock && parent instanceof PsiMethod && !((PsiMethod)parent).isConstructor() &&
parent.getParent() instanceof PsiClass && !(parent.getParent() instanceof PsiAnonymousClass)) {
if (element instanceof PsiCodeBlock
&& parent instanceof PsiMethod
&& !((PsiMethod)parent).isConstructor()
&& parent.getParent() instanceof PsiClass
&& !(parent.getParent() instanceof PsiAnonymousClass)) {
// for changes inside method, rehighlight codeblock only
// do not use this optimization for constructors and class initializers - to update non-initialized fields
return parent;
platform/lang-api/src/com/intellij/codeInsight/daemon/ChangeLocalityDetector.java
+9 -1
View File
@@ -20,9 +20,17 @@
package com.intellij.codeInsight.daemon;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface ChangeLocalityDetector {
/**
* @param changedElement
* @return the psi element (ancestor of the changedElement) which should be re-highlighted, or null if unsure.
* e.g. in Java we re-highlight enclosing code block only when element inside has changed.
* Note: do not traverse PSI tree upwards here,
* since this ChangeLocalityDetector will be called for the changed element and all its parents anyway.
*/
@Nullable
PsiElement getChangeHighlightingDirtyScopeFor(PsiElement changedElement);
PsiElement getChangeHighlightingDirtyScopeFor(@NotNull PsiElement changedElement);
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultChangeLocalityDetector.java
+35
View File
@@ -0,0 +1,35 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInsight.daemon.impl;
import com.intellij.codeInsight.daemon.ChangeLocalityDetector;
import com.intellij.codeInspection.SuppressionUtil;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiWhiteSpace;
import org.jetbrains.annotations.NotNull;
public class DefaultChangeLocalityDetector implements ChangeLocalityDetector {
@Override
public PsiElement getChangeHighlightingDirtyScopeFor(@NotNull PsiElement changedElement) {
if (changedElement instanceof PsiWhiteSpace ||
changedElement instanceof PsiComment
&& !changedElement.getText().contains(SuppressionUtil.SUPPRESS_INSPECTIONS_TAG_NAME)) {
return changedElement;
}
return null;
}
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiChangeHandler.java
+11 -13
View File
@@ -17,7 +17,6 @@
package com.intellij.codeInsight.daemon.impl;
import com.intellij.codeInsight.daemon.ChangeLocalityDetector;
import com.intellij.codeInspection.SuppressionUtil;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
@@ -214,18 +213,9 @@ public class PsiChangeHandler extends PsiTreeChangeAdapter implements Disposable
return;
}
// optimization
if (whitespaceOptimizationAllowed && UpdateHighlightersUtil.isWhitespaceOptimizationAllowed(document)) {
if (child instanceof PsiWhiteSpace ||
child instanceof PsiComment && !child.getText().contains(SuppressionUtil.SUPPRESS_INSPECTIONS_TAG_NAME)) {
myFileStatusMap.markFileScopeDirty(document, child.getTextRange(), fileLength);
return;
}
}
PsiElement element = child;
PsiElement element = whitespaceOptimizationAllowed && UpdateHighlightersUtil.isWhitespaceOptimizationAllowed(document) ? child : child.getParent();
while (true) {
if (element instanceof PsiFile || element instanceof PsiDirectory) {
if (element == null || element instanceof PsiFile || element instanceof PsiDirectory) {
myFileStatusMap.markAllFilesDirty();
return;
}
@@ -242,10 +232,18 @@ public class PsiChangeHandler extends PsiTreeChangeAdapter implements Disposable
@Nullable
private static PsiElement getChangeHighlightingScope(PsiElement element) {
DefaultChangeLocalityDetector defaultDetector = null;
for (ChangeLocalityDetector detector : Extensions.getExtensions(EP_NAME)) {
if (detector instanceof DefaultChangeLocalityDetector) {
// run default detector last
assert defaultDetector == null : defaultDetector;
defaultDetector = (DefaultChangeLocalityDetector)detector;
continue;
}
final PsiElement scope = detector.getChangeHighlightingDirtyScopeFor(element);
if (scope != null) return scope;
}
return null;
assert defaultDetector != null : "com.intellij.codeInsight.daemon.impl.DefaultChangeLocalityDetector is unregistered";
return defaultDetector.getChangeHighlightingDirtyScopeFor(element);
}
}
platform/platform-resources/src/META-INF/XmlPlugin.xml
+2 -2
View File
@@ -404,7 +404,7 @@
<xml.attributeDescriptorsProvider implementation="com.intellij.html.impl.Html5CustomAttributeDescriptorsProvider"/>
<breadcrumbsPresentationProvider
implementation="com.intellij.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeBreadcrumbsPresentationProvider"/>
<breadcrumbsPresentationProvider implementation="com.intellij.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeBreadcrumbsPresentationProvider"/>
<daemon.changeLocalityDetector implementation="com.intellij.xml.XmlChangeLocalityDetector"/>
</extensions>
</idea-plugin>
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltChangeLocalityDetector.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.intellij.psi.xml.XmlElementType;
import com.intellij.psi.xml.XmlTag;
import com.intellij.psi.xml.XmlToken;
import org.intellij.lang.xpath.xslt.XsltSupport;
import org.jetbrains.annotations.NotNull;
/*
* Created by IntelliJ IDEA.
@@ -30,7 +31,7 @@ import org.intellij.lang.xpath.xslt.XsltSupport;
*/
public class XsltChangeLocalityDetector implements ChangeLocalityDetector {
@Override
public PsiElement getChangeHighlightingDirtyScopeFor(PsiElement changedElement) {
public PsiElement getChangeHighlightingDirtyScopeFor(@NotNull PsiElement changedElement) {
try {
if (changedElement instanceof XmlToken && changedElement.getNode().getElementType() == XmlElementType.XML_ATTRIBUTE_VALUE_TOKEN) {
final PsiElement grandParent = changedElement.getParent().getParent();
resources/src/META-INF/IdeaPlugin.xml
+1
View File
@@ -969,6 +969,7 @@
<highlightErrorFilter implementation="com.intellij.codeInsight.daemon.impl.analysis.JavadocErrorFilter"/>
<daemon.changeLocalityDetector implementation="com.intellij.codeInsight.daemon.impl.JavaChangeLocalityDetector"/>
<daemon.changeLocalityDetector implementation="com.intellij.codeInsight.daemon.impl.DefaultChangeLocalityDetector"/>
<liveTemplateOptionalProcessor implementation="com.intellij.codeInsight.template.impl.ShortenToStaticImportProcessor"/>
<liveTemplateOptionalProcessor implementation="com.intellij.codeInsight.template.impl.ShortenFQNamesProcessor"/>
xml/impl/src/com/intellij/xml/XmlChangeLocalityDetector.java
+36
View File
@@ -0,0 +1,36 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.xml;
import com.intellij.codeInsight.daemon.ChangeLocalityDetector;
import com.intellij.codeInspection.DefaultXmlSuppressionProvider;
import com.intellij.lang.xml.XMLLanguage;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
public class XmlChangeLocalityDetector implements ChangeLocalityDetector {
@Override
public PsiElement getChangeHighlightingDirtyScopeFor(@NotNull PsiElement changedElement) {
// rehighlight everything when inspection suppress comment changed
if (changedElement.getLanguage() instanceof XMLLanguage
&& changedElement instanceof PsiComment
&& changedElement.getText().contains(DefaultXmlSuppressionProvider.SUPPRESS_MARK)) {
return changedElement.getContainingFile();
}
return null;
}
}
xml/openapi/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java
+8 -1
View File
@@ -37,16 +37,20 @@ import org.jetbrains.annotations.Nullable;
*/
public class DefaultXmlSuppressionProvider extends XmlSuppressionProvider {
public static final String SUPPRESS_MARK = "suppress";
@Override
public boolean isProviderAvailable(PsiFile file) {
return true;
}
@Override
public boolean isSuppressedFor(PsiElement element, String inspectionId) {
final XmlTag tag = element instanceof XmlFile ? ((XmlFile)element).getRootTag() : PsiTreeUtil.getContextOfType(element, XmlTag.class, false);
return tag != null && findSuppression(tag, inspectionId, element) != null;
}
@Override
public void suppressForFile(PsiElement element, String inspectionId) {
final PsiFile file = element.getContainingFile();
final XmlDocument document = ((XmlFile)file).getDocument();
@@ -55,6 +59,7 @@ public class DefaultXmlSuppressionProvider extends XmlSuppressionProvider {
suppress(file, findFileSuppression(anchor, null, element), inspectionId, anchor.getTextRange().getStartOffset());
}
@Override
public void suppressForTag(PsiElement element, String inspectionId) {
final XmlTag tag = PsiTreeUtil.getParentOfType(element, XmlTag.class);
assert tag != null;
@@ -140,7 +145,9 @@ public class DefaultXmlSuppressionProvider extends XmlSuppressionProvider {
@NonNls
protected String getPrefix() {
return "<!--suppress ";
return "<!--" +
SUPPRESS_MARK +
" ";
}
@NonNls