Skip to content

#2756 fix freezing under parsing translation files during wsl #2761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Haehnchen merged 1 commit into from
Apr 25, 2026
Merged

#2756 fix freezing under parsing translation files during wsl #2761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions ...ain/java/fr/adrienbrault/idea/symfony2plugin/translation/parser/TranslationStringMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package fr.adrienbrault.idea.symfony2plugin.translation.parser;

import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import fr.adrienbrault.idea.symfony2plugin.translation.parser.PhpCatalogueParser.ArrayEntry;
Expand All @@ -10,8 +11,6 @@

import java.io.IOException;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Stream;

/**
* @author Daniel Espendiller <daniel@espendiller.net>
Expand Down Expand Up @@ -45,15 +44,24 @@ public static TranslationStringMap createEmpty() {

@NotNull
public static TranslationStringMap create(@NotNull Collection<VirtualFile> translationDirectories) {
List<FileData> perFileData = translationDirectories.stream()
.flatMap((Function<VirtualFile, Stream<VirtualFile>>) dir -> {
VirtualFile[] children = dir.getChildren();
if (children == null) return Stream.empty();
return Arrays.stream(children).filter(f -> isCatalogueFile(f.getName()));
})
.parallel()
.map(FileData::parse)
.toList();
List<FileData> perFileData = new ArrayList<>();

for (VirtualFile dir : translationDirectories) {
ProgressManager.checkCanceled();

VirtualFile[] children = dir.getChildren();
if (children == null) {
continue;
}

for (VirtualFile child : children) {
ProgressManager.checkCanceled();

if (isCatalogueFile(child.getName())) {
perFileData.add(FileData.parse(child));
}
}
}

return merge(perFileData);
}
Expand Down Expand Up @@ -82,13 +90,17 @@ private static TranslationStringMap merge(@NotNull Collection<FileData> perFileD
private record FileData(@NotNull Map<String, Set<String>> domainMap) {
@NotNull
static FileData parse(@NotNull VirtualFile file) {
ProgressManager.checkCanceled();

String content;
try {
content = VfsUtil.loadText(file);
} catch (IOException e) {
return empty();
}

ProgressManager.checkCanceled();

Map<String, Set<String>> data = new HashMap<>();

// A compiled catalogue file may contain multiple MessageCatalogue instances,
Expand Down
Loading