Skip to content

Commit cba52d2

Browse files
committed
Fixed incorrect completion for general MFTF text tag attributes
1 parent d96d03c commit cba52d2

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

src/com/magento/idea/magento2plugin/completion/xml/XmlCompletionContributor.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77

88
import com.intellij.codeInsight.completion.CompletionContributor;
99
import com.intellij.codeInsight.completion.CompletionType;
10+
import com.intellij.patterns.PatternCondition;
1011
import com.intellij.patterns.XmlPatterns;
12+
import com.intellij.psi.xml.XmlAttribute;
1113
import com.intellij.psi.xml.XmlTokenType;
1214
// CHECKSTYLE IGNORE check FOR NEXT 6 LINES
15+
import com.intellij.util.ProcessingContext;
1316
import com.magento.idea.magento2plugin.completion.provider.*;//NOPMD
1417
import com.magento.idea.magento2plugin.completion.provider.mftf.*;//NOPMD
1518
import com.magento.idea.magento2plugin.magento.files.*;//NOPMD
19+
import org.jetbrains.annotations.NotNull;
20+
1621
import static com.intellij.patterns.PlatformPatterns.psiElement;
1722
import static com.intellij.patterns.StandardPatterns.string;
1823
import static com.intellij.patterns.XmlPatterns.xmlFile;
@@ -282,8 +287,15 @@ public XmlCompletionContributor() {
282287
// mftf data entity completion contributor
283288
extend(
284289
CompletionType.BASIC,
285-
psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
286-
.inside(XmlPatterns.xmlAttribute().withName(string().oneOf("entity", "value", "userInput"))
290+
psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN).inside(XmlPatterns.xmlAttribute()
291+
.withName(string().oneOf("entity", "value", "userInput"))
292+
.without(new PatternCondition<XmlAttribute>("value attribute of general text tag") {
293+
@Override
294+
public boolean accepts(@NotNull XmlAttribute attribute, ProcessingContext context) {
295+
final String tagName = attribute.getParent().getName();
296+
return tagName.matches("stories|title|description");
297+
}
298+
})
287299
),
288300
new DataCompletionProvider()
289301
);

0 commit comments

Comments
 (0)