paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

realm_playground: Stop using Map incorrectly.

Browse Source 
Commit ad76df25ac (#18405) uses Map
incorrectly.  A JavaScript Map needs to be indexed with .get() and
.set(), not with [].

Also, clean up the API: ‘lookup_table’ is a meaningless variable name,
and there was no information in the array that wasn’t also in the Map.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-05-09 21:22:35 -07:00
committed by Anders Kaseorg
parent 129b5c6779
commit 41e8872b0f
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/js/realm_playground.js
View File

@@ -43,29 +43,23 @@ export function sort_pygments_pretty_names_by_priority(generated_pygments_data)
}
export function get_pygments_typeahead_list(query) {
const lookup_table = new Map();
const pygments_pretty_name_list = [];
const language_labels = new Map();
// Adds a typeahead that allows selecting a custom language, by adding a
// "Custom language" label in the first position of the typeahead list.
const clean_query = typeahead.clean_query_lowercase(query);
if (clean_query !== "") {
pygments_pretty_name_list.push(clean_query);
lookup_table[clean_query] = $t(
{defaultMessage: "Custom language: {query}"},
{query: clean_query},
language_labels.set(
clean_query,
$t({defaultMessage: "Custom language: {query}"}, {query: clean_query}),
);
}
for (const [key, values] of map_pygments_pretty_name_to_aliases) {
lookup_table[key] = key + " (" + Array.from(values).join(", ") + ")";
pygments_pretty_name_list.push(key);
language_labels.set(key, key + " (" + Array.from(values).join(", ") + ")");
}
return {
pygments_pretty_name_list,
lookup_table,
};
return language_labels;
}
export function initialize(playground_data, generated_pygments_data) {

9
static/js/settings_playgrounds.js
View File

@@ -152,19 +152,18 @@ function build_page() {
});
const search_pygments_box = $("#playground_pygments_language");
let lookup_table = new Map();
let language_labels = new Map();
search_pygments_box.typeahead({
source(query) {
const suggestions = realm_playground.get_pygments_typeahead_list(query);
lookup_table = suggestions.lookup_table;
return suggestions.pygments_pretty_name_list;
language_labels = realm_playground.get_pygments_typeahead_list(query);
return Array.from(language_labels.keys());
},
items: 5,
fixed: true,
helpOnEmptyStrings: true,
highlighter(item) {
return lookup_table[item];
return language_labels.get(item);
},
matcher(item) {
const q = this.query.trim().toLowerCase();