Skip to content

Commit

Permalink
Merge pull request #2265 from Haehnchen/feature/twig-component-anonymous
Browse files Browse the repository at this point in the history 
support anonymous Twig components path config
  • Loading branch information
@Haehnchen
Haehnchen authored Dec 14, 2023
2 parents 5e75254 + e559af7 commit c29b3e0
Showing 1 changed file with 104 additions and 19 deletions.
123 changes: 104 additions & 19 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/util/UxUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileVisitor;
import com.intellij.psi.PsiFile;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.CachedValue;
Expand All @@ -20,6 +22,7 @@
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.ConfigStubIndex;
import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.UxTemplateStubIndex;
import fr.adrienbrault.idea.symfony2plugin.stubs.util.IndexUtil;
import fr.adrienbrault.idea.symfony2plugin.templating.path.TwigPath;
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigTypeResolveUtil;
import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
import fr.adrienbrault.idea.symfony2plugin.util.dict.TwigComponentNamespace;
Expand Down Expand Up @@ -60,13 +63,15 @@ private static Collection<TwigComponentNamespace> getNamespacesInner(@NotNull Pr

for (String key : IndexUtil.getAllKeysForProject(ConfigStubIndex.KEY, project)) {
for (ConfigIndex value : FileBasedIndex.getInstance().getValues(ConfigStubIndex.KEY, key, GlobalSearchScope.allScope(project))) {
for (Map.Entry<String, TreeMap<String, String>> entry : value.getConfigs().entrySet()) {
String templateDirectory = entry.getValue().get("template_directory");
if (templateDirectory == null) {
continue;
}
if ("twig_component_defaults".equals(value.getName())) {
for (Map.Entry<String, TreeMap<String, String>> entry : value.getConfigs().entrySet()) {
String templateDirectory = entry.getValue().get("template_directory");
if (templateDirectory == null) {
continue;
}

namespaces.add(new TwigComponentNamespace(entry.getKey(), templateDirectory, entry.getValue().get("name_prefix")));
namespaces.add(new TwigComponentNamespace(entry.getKey(), templateDirectory, entry.getValue().get("name_prefix")));
}
}
}
}
Expand Down Expand Up @@ -166,8 +171,23 @@ public static Set<String> getTwigComponentNames(@NotNull Project project) {
return getAllComponentNames(project).stream().map(TwigComponent::name).collect(Collectors.toSet());
}

@NotNull
private static Set<String> getAnonymousTemplateDirectories(@NotNull Project project) {
Set<String> list = new HashSet<>();

for (String key : IndexUtil.getAllKeysForProject(ConfigStubIndex.KEY, project)) {
for (ConfigIndex value : FileBasedIndex.getInstance().getValues(ConfigStubIndex.KEY, key, GlobalSearchScope.allScope(project))) {
if ("anonymous_template_directory".equals(value.getName())) {
list.addAll(value.getValues());
}
}
}

return list;
}

public static Collection<TwigComponent> getAllComponentNames(@NotNull Project project) {
Collection<TwigComponent> names = new ArrayList<>();
Map<String, TwigComponent> names = new HashMap<>();

for (String key : IndexUtil.getAllKeysForProject(UxTemplateStubIndex.KEY, project)) {
for (UxComponent value : FileBasedIndex.getInstance().getValues(UxTemplateStubIndex.KEY, key, GlobalSearchScope.allScope(project))) {
Expand All @@ -188,22 +208,78 @@ public static Collection<TwigComponent> getAllComponentNames(@NotNull Project pr
name = namespace.namePrefix() + ":" + name;
}

names.add(new TwigComponent(name.replace("\\", ":"), value.phpClass(), namespace));
String uxName = name.replace("\\", ":");
names.put(uxName, new TwigComponent(uxName, value.phpClass(), namespace));
}
}
}
}
}

return names;
for (String valueValue : getAnonymousTemplateDirectories(project)) {
String namespace = null;
if (valueValue.startsWith("@")) {
namespace = StringUtils.stripEnd(valueValue.replace("\\", "/"), "/");
int i = namespace.indexOf("/");
if (i > 0) {
namespace = namespace.substring(0, i);
}

// strip "@"
namespace = namespace.substring(1);
}

for (TwigPath twigPath : TwigUtil.getTwigNamespaces(project)) {
VirtualFile relativeFile = null;

if (namespace == null && twigPath.isGlobalNamespace() && twigPath.getNamespaceType() == TwigUtil.NamespaceType.ADD_PATH) {
VirtualFile directory = twigPath.getDirectory(project);
relativeFile = VfsUtil.findRelativeFile(directory, StringUtils.strip(valueValue.replace("\\", "/"), "/").split("/"));
} else if (namespace != null && twigPath.getNamespaceType() == TwigUtil.NamespaceType.ADD_PATH && namespace.equals(twigPath.getNamespace())) {
// @namespace resolve
VirtualFile directory = twigPath.getDirectory(project);
String[] split2 = StringUtils.strip(valueValue.replace("\\", "/"), "/").split("/");
String[] split = Arrays.copyOfRange(split2, 1, split2.length);
relativeFile = VfsUtil.findRelativeFile(directory, split);
}

if (relativeFile == null) {
continue;
}

VirtualFile finalRelativeFile = relativeFile;
VfsUtil.visitChildrenRecursively(relativeFile, new VirtualFileVisitor<>() {
@Override
public boolean visitFile(@NotNull VirtualFile file) {
if (file.isDirectory()) {
return super.visitFile(file);
}

String relativePath = VfsUtil.getRelativePath(file, finalRelativeFile, '/');
if (relativePath == null) {
return super.visitFile(file);
}

String replace = StringUtils.stripEnd(relativePath.replace("/", ":"), ".html.twig");
if (!names.containsKey(replace)) {
names.put(replace, new TwigComponent(replace, null, null));
}

return super.visitFile(file);
}
});
}
}

