Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 15:28:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Undo is now reset when toggling "Inline args mode".

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-09-15 23:16:11 +02:00
parent 7fe508716c
commit 7d941aa0e4
3 changed files with 53 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/quest_editor/gui/AsmEditorToolBar.ts
View File

@ -23,7 +23,11 @@ export class AsmEditorToolBar extends ToolBar {
});
this.disposables(
asm_editor_store.inline_args_mode.bind_to(inline_args_mode_checkbox.checked),
inline_args_mode_checkbox.checked.bind_to(asm_editor_store.inline_args_mode),
inline_args_mode_checkbox.checked.observe(({ value }) =>
asm_editor_store.set_inline_args_mode(value),
),
inline_args_mode_checkbox.enabled.bind_to(asm_editor_store.has_issues.map(b => !b)),
);

6
src/quest_editor/gui/AsmEditorView.ts
View File

@ -2,8 +2,8 @@ import { ResizableWidget } from "../../core/gui/ResizableWidget";
import { el } from "../../core/gui/dom";
import { editor, KeyCode, KeyMod } from "monaco-editor";
import { asm_editor_store } from "../stores/AsmEditorStore";
import IStandaloneCodeEditor = editor.IStandaloneCodeEditor;
import { AsmEditorToolBar } from "./AsmEditorToolBar";
import IStandaloneCodeEditor = editor.IStandaloneCodeEditor;
editor.defineTheme("phantasmal-world", {
base: "vs-dark",
@ -28,10 +28,10 @@ const DUMMY_MODEL = editor.createModel("", "psoasm");
export class AsmEditorView extends ResizableWidget {
private readonly tool_bar_view = this.disposable(new AsmEditorToolBar());
readonly element = el.div();
private readonly editor: IStandaloneCodeEditor;
readonly element = el.div();
constructor() {
super();

107
src/quest_editor/stores/AsmEditorStore.ts
View File

@ -3,7 +3,6 @@ import { AssemblyAnalyser } from "../scripting/AssemblyAnalyser";
import { Disposable } from "../../core/observable/Disposable";
import { Disposer } from "../../core/observable/Disposer";
import { SimpleUndo } from "../../core/undo/SimpleUndo";
import { QuestModel } from "../model/QuestModel";
import { quest_editor_store } from "./QuestEditorStore";
import { ASM_SYNTAX } from "./asm_syntax";
import { AssemblyError, AssemblyWarning } from "../scripting/assembly";
@ -60,49 +59,35 @@ languages.setLanguageConfiguration("psoasm", {
});
export class AsmEditorStore implements Disposable {
readonly model: Property<ITextModel | undefined>;
readonly did_undo: Observable<string>;
readonly did_redo: Observable<string>;
readonly undo = new SimpleUndo(
"Text edits",
() => this._did_undo.emit({ value: "asm undo" }),
() => this._did_redo.emit({ value: "asm undo" }),
);
readonly inline_args_mode: WritableProperty<boolean> = property(true);
readonly has_issues: WritableProperty<boolean> = property(false);
private readonly disposer = new Disposer();
private readonly model_disposer = this.disposer.add(new Disposer());
private readonly _model: WritableProperty<ITextModel | undefined> = property(undefined);
private readonly _did_undo = emitter<string>();
private readonly _did_redo = emitter<string>();
private readonly _inline_args_mode: WritableProperty<boolean> = property(true);
readonly model: Property<ITextModel | undefined> = this._model;
readonly did_undo: Observable<string> = this._did_undo;
readonly did_redo: Observable<string> = this._did_redo;
readonly undo = new SimpleUndo(
"Text edits",
() => this._did_undo.emit({ value: "asm undo" }),
() => this._did_redo.emit({ value: "asm undo" }),
);
readonly inline_args_mode: Property<boolean> = this._inline_args_mode;
readonly has_issues: Property<boolean> = assembly_analyser.issues.map(
issues => issues.warnings.length + issues.errors.length > 0,
);
constructor() {
this.model = this._model;
this.did_undo = this._did_undo;
this.did_redo = this._did_redo;
this.disposer.add_all(
quest_editor_store.current_quest.observe(({ value }) => this.quest_changed(value), {
quest_editor_store.current_quest.observe(this.quest_changed, {
call_now: true,
}),
assembly_analyser.issues.observe(({ value }) => this.update_model_markers(value), {
call_now: true,
}),
this.inline_args_mode.observe(() => {
// don't allow changing inline args mode if there are issues
if (!this.has_issues.val) {
this.change_inline_args_mode();
}
}),
assembly_analyser.issues.observe(({ value }) => {
this.has_issues.val =
Boolean(value.warnings.length) || Boolean(value.errors.length);
}),
);
}
@ -110,6 +95,19 @@ export class AsmEditorStore implements Disposable {
this.disposer.dispose();
}
set_inline_args_mode = (inline_args_mode: boolean): void => {
// don't allow changing inline args mode if there are issues
if (!this.has_issues.val) {
this._inline_args_mode.val = inline_args_mode;
this.update_assembly_settings();
this.update_model();
}
};
private quest_changed = (): void => {
this.update_model();
};
/**
* Setup features for a given editor model.
* Features include undo/redo history and reassembling on change.
@ -154,26 +152,6 @@ export class AsmEditorStore implements Disposable {
);
}
private quest_changed(quest?: QuestModel): void {
this.undo.reset();
this.model_disposer.dispose_all();
if (quest) {
const manual_stack = !this.inline_args_mode.val;
const assembly = assembly_analyser.disassemble(quest, manual_stack);
const model = this.model_disposer.add(
editor.createModel(assembly.join("\n"), "psoasm"),
);
this.setup_editor_model_features(model);
this._model.val = model;
} else {
this._model.val = undefined;
}
}
private update_model_markers({
warnings,
errors,
@ -214,23 +192,28 @@ export class AsmEditorStore implements Disposable {
);
}
private change_inline_args_mode(): void {
private update_model(): void {
this.undo.reset();
this.model_disposer.dispose_all();
this.update_assembly_settings();
const quest = quest_editor_store.current_quest.val;
if (!quest) {
return;
if (quest) {
const manual_stack = !this.inline_args_mode.val;
const assembly = assembly_analyser.disassemble(quest, manual_stack);
const model = this.model_disposer.add(
editor.createModel(assembly.join("\n"), "psoasm"),
);
this.setup_editor_model_features(model);
this._model.val = model;
} else {
this._model.val = undefined;
}
const manual_stack = !this.inline_args_mode.val;
const assembly = assembly_analyser.disassemble(quest, manual_stack);
const model = this.model_disposer.add(editor.createModel(assembly.join("\n"), "psoasm"));
this.setup_editor_model_features(model);
this._model.val = model;
}
private update_assembly_settings(): void {