Skip to content

Commit 54889a6

Browse files
dkvashninbaylenaorobei
authored andcommitted
Added information about primary config
(cherry picked from commit af72463)
1 parent cbd56b2 commit 54889a6

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

src/com/magento/idea/magento2plugin/xml/index/LineMarkerXmlTagDecorator.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.intellij.openapi.project.Project;
66
import com.intellij.openapi.util.Key;
77
import com.intellij.openapi.util.TextRange;
8+
import com.intellij.openapi.vfs.VirtualFile;
89
import com.intellij.psi.*;
910
import com.intellij.psi.meta.PsiMetaData;
1011
import com.intellij.psi.scope.PsiScopeProcessor;
@@ -33,14 +34,26 @@ abstract public class LineMarkerXmlTagDecorator implements XmlTag {
3334

3435
protected XmlTag xmlTag;
3536

37+
protected Project project;
38+
3639
public LineMarkerXmlTagDecorator(XmlTag xmlTag) {
3740
this.xmlTag = xmlTag;
41+
this.project = xmlTag.getProject();
3842
}
3943

4044
@NotNull
4145
protected String getAreaName() {
42-
String configDirectory = xmlTag.getContainingFile().getVirtualFile().getParent().getName();
43-
return configDirectory.equals("etc") ? "global" : configDirectory;
46+
VirtualFile containingDirectory = xmlTag.getContainingFile().getVirtualFile().getParent();
47+
String configDirectory = containingDirectory.getName();
48+
49+
if (configDirectory.equals("etc")) {
50+
VirtualFile moduleDirectory = containingDirectory.getParent();
51+
if (moduleDirectory.getName().equals("app")) {
52+
return "primary";
53+
}
54+
return "global";
55+
}
56+
return configDirectory;
4457
}
4558

4659
/**

0 commit comments

Comments
 (0)