Merge branch 'master' into better-declarations

# Conflicts: # src/edit_session.js # types/ace-modules.d.ts
ajaxorg · Dec 17, 2024 · c51407e · c51407e
2 parents a2cedcb + fcf6384
commit c51407e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/demo/test_package/index.ts b/demo/test_package/index.ts
@@ -124,11 +124,11 @@ function createPopup() {
 }
 
 const acePopup = createPopup();
-
 const activeCommand = acePopup.getData(acePopup.getRow());
 if (activeCommand && activeCommand.command && activeCommand.command.name) {
     acePopup.setData([]);
 }
+acePopup.destroy();
 
 const filter = new FilteredList([]);
 filter.setFilter("test");

diff --git a/src/edit_session.js b/src/edit_session.js
@@ -90,6 +90,7 @@ class EditSession {
     }
 
     $initOperationListeners() {
+        /**@type {import("../interfaces").Operation | null}*/
         this.curOp = null;
         this.on("change", () => {
             if (!this.curOp) {
@@ -127,7 +128,6 @@ class EditSession {
         }
 
         this.$operationResetTimer.schedule();
-        /**@type {import("../interfaces").Operation | null}*/
         this.curOp = {
             command: commandEvent.command || {},
             args: commandEvent.args