return names.values();
}

@NotNull
public static Set<PhpClass> getTwigComponentPhpClasses(@NotNull Project project, @NotNull String component) {
Set<PhpClass> phpClasses = new HashSet<>();

for (TwigComponent entry : getAllComponentNames(project)) {
if (!entry.name().equals(component)) {
if (!entry.name().equals(component) || entry.phpClass() == null) {
continue;
}

Expand All @@ -224,13 +300,18 @@ public static Collection<PsiFile> getComponentTemplates(@NotNull Project project
continue;
}

if (entry.twigComponentNamespace.namePrefix() != null && !component.startsWith(entry.twigComponentNamespace.namePrefix() + ":")) {
continue;
if (entry.twigComponentNamespace != null) {
if ((entry.twigComponentNamespace.namePrefix() == null || component.startsWith(entry.twigComponentNamespace.namePrefix() + ":"))) {
String strip = StringUtils.strip(entry.twigComponentNamespace.templateDirectory(), "/");
String template = strip + "/" + component.replace(":", "/") + ".html.twig";
virtualFiles.addAll(TwigUtil.getTemplateFiles(project, template));
}
} else {
for (String directory : getAnonymousTemplateDirectories(project)) {
String templateName = StringUtils.strip(directory, "/") + "/" + component.replace(":", "/") + ".html.twig";
virtualFiles.addAll(TwigUtil.getTemplateFiles(project, templateName));
}
}

String strip = StringUtils.strip(entry.twigComponentNamespace.templateDirectory(), "/");
String template = strip + "/" + component.replace(":", "/") + ".html.twig";
virtualFiles.addAll(TwigUtil.getTemplateFiles(project, template));
}

return PsiElementUtils.convertVirtualFilesToPsiFiles(project, virtualFiles);
Expand Down Expand Up @@ -290,6 +371,10 @@ public static Set<PhpClass> getTwigComponentAllTargets(@NotNull Project project)
Set<PhpClass> phpClasses = new HashSet<>();

for (TwigComponent entry : getAllComponentNames(project)) {
if (entry.phpClass() == null) {
continue;
}

PhpClass classInterface = PhpElementsUtil.getClassInterface(project, entry.phpClass());
if (classInterface != null) {
phpClasses.add(classInterface);
Expand All @@ -312,7 +397,7 @@ public static Collection<LookupElement> getComponentLookupElements(@NotNull Proj
.map(entry ->
LookupElementBuilder.create(entry.getKey())
.withIcon(Symfony2Icons.SYMFONY)
.withTypeText(StringUtils.stripStart(entry.getValue(), "\\"))
.withTypeText(entry.getValue() != null ? StringUtils.stripStart(entry.getValue(), "\\") : "anonymous")
)
.collect(Collectors.toList());
}
Expand Down Expand Up @@ -346,7 +431,7 @@ private static Collection<String> getExposeName(@NotNull PhpAttributesOwner phpA
Collection<String> names = new HashSet<>();

// public state
Collection<@NotNull PhpAttribute> attributes = phpAttributesOwner.getAttributes(ATTRIBUTE_EXPOSE_IN_TEMPLATE);
Collection<PhpAttribute> attributes = phpAttributesOwner.getAttributes(ATTRIBUTE_EXPOSE_IN_TEMPLATE);
if (attributes.isEmpty()) {
String name = phpAttributesOwner.getName();

Expand Down Expand Up @@ -392,5 +477,5 @@ public enum TwigComponentType {

public record TwigComponentIndex(@Nullable String name, @NotNull PhpClass phpClass, @Nullable String template, @NotNull TwigComponentType type) {}

public record TwigComponent(@NotNull String name, @NotNull String phpClass, @NotNull TwigComponentNamespace twigComponentNamespace) {}
public record TwigComponent(@NotNull String name, @Nullable String phpClass, @Nullable TwigComponentNamespace twigComponentNamespace) {}
}

0 comments on commit c29b3e0

Please sign in to comment.