Updated build, fixed undo/redo after format

Author: deadlyjack

dist/main.js

@@ -1,6 +1,6 @@
 {
   "name": "acode-plugin-prettier",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "Acode plugin to format code",
   "main": "dist/main.js",
   "repository": "https://github.com/deadlyjack/acode-plugin-prettier.git",
@@ -10,18 +10,18 @@
     "prettier": "^2.7.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.5",
-    "@babel/preset-env": "^7.18.2",
-    "babel-loader": "^8.2.5",
-    "webpack": "^5.73.0",
+    "@babel/cli": "^7.19.3",
+    "@babel/core": "^7.19.6",
+    "@babel/preset-env": "^7.19.4",
+    "babel-loader": "^9.0.0",
+    "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0"
   },
   "scripts": {
     "build": "node ./scripts/build.js"
   },
   "resolutions": {
-    "terser": ">=5.14.2"
+    "terser": ">=5.15.1"
   },
   "browserslist": [
     "> 0.25%, not dead"

package.json

@@ -2,7 +2,7 @@
   "id": "acode.plugin.prettier",
   "name": "Prettier",
   "main": "dist/main.js",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "readme": "readme.md",
   "icon": "icon.png",
   "type": "free",

plugin.json

@@ -79,7 +79,6 @@ class AcodePrettier {
             await this.loadScript();
         }
 
-        const config = appSettings.value[pluginId];
         const extensions = [
             "html",
             "htm",
@@ -107,6 +106,7 @@ class AcodePrettier {
 
     async run() {
         const { editor, activeFile } = editorManager;
+        const { session } = activeFile;
         const code = editor.getValue();
         const cursorPos = editor.getCursorPosition();
         const parser = AcodePrettier.inferParser(activeFile.name);
@@ -129,9 +129,7 @@ class AcodePrettier {
         const { prettier, plugins } = window.acodePluginPrettier;
         cursorOptions.plugins = plugins;
         const res = prettier.formatWithCursor(code, cursorOptions);
-        editor.setValue(res.formatted);
-        const { row, column } = this.#cursorOffsetTocursorPos(res.cursorOffset);
-        editor.gotoLine(row + 1, column - 1);
+        this.#setValue(session, res);
     }
 
     destroy() {
@@ -181,10 +179,7 @@ class AcodePrettier {
                 if (!file) return;
 
                 const { session } = file;
-                session.setValue(res.formatted);
-                const { row, column } = this.#cursorOffsetTocursorPos(res.cursorOffset);
-
-                session.selection.moveCursorTo(row, column);
+                this.#setValue(session, res);
             }
         };
 
@@ -193,6 +188,18 @@ class AcodePrettier {
             scriptUrl: acode.joinUrl(this.baseUrl, "vendor.js"),
         });
     }
+
+    #setValue(session, formattedCode) {
+        const { $undoStack, $redoStack, $rev, $mark } = Object.assign({}, session.getUndoManager());
+        session.setValue(formattedCode.formatted);
+        const undoManager = session.getUndoManager();
+        undoManager.$undoStack = $undoStack;
+        undoManager.$redoStack = $redoStack;
+        undoManager.$rev = $rev;
+        undoManager.$mark = $mark;
+        const { row, column } = this.#cursorOffsetTocursorPos(formattedCode.cursorOffset);
+        session.selection.moveCursorTo(row, column);
+    }
 }
 
 if (window.acode) {