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

IDEA-67727: Quickfix

Browse Source
This commit is contained in:
sweinreuter
2011-04-11 09:32:51 +02:00
parent de42353adf
commit c8bba3a665
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/ConsecutiveComparisonFix.java → plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/ExpressionReplacementFix.java
+2 -2
View File
@@ -24,11 +24,11 @@ import org.intellij.lang.xpath.psi.XPathBinaryExpression;
import org.intellij.lang.xpath.psi.impl.XPathChangeUtil;
import org.jetbrains.annotations.NotNull;
class ConsecutiveComparisonFix implements IntentionAction {
class ExpressionReplacementFix implements IntentionAction {
private final String myReplacement;
private final XPathBinaryExpression myExpr;
public ConsecutiveComparisonFix(String replacement, XPathBinaryExpression expr) {
public ExpressionReplacementFix(String replacement, XPathBinaryExpression expr) {
myReplacement = replacement;
myExpr = expr;
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/XPathAnnotator.java
+12 -2
View File
@@ -112,7 +112,14 @@ public final class XPathAnnotator extends XPath2ElementVisitor implements Annota
if (operator != XPathTokenTypes.STAR && XPath2TokenTypes.KEYWORDS.contains(operator)) {
final String op = o.getOperationSign();
if (o.getText().startsWith(operand.getText() + op)) {
myHolder.createErrorAnnotation(o, "Number literal must be followed by whitespace in XPath 2");
final Annotation annotation =
myHolder.createErrorAnnotation(o, "Number literal must be followed by whitespace in XPath 2");
final XPathExpression rOperand = o.getROperand();
if (rOperand != null) {
final String replacement = operand.getText() + " " + op + " " + rOperand.getText();
annotation.registerFix(new ExpressionReplacementFix(replacement, o));
}
}
}
}
@@ -123,7 +130,7 @@ public final class XPathAnnotator extends XPath2ElementVisitor implements Annota
final XPathExpression rOperand = o.getROperand();
if (rOperand != null) {
final String replacement = "(" + operand.getText() + ") " + o.getOperationSign() + " " + rOperand.getText();
annotation.registerFix(new ConsecutiveComparisonFix(replacement, o));
annotation.registerFix(new ExpressionReplacementFix(replacement, o));
}
}
}
@@ -203,6 +210,9 @@ public final class XPathAnnotator extends XPath2ElementVisitor implements Annota
private static void checkFunctionCall(AnnotationHolder holder, XPathFunctionCall call, @NotNull ContextProvider contextProvider) {
final ASTNode node = call.getNode().findChildByType(XPathTokenTypes.FUNCTION_NAME);
if (node == null) {
return;
}
final QName name = contextProvider.getQName(call);
final XPathFunction function = call.resolve();