Draft concatenative language for demo editor #17

e-matteson · 2019-06-22T02:45:43Z

There are also some changes outside of the demo crate, notably:

fix panic in Tree::clone()
fix panic when accessing text in an Ast
implement EditorCmd::Cut and EditorCmd::Copy
make json test utils return a Language instead of a LanguageSet
manually impl Debug for Ast, so we can derive debug for things that contain it

it was getting too complicated for a single file in the examples directory

More convenient for combining multiple languages into one LanguageSet later.

Nodes with `Arity::Text` are branches that contain 1 child, which is a leaf. `AstRef::text()` seemed to assume that nodes with `Arity::Text` are leaf nodes, instead.

Doesn't work yet, because text rendering panics...

At least it doesn't panic anymore...

This reverts commit 814d66ed7dfa3f074e8aa8165d77856210107998. Not needed, because clone is fixed now.

It should eventually be a Doc, not a string, but Text rendering is broken right now.

justinpombrio

Yay, copy/paste!

editor/src/ast/ast.rs

editor/src/doc.rs

forest/src/tree.rs

editor/src/doc.rs

Would panic after trying to recursively get more than one WriteLock on the forest.

forest/src/lib.rs

e-matteson added 30 commits June 14, 2019 12:04

feat: draft stack-based commands for demo editor

287fe93

feat: support a stack of keymaps

e01125a

feat: print crappy keymap summary, split demo into multiple files

c94b605

fix: don't clone trees, to prevent 'write lock' panic

1c0f4e9

chore: move demo editor to new crate

01c1a04

it was getting too complicated for a single file in the examples directory

refactor: rename Thing->Word

7ec506b

refactor: add Stack struct with typed popping methods

d726f44

chore: return Language from make_json_lang(), not LanguageSet

a47b593

More convenient for combining multiple languages into one LanguageSet later.

refactor: clean up lang set and notation set handling

d069326

feat: highlight cursor region

d2c225c

fix: don't panic when accessing text

ff2b963

Nodes with `Arity::Text` are branches that contain 1 child, which is a leaf. `AstRef::text()` seemed to assume that nodes with `Arity::Text` are leaf nodes, instead.

feat: get Doc's mode

3e792c0

test: update string test (still fails, now a bounds error)

93c7cb4

feat: add text-mode char insertion example to demo editor

37b0b4e

Doesn't work yet, because text rendering panics...

refactor: move demo editor Error to new file

74c5beb

fix: attempt to correctly implement Clone for Tree

71caddb

At least it doesn't panic anymore...

Revert "fix: don't clone trees, to prevent 'write lock' panic"

ba807ce

This reverts commit 814d66ed7dfa3f074e8aa8165d77856210107998. Not needed, because clone is fixed now.

feat: impl EditorCmd::Cut, return result + optional Ast from execute

bdd12da

feat: demo basic cut and paste

1374361

feat: implement EditorCmd::Copy

cad3cc2

feat: demo copy, plus all paste and insert varieties

b2407c4

feat: impl Debug for Ast

323b6f4

refactor: derive Debug in more places

745a086

feat: access Language's keymap

247ff61

feat: add Quote, Apply, and Swap

2784554

feat: implement node selection as a nested keymap

5365e12

feat: print nicer keymap summary

0ed4cd3

It should eventually be a Doc, not a string, but Text rendering is broken right now.

feat: clarify keymap names

5ee045d

feat: allow cancelling node selection

865522c

feat: return more results instead of panicking

6703af1

e-matteson added 2 commits June 29, 2019 17:19

feat: pass clipboard to doc.execute() instead of returning cut Ast

312c46b

feat: handle paste commands in doc, not in demo editor

b8f9920

justinpombrio requested changes Jul 20, 2019

View reviewed changes

e-matteson added 4 commits July 20, 2019 23:06

refactor: rename is_tree_mode() and in_tree_mode()

fb02dcc

refactor: use a Clipboard newtype instead of a Vec

488c975

refactor: add Forest::clone_tree(), make children() return owned Ids

170071a

refactor: delete broken & unused to_owned_tree()

a8da9b3

Would panic after trying to recursively get more than one WriteLock on the forest.

justinpombrio reviewed Jul 21, 2019

View reviewed changes

forest/src/lib.rs Outdated Show resolved Hide resolved

refactor: delete unused nightly iter_copied feature

d844ca3

justinpombrio approved these changes Jul 21, 2019

View reviewed changes

justinpombrio merged commit fc24a6a into master Jul 21, 2019

justinpombrio deleted the demo-ed-concat-lang branch February 23, 2020 21:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Draft concatenative language for demo editor #17

Draft concatenative language for demo editor #17

e-matteson commented Jun 22, 2019

justinpombrio left a comment

Draft concatenative language for demo editor #17

Draft concatenative language for demo editor #17

Conversation

e-matteson commented Jun 22, 2019

justinpombrio left a comment

Choose a reason for hiding this comment