Skip to content

Commit 0a4cdc2

Browse files
author
Vasilii Burlacu
committed
Bugfix: PHP classes completion to the backend_model attribute and tag not in the right files
1 parent c1d0dfa commit 0a4cdc2

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,19 @@ public XmlCompletionContributor() {
118118
new PhpClassCompletionProvider()
119119
);
120120

121-
// <backend_model>completion</backend_model>
122-
extend(CompletionType.BASIC,
123-
psiElement(XmlTokenType.XML_DATA_CHARACTERS)
124-
.inside(XmlPatterns.xmlTag().withName(ModuleSystemXml.XML_TAG_BACKEND_MODEL)),
125-
new PhpClassCompletionProvider()
121+
// <backend_model>completion</backend_model> in system.xml
122+
extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_DATA_CHARACTERS)
123+
.inside(XmlPatterns.xmlTag().withName(ModuleSystemXml.XML_TAG_BACKEND_MODEL)
124+
.withParent(XmlPatterns.xmlTag().withName(ModuleSystemXml.FIELD_ELEMENT_NAME))
125+
).inFile(xmlFile().withName(string().matches(ModuleSystemXml.FILE_NAME))),
126+
new PhpClassCompletionProvider()
126127
);
127128

128-
// <randomTag backend_model="completion">
129+
// <randomTag backend_model="completion"> in config.xml
129130
extend(CompletionType.BASIC, psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
130-
.inside(XmlPatterns.xmlAttribute().withName(ModuleConfigXml.XML_ATTRIBUTE_BACKEND_MODEL)),
131-
new PhpClassCompletionProvider()
131+
.inside(XmlPatterns.xmlAttribute().withName(ModuleConfigXml.XML_ATTRIBUTE_BACKEND_MODEL))
132+
.inFile(xmlFile().withName(string().matches(ModuleConfigXml.FILE_NAME))),
133+
new PhpClassCompletionProvider()
132134
);
133135

134136
// <parameter source_model="completion">...</parameter> in widget.xml files.

0 commit comments

Comments
 (0)