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

commandline_frame.ts: stop using dirty hacks for completions

Browse source 
The previous code simulated an input event in order to trigger the input
event handler which recomputed completions. This was ok until delays
were added to the input event handlers in order to reduce the lag that
could happen when typing fast/keeping a key pressed. This delay also
affects completion computation on other actions, such as fillcmdline.

In order to remove this delay, we move completion computation out of the
event handler and directly call this functions everywhere we previously
triggered an input event.

This should help with https://github.com/tridactyl/tridactyl/issues/1242
This commit is contained in:
glacambre 2018-12-24 09:18:34 +01:00
parent 1ed5823057
commit 55d6a1e0e6
No known key found for this signature in database
GPG key ID: B9625DB1767553AC
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/commandline_frame.ts
View file

@ -170,7 +170,7 @@ export function complete() {
let matches = state.cmdHistory.filter(key => key.startsWith(fragment))
let mostrecent = matches[matches.length - 1]
if (mostrecent != undefined) clInput.value = mostrecent
clInput.dispatchEvent(new Event("input")) // dirty hack for completions
return refresh_completions(clInput.value)
}
/**
@ -195,10 +195,12 @@ export function insert_completion() {
if (activeCompletions) {
activeCompletions.forEach(comp => (comp.completion = undefined))
}
let result = Promise.resolve([])
if (command) {
clInput.value = command + " "
clInput.dispatchEvent(new Event("input")) // dirty hack for completions
result = refresh_completions(clInput.value)
}
return result
}
/**
@ -221,7 +223,14 @@ export function insert_space_or_completion() {
clInput.value.substring(selectionEnd)
clInput.selectionStart = clInput.selectionEnd = selectionStart + 1
}
clInput.dispatchEvent(new Event("input")) // dirty hack for completions
return refresh_completions(clInput.value)
}
export function refresh_completions(exstr) {
if (!activeCompletions) enableCompletions()
return Promise.all(
activeCompletions.map(comp => comp.filter(exstr).then(resizeArea)),
)
}
/** @hidden **/
@ -246,11 +255,7 @@ clInput.addEventListener("input", () => {
// If we're not the current completion computation anymore, stop
if (timeoutId != myTimeoutId) return
enableCompletions()
// Fire each completion and add a callback to resize area
onInputPromise = Promise.all(
activeCompletions.map(comp => comp.filter(exstr).then(resizeArea)),
)
onInputPromise = refresh_completions(exstr)
}, 100)
// Declare self as current completion computation
timeoutId = myTimeoutId
@ -368,11 +373,13 @@ export function fillcmdline(
if (trailspace) clInput.value = newcommand + " "
else clInput.value = newcommand
isVisible = true
let result = Promise.resolve([])
// Focus is lost for some reason.
if (ffocus) {
focus()
clInput.dispatchEvent(new Event("input")) // dirty hack for completions
result = refresh_completions(clInput.value)
}
return result
}
/** @hidden
@ -433,14 +440,16 @@ export function getContent() {
/** @hidden **/
export function editor_function(fn_name, ...args) {
let result = Promise.resolve([])
if (tri_editor[fn_name]) {
tri_editor[fn_name](clInput, ...args)
clInput.dispatchEvent(new Event("input")) // dirty hack for completions
result = refresh_completions(clInput.value)
} else {
// The user is using the command line so we can't log message there
// logger.error(`No editor function named ${fn_name}!`)
console.error(`No editor function named ${fn_name}!`)
}
return result
}
import * as SELF from "@src/commandline_frame"