hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-05 17:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2212 from mozbugbox/hinting-customize

Browse source 
Hinting customize
This commit is contained in:
Oliver Blanthorn 2020-03-08 14:01:07 +00:00 • committed by GitHub
commit 730529e3d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/content/hinting.ts
View file

@ -555,17 +555,41 @@ function buildHintsSimple(els: Element[], onSelect: HintSelectedCallback) {
}
}
/** Helper for vimperator hinting.
Allow customize vimperator hinting filter by overriding functions of the
helper object.
*/
export const vimpHelper = {
filterableTextFilter: null,
sanitiseHintText: function sanitiseHintText(str) {
// Clean up hint text
// strip out hintchars from hint text
if (vimpHelper.filterableTextFilter === null) {
// escape the hintchars string so that strange things don't happen
// when special characters are used as hintchars (for example, ']')
const escapedHintChars = defaultHintChars().replace(
/^\^|[-\\\]]/g, "\\$&")
const filterableTextFilter = new RegExp(
"[" + escapedHintChars + "]", "g")
vimpHelper.filterableTextFilter = filterableTextFilter
}
return str.replace(vimpHelper.filterableTextFilter, "")
},
matchHint: function matchHint(str, key) {
// Match a hint key to hint text
// match every part of key splited by space.
return key.split(/\s+/).every(keyi => str.includes(keyi))
},
}
/** @hidden */
function buildHintsVimperator(els: Element[], onSelect: HintSelectedCallback) {
const names = hintnames(els.length)
// escape the hintchars string so that strange things don't happen
// when special characters are used as hintchars (for example, ']')
const escapedHintChars = defaultHintChars().replace(/^\^|[-\\\]]/g, "\\$&")
const filterableTextFilter = new RegExp("[" + escapedHintChars + "]", "g")
for (const [el, name] of izip(els, names)) {
let ft = elementFilterableText(el)
// strip out hintchars
ft = ft.replace(filterableTextFilter, "")
ft = vimpHelper.sanitiseHintText(ft)
logger.debug({ el, name, ft })
modeState.hintchars += name + ft
modeState.hints.push(new Hint(el, name, ft, onSelect))
@ -665,7 +689,7 @@ function filterHintsVimperator(fstr, reflow = false) {
active = active.filter(hint => hint.name.startsWith(run.str))
} else {
// By text
active = active.filter(hint => hint.filterData.includes(run.str))
active = active.filter(hint => vimpHelper.matchHint(hint.filterData, run.str))
if (reflow) rename(active)
}
@ -731,6 +755,12 @@ function pushKey(key) {
}
}
/** Covert to char and pushKey(). This is needed because ex commands ignore whitespace. */
function pushKeyCodePoint(codepoint) {
const key = String.fromCodePoint(parseInt(codepoint, 0))
return pushKey(key)
}
/** Just run pushKey(" "). This is needed because ex commands ignore whitespace. */
function pushSpace() {
return pushKey(" ")
@ -885,7 +915,7 @@ export function parser(keys: KeyboardEvent[]) {
if (simplekeys.length > 1) {
exstr = simplekeys.reduce((acc, key) => `hint.pushKey ${key.key};`, "composite ")
} else if (simplekeys.length === 1) {
exstr = `hint.pushKey ${simplekeys[0].key}`
exstr = `hint.pushKeyCodePoint ${simplekeys[0].key.codePointAt(0)}`
} else {
return { keys: [], isMatch: false }
}
@ -905,6 +935,7 @@ export function getHintCommands() {
selectFocusedHint,
pushKey,
pushSpace,
pushKeyCodePoint,
popKey,
};
};