Skip to content
This repository has been archived by the owner on Feb 25, 2023. It is now read-only.

Fix sorting of non-top-level definitions #1516

Merged
merged 1 commit into from
Mar 11, 2021
Merged

Fix sorting of non-top-level definitions #1516

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
27 changes: 15 additions & 12 deletions ext/js/language/translator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ class Translator {
);
glossaryDefinitions.push(glossaryDefinition);
}
this._sortDefinitions(glossaryDefinitions);
this._sortDefinitions(glossaryDefinitions, false);

const termDetailsList = this._createTermDetailsList(allDefinitions);

Expand Down Expand Up @@ -594,7 +594,7 @@ class Translator {

const results = [];
for (const groupDefinitions of groups.values()) {
this._sortDefinitions(groupDefinitions);
this._sortDefinitions(groupDefinitions, false);
const definition = this._createGroupedTermDefinition(groupDefinitions);
results.push(definition);
}
Expand Down Expand Up @@ -1259,21 +1259,24 @@ class Translator {
});
}

_sortDefinitions(definitions) {
_sortDefinitions(definitions, topLevel=true) {
if (definitions.length <= 1) { return; }
const stringComparer = this._stringComparer;
const compareFunction = (v1, v2) => {
// Sort by length of source term
let i = v2.source.length - v1.source.length;
if (i !== 0) { return i; }
let i;
if (topLevel) {
// Sort by length of source term
i = v2.source.length - v1.source.length;
if (i !== 0) { return i; }

// Sort by the number of inflection reasons
i = v1.reasons.length - v2.reasons.length;
if (i !== 0) { return i; }
// Sort by the number of inflection reasons
i = v1.reasons.length - v2.reasons.length;
if (i !== 0) { return i; }

// Sort by how many terms exactly match the source (e.g. for exact kana prioritization)
i = v2.sourceTermExactMatchCount - v1.sourceTermExactMatchCount;
if (i !== 0) { return i; }
// Sort by how many terms exactly match the source (e.g. for exact kana prioritization)
i = v2.sourceTermExactMatchCount - v1.sourceTermExactMatchCount;
if (i !== 0) { return i; }
}

// Sort by dictionary priority
i = v2.dictionaryOrder.priority - v1.dictionaryOrder.priority;
Expand Down