Skip to content

Commit 4ab7bfa

Browse files
committed
fix: remove rxjs from _formatCodeOnSaveInTextEditor
1 parent 83032f9 commit 4ab7bfa

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

src/CodeFormatManager.ts

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -261,27 +261,20 @@ export default class CodeFormatManager {
261261
}
262262
}
263263

264-
_formatCodeOnSaveInTextEditor(editor: TextEditor): Observable<TextEdit> {
264+
async _formatCodeOnSaveInTextEditor(editor: TextEditor): Promise<TextEdit[]> {
265265
const saveProviders = [...this._onSaveProviders.getAllProvidersForEditor(editor)]
266266
if (saveProviders.length > 0) {
267-
return Observable.defer(() =>
268-
this._reportBusy(editor, Promise.all(saveProviders.map((p) => p.formatOnSave(editor))), false)
267+
const allEdits = await this._reportBusy(
268+
editor,
269+
Promise.all(saveProviders.map((p) => p.formatOnSave(editor))),
270+
false
269271
)
270-
.switchMap((allEdits) => {
271-
const firstNonEmpty = allEdits.find((edits) => edits.length > 0)
272-
if (firstNonEmpty == null) {
273-
return Observable.empty()
274-
} else {
275-
return Observable.of(firstNonEmpty)
276-
}
277-
})
278-
.flatMap((edits) => Observable.of(...edits))
272+
const edits = allEdits.filter((edits) => edits.length > 0)
273+
return edits.flat()
279274
} else if (getFormatOnSave(editor)) {
280-
return this._formatCodeInTextEditor(editor, editor.getBuffer().getRange()).flatMap((edits) =>
281-
Observable.of(...edits)
282-
)
275+
return this._formatCodeInTextEditor(editor, editor.getBuffer().getRange())
283276
}
284-
return Observable.empty()
277+
return []
285278
}
286279

287280
_reportBusy<T>(editor: TextEditor, promise: Promise<T>, revealTooltip: boolean = true): Promise<T> {

0 commit comments

Comments
 (0)