StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor API of asyncSearch

This commit is contained in:
Jos de Jong 2020-10-10 14:11:38 +02:00
parent adda5836af
commit cc99284052
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/treemode/TreeMode.svelte
View File

@ -125,8 +125,9 @@ findRootPath
searchHandler = searchAsync(searchText, doc, { searchHandler = searchAsync(searchText, doc, {
onProgress: handleSearchProgressDebounced, onProgress: handleSearchProgressDebounced,
onDone: handleSearchDone onDone: handleSearchDone,
}, 10000, MAX_SEARCH_RESULTS) maxResults: MAX_SEARCH_RESULTS
})
} }
const history = createHistory({ const history = createHistory({

2
src/logic/search.js
View File

@ -109,7 +109,7 @@ async function tick () {
} }
// TODO: comment // TODO: comment
export function searchAsync (searchText, doc, { onProgress, onDone }, yieldAfterItemCount = 10_000, maxResults = Infinity) { export function searchAsync (searchText, doc, { onProgress, onDone, maxResults = Infinity, yieldAfterItemCount = 10_000 }) {
// TODO: what is a good value for yieldAfterItemCount? (larger means faster results but also less responsive during search) // TODO: what is a good value for yieldAfterItemCount? (larger means faster results but also less responsive during search)
const search = searchGenerator(searchText, doc, yieldAfterItemCount) const search = searchGenerator(searchText, doc, yieldAfterItemCount)

6
src/logic/search.test.js
View File

@ -63,7 +63,7 @@ describe('search', () => {
} }
const yieldAfterItemCount = 1 const yieldAfterItemCount = 1
searchAsync('4', doc, { onProgress, onDone }, yieldAfterItemCount) searchAsync('4', doc, { onProgress, onDone, yieldAfterItemCount })
// should not have results right after creation, but only on the first next tick // should not have results right after creation, but only on the first next tick
assert.deepStrictEqual(callbacks, []) assert.deepStrictEqual(callbacks, [])
@ -83,7 +83,7 @@ describe('search', () => {
} }
const yieldAfterItemCount = 1 // very low so we can see whether actually cancelled const yieldAfterItemCount = 1 // very low so we can see whether actually cancelled
const { cancel } = searchAsync('4', doc, { onProgress, onDone }, yieldAfterItemCount) const { cancel } = searchAsync('4', doc, { onProgress, onDone, yieldAfterItemCount })
setTimeout(() => { setTimeout(() => {
cancel() cancel()
@ -105,7 +105,7 @@ describe('search', () => {
} }
const maxResults = 10 const maxResults = 10
searchAsync('item', doc, { onDone }, 1000, maxResults) searchAsync('item', doc, { onDone, maxResults })
}) })
it('should generate recursive search results from flat results', () => { it('should generate recursive search results from flat results', () => {