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

Fix completions preventing relative tabmoves

Browse source 
Buffer completions autoselect matches and this prevents relative
tabmoves from being easily performed. This is fixed by making sure that
autoselection only happens when the command doesn't look like a relative
tabmove.

Fixes https://github.com/tridactyl/tridactyl/issues/825
This commit is contained in:
glacambre 2018-10-06 16:39:23 +02:00
parent 86ddc368e1
commit 7c1718aac0
No known key found for this signature in database
GPG key ID: B9625DB1767553AC
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/completions/Buffer.ts
View file

@ -50,6 +50,7 @@ class BufferCompletionOption extends Completions.CompletionOptionHTML
export class BufferCompletionSource extends Completions.CompletionSourceFuse {
public options: BufferCompletionOption[]
private shouldSetStateFromScore = true
// TODO:
// - store the exstr and trigger redraws on user or data input without
@ -68,7 +69,13 @@ export class BufferCompletionSource extends Completions.CompletionSourceFuse {
}
@Perf.measuredAsync
private async updateOptions(exstr?: string) {
private async updateOptions(exstr = "") {
const [prefix, query] = this.splitOnPrefix(exstr)
// When the user is asking for tabmove completions, don't autoselect if the query looks like a relative move https://github.com/tridactyl/tridactyl/issues/825
this.shouldSetStateFromScore = !(prefix == "tabmove " && query.match("^[+-][0-9]+$"))
/* console.log('updateOptions', this.optionContainer) */
const tabs: browser.tabs.Tab[] = await Messaging.message(
"commandline_background",
@ -104,11 +111,11 @@ export class BufferCompletionSource extends Completions.CompletionSourceFuse {
async onInput(exstr) {
// Schedule an update, if you like. Not very useful for buffers, but
// will be for other things.
this.updateOptions()
this.updateOptions(exstr)
}
setStateFromScore(scoredOpts: Completions.ScoredOption[]) {
super.setStateFromScore(scoredOpts, true)
super.setStateFromScore(scoredOpts, this.shouldSetStateFromScore)
}
/** Score with fuse unless query is a single # or looks like a buffer index */