asset editor redo

Author: fredsa

src/ide/views/asseteditor.ts

@@ -381,11 +381,18 @@ export class AssetEditorView implements ProjectView, pixed.EditorContext {
   setVisible?(showing: boolean): void {
     // TODO: make into toolbar?
     if (showing) {
-      // limit undo to since opening this editor
+      // limit undo/redo to since opening this editor
       projectWindows.undofiles = [];
-      if (Mousetrap.bind) Mousetrap.bind('mod+z', projectWindows.undoStep.bind(projectWindows));
+      projectWindows.redofiles = [];
+      if (Mousetrap.bind) {
+        Mousetrap.bind('mod+z', projectWindows.undoStep.bind(projectWindows));
+        Mousetrap.bind('mod+shift+z', projectWindows.redoStep.bind(projectWindows));
+      }
     } else {
-      if (Mousetrap.unbind) Mousetrap.unbind('mod+z');
+      if (Mousetrap.unbind) {
+        Mousetrap.unbind('mod+z');
+        Mousetrap.unbind('mod+shift+z');
+      }
     }
   }
 

src/ide/views/baseviews.ts

@@ -19,6 +19,7 @@ export interface ProjectView {
     setTimingResult?(result: CodeAnalyzer): void;
     recreateOnResize?: boolean;
     undoStep?(): void;
+    redoStep?(): void;
 };
 
 // detect mobile (https://stackoverflow.com/questions/3514784/what-is-the-best-way-to-detect-a-mobile-device)

src/ide/views/editors.ts

@@ -1,5 +1,5 @@
 import { closeBrackets, deleteBracketPair } from "@codemirror/autocomplete";
-import { defaultKeymap, history, historyKeymap, indentWithTab, isolateHistory, undo } from "@codemirror/commands";
+import { defaultKeymap, history, historyKeymap, indentWithTab, isolateHistory, redo, undo } from "@codemirror/commands";
 import { cpp } from "@codemirror/lang-cpp";
 import { markdown } from "@codemirror/lang-markdown";
 import { bracketMatching, foldGutter, indentOnInput, indentUnit } from "@codemirror/language";
@@ -535,6 +535,10 @@ export class SourceEditor implements ProjectView {
     undo(this.editor);
   }
 
+  redoStep() {
+    redo(this.editor);
+  }
+
   getBreakpointPCs(): number[] {
     if (this.sourcefile == null) return [];
     const pcs: number[] = [];

src/ide/windows.ts

@@ -20,11 +20,13 @@ export class ProjectWindows {
   activediv: HTMLElement;
   lasterrors: WorkerError[];
   undofiles: string[];
+  redofiles: string[];
 
   constructor(containerdiv: HTMLElement, project: CodeProject) {
     this.containerdiv = containerdiv;
     this.project = project;
     this.undofiles = [];
+    this.redofiles = [];
   }
   // TODO: delete windows ever?
 
@@ -129,6 +131,7 @@ export class ProjectWindows {
     if (wnd && wnd.setText && typeof data === 'string') {
       wnd.setText(data);
       this.undofiles.push(fileid);
+      this.redofiles = [];
     } else {
       this.project.updateFile(fileid, data);
     }
@@ -138,15 +141,26 @@ export class ProjectWindows {
     var fileid = this.undofiles.pop();
     var wnd = this.id2window[fileid];
     if (wnd && wnd.undoStep) {
-      // undo source
       wnd.undoStep();
-      // refresh active window from updated source
+      this.redofiles.push(fileid);
       this.refresh(false);
     } else {
       bootbox.alert("No more steps to undo.");
     }
   }
 
+  redoStep() {
+    var fileid = this.redofiles.pop();
+    var wnd = this.id2window[fileid];
+    if (wnd && wnd.redoStep) {
+      wnd.redoStep();
+      this.undofiles.push(fileid);
+      this.refresh(false);
+    } else {
+      bootbox.alert("No more steps to redo.");
+    }
+  }
+
   updateAllOpenWindows(store) {
     for (var fileid in this.id2window) {
       var wnd = this.id2window[fileid];