Skip to content

Commit

Permalink
refactor: rename completion-staging-item related methods and members …
Browse files Browse the repository at this point in the history
…name
  • Loading branch information
molinla committed Sep 28, 2024
1 parent 021d42c commit 6bea22c
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions spx-gui/src/components/editor/code-editor/EditorUI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ export class EditorUI extends Disposable {
const word = model.getWordUntilPosition(position)
const project = getProject()
const fileHash = project.currentFilesHash || ''
const completionItemCacheID = {
const completionItemStagingID = {
id: fileHash,
lineNumber: position.lineNumber,
column: word.startColumn
Expand All @@ -395,10 +395,11 @@ export class EditorUI extends Disposable {
this.completionMenu.hideCompletionMenu()
return { suggestions: [] }
}
const stagingItems = this.completionMenu.completionStagingItem.get(completionItemCacheID)
const stagingItems =
this.completionMenu.completionStagingItem.get(completionItemStagingID)
if (stagingItems == null) {
const completionItems: CompletionItem[] = []
this.completionMenu.completionStagingItem.set(completionItemCacheID, completionItems)
this.completionMenu.completionStagingItem.set(completionItemStagingID, completionItems)
const abortController = this.completionMenu.refreshAbortController()
this.requestCompletionProviderResolve(
model,
Expand All @@ -411,9 +412,12 @@ export class EditorUI extends Disposable {
if (!this.completionMenu) return console.warn('completionMenu is null')

if (this.completionMenu.completionMenuState.triggerMode.type !== 'playlist') {
const isSamePosition =
this.completionMenu.completionStagingItem.isSameStagingID(completionItemCacheID)
if (!isSamePosition) return abortController.abort()
if (
!this.completionMenu.completionStagingItem.isSameStagingID(
completionItemStagingID
)
)
return abortController.abort()
if (this.completionMenu.abortController !== abortController) return

completionItems.push(...items)
Expand Down

0 comments on commit 6bea22c

Please sign in to comment.