Skip to content

Index existing messages in merge_template/3 instead of a linear find per message #443

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

Open
mstroeck wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Open

Index existing messages in merge_template/3 instead of a linear find per message #443

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
10 changes: 8 additions & 2 deletions lib/gettext/extractor.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,18 @@ defmodule Gettext.Extractor do
def merge_template(existing, new, gettext_config) do
protected_pattern = gettext_config[:excluded_refs_from_purging]

# Index both sides by message key so that matching is linear rather than
# quadratic in the number of messages. The first message for a key wins,
# which is what Expo.Messages.find/2 returns.
new_by_key = Enum.reduce(new.messages, %{}, &Map.put_new(&2, Message.key(&1), &1))
existing_keys = MapSet.new(existing.messages, &Message.key/1)

# We go over the existing message in order so as to keep the existing
# order as much as possible.
old_and_merged =
Enum.flat_map(existing.messages, fn message ->
cond do
same = Messages.find(new, message) -> [merge_message(message, same)]
same = Map.get(new_by_key, Message.key(message)) -> [merge_message(message, same)]
protected?(message, protected_pattern) -> [message]
autogenerated?(message) -> []
true -> [message]
Expand All @@ -313,7 +319,7 @@ defmodule Gettext.Extractor do

# We reject all messages that appear in `existing` so that we're left
# with the messages that only appear in `new`.
unique_new = Enum.reject(new.messages, &Messages.find(existing, &1))
unique_new = Enum.reject(new.messages, &MapSet.member?(existing_keys, Message.key(&1)))

messages = old_and_merged ++ unique_new

Expand Down
Loading