vimniscient 0.3.0__tar.gz → 0.3.1__tar.gz

{vimniscient-0.3.0 → vimniscient-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: vimniscient
-Version: 0.3.0
+Version: 0.3.1
 Summary: Get fluent in Vim in fifteen minutes a day, in your own Neovim.
 Project-URL: Homepage, https://vimniscient.com
 Project-URL: Source, https://github.com/dialectmaterial/Vimniscient
@@ -317,6 +317,7 @@ uv run python tests/check_transfer.py           # Choose: every way solves it in
 uv run python tests/check_quick.py              # quick practice: the right tasks for the time, nothing graded
 uv run python tests/check_missions.py           # missions: every way does the whole job on real files
 uv run python tests/check_placement.py          # placement, the evaluation and doctor
+uv run python tests/make_golden.py --check      # the reference files for the Rust port are up to date
 uv run python tests/live_mission.py             # a mission in your real Neovim, in a hidden tmux session
 uv run python tests/check_today.py              # the daily budget, SRS scheduling, card introductions, hardtime
 uv run python tests/check_app.py                # every screen, driven headless

{vimniscient-0.3.0 → vimniscient-0.3.1}/README.md

@@ -294,6 +294,7 @@ uv run python tests/check_transfer.py           # Choose: every way solves it in
 uv run python tests/check_quick.py              # quick practice: the right tasks for the time, nothing graded
 uv run python tests/check_missions.py           # missions: every way does the whole job on real files
 uv run python tests/check_placement.py          # placement, the evaluation and doctor
+uv run python tests/make_golden.py --check      # the reference files for the Rust port are up to date
 uv run python tests/live_mission.py             # a mission in your real Neovim, in a hidden tmux session
 uv run python tests/check_today.py              # the daily budget, SRS scheduling, card introductions, hardtime
 uv run python tests/check_app.py                # every screen, driven headless

{vimniscient-0.3.0 → vimniscient-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vimniscient"
-version = "0.3.0"
+version = "0.3.1"
 description = "Get fluent in Vim in fifteen minutes a day, in your own Neovim."
 readme = "README.md"
 license = "AGPL-3.0-or-later"

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/app.py

@@ -21,7 +21,7 @@ from vimniscient.progress import Progress
 from vimniscient.session import COLORS, TaskResult, mouse_wheel, run_endless, run_lesson, run_mission
 from vimniscient.ui.builtin_lessons import endless_lesson, mission_lesson, placement_lesson, quick_lesson, review_lesson, transfer_lesson, vimgolf_lesson
 from vimniscient.ui.cards import CardScreen
-from vimniscient.ui.common import CATPPUCCIN, DEFAULT_THEME, omarchy_theme, plural
+from vimniscient.ui.common import CATPPUCCIN, DEFAULT_THEME, omarchy_theme
 from vimniscient.ui.drills import DrillScreen
 from vimniscient.ui.lesson import LessonScreen, ResultsScreen
 from vimniscient.ui.main import MainScreen
@@ -260,12 +260,10 @@ class VimniscientApp(App):
             search.update(results)
             search.seen |= {r.task.item_id for r in results}
             if not search.finished:
-                return "That round is done. The next one follows from how it went."
+                return placement.NEXT_ROUND
             known = search.known()
             self.progress.mark_known(known, search.seen)
-            if not known:
-                return "No lessons skipped. Start from Week 1 · Day 1."
-            return "Known already: " + ", ".join(f"{p.label} ({p.title})" for p in known)
+            return placement.note(known)
 
         def after() -> None:
             self.placement_round(search, done) if not search.finished else done()
@@ -291,9 +289,8 @@ class VimniscientApp(App):
             if skill == "mission":
                 self.start_mission(mission, done)
                 return
-            count, seed = quick.how_many(minutes, self.progress.typical_task_seconds()), datetime.now().isoformat()
-            tasks = (quick.navigation(count, self.lessons[0].tasks[0], seed) if skill == quick.NAVIGATION
-                     else quick.tasks(pools[skill], count, seed))
+            count = quick.how_many(minutes, self.progress.typical_task_seconds())
+            tasks = quick.build(skill, count, pools, self.lessons[0].tasks[0], datetime.now().isoformat())
 
             def on_results(results: list[TaskResult]) -> str:
                 self.progress.record_ungraded(results, "quick")
@@ -308,8 +305,7 @@ class VimniscientApp(App):
             result = run_mission(mission)
         mouse_wheel(False)
         self.progress.record_ungraded([result], "mission")
-        ways = "\n".join(mission.ways)
-        note = Content(f"{'Another way' if result.status == 'solved' else 'Ways to do it'}\n{ways}")
+        note = Content(mission.note(result.status == "solved"))
 
         def after(again: bool) -> None:
             self.start_mission(mission, done) if again else done()
@@ -322,10 +318,7 @@ class VimniscientApp(App):
     def start_transfer(self, picks: list[transfer.Challenge], done: Callable[[], None]) -> None:
         def on_results(results: list[TaskResult]) -> Content:
             self.progress.record_ungraded(results, "transfer")
-            by_goal = {c.task.goal: c for c in picks}
-            lines = [f"{r.task.goal}  {'  or  '.join(ways)}" for r in results
-                     if (ways := transfer.another_way(by_goal[r.task.goal], r.keys, r.status == "solved"))]
-            return Content("Another way\n" + "\n".join(lines)) if lines else Content("")
+            return Content(transfer.note(picks, results))
 
         self.start_lesson(transfer_lesson([c.task for c in picks]), on_results, done)
 
@@ -339,10 +332,7 @@ class VimniscientApp(App):
         mouse_wheel(False)
         run = endless.summary(results, start)
         self.progress.record_endless(results, run)
-        note = (f"Level {run['start']} → {run['level']} · {plural(run['missed'], 'miss', 'misses')}, "
-                f"{run['fixed']} recalled afterwards")
-        if run["level"] > best and run["climbed"]:
-            note += " · a new best!"
+        note = endless.note(run, best)
 
         def after(again: bool) -> None:
             if again:

vimniscient-0.3.1/src/vimniscient/card_session.py

@@ -0,0 +1,81 @@
+"""One run through a queue of cards: what's asked next and how each answer grades.
+
+A card you've never answered from memory is introduced: its answer is shown and
+you type it once. A miss comes back at the end, but only the first try counts.
+"""
+
+from dataclasses import dataclass, field
+
+from vimniscient import srs
+from vimniscient.answer import is_correct
+from vimniscient.cards import Card
+from vimniscient.progress import Progress
+
+
+@dataclass
+class CardSession:
+    progress: Progress
+    queue: list[Card]
+    total: int = 0
+    retried: set[str] = field(default_factory=set)
+    pending: tuple[Card, bool, str] | None = None
+    intro: bool = False  # the card on screen is new to you
+    correct: int = 0
+    answered: int = 0
+
+    def __post_init__(self) -> None:
+        self.queue = list(self.queue)
+        self.total = len(self.queue)
+
+    @property
+    def done(self) -> int:
+        return self.total - len([c for c in self.queue if c.id not in self.retried])
+
+    @property
+    def card(self) -> Card | None:
+        return self.queue[0] if self.queue else None
+
+    def begin(self) -> Card | None:
+        """The next card, and whether to introduce it."""
+        card = self.card
+        if card:
+            item = self.progress.item(card.id)
+            # never answered from memory, and not introduced since the last miss
+            self.intro = card.id not in self.retried and not self.progress.ever_right(card.id) and (not item or item.reps == 0)
+        return card
+
+    def submit(self, answer: str) -> bool:
+        """False when an introduced card was copied wrong, so it's asked again."""
+        card = self.queue[0]
+        correct = is_correct(answer, card.answers, card.style, card.case_sensitive)
+        if self.intro and not correct:
+            return False
+        self.pending = (card, correct, answer)
+        return True
+
+    def override(self) -> None:
+        """"I was right": a miss the checker was too strict about."""
+        if self.pending and not self.pending[1]:
+            self.pending = (self.pending[0], True, self.pending[2])
+
+    def settle(self) -> None:
+        """Grade the answered card (only the first try of a session counts)."""
+        if not self.pending:
+            return
+        card, correct, answer = self.pending
+        self.pending = None
+        self.queue.pop(0)
+        if self.intro:  # typed with the answer shown: scheduled for tomorrow, not scored
+            self.progress.grade(card.id, "card", srs.GOOD)
+            self.progress.log_card(card, True, answer, intro=True)  # still practice, for the streak
+            return
+        if card.id in self.retried:
+            return
+        self.answered += 1
+        self.correct += correct
+        self.progress.log_card(card, correct, answer)
+        known = self.progress.item(card.id) is not None
+        self.progress.grade(card.id, "card", (srs.GOOD if known else srs.EASY) if correct else srs.AGAIN)
+        if not correct:
+            self.retried.add(card.id)
+            self.queue.append(card)

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/diagnose.py

@@ -84,6 +84,17 @@ def normal_keys(keys: str) -> list[list[str]]:
     return [*runs, run] if run else runs
 
 
+def results_summary(results: list) -> str:
+    """One line on how a run went: solved, beat the reference, the median time."""
+    recall = [r for r in results if r.task.phase != "learn"]
+    solved = [r for r in recall if r.status == "solved"]
+    beat = sum(r.count < r.task.ref for r in solved)
+    times = sorted(r.seconds for r in solved if r.seconds is not None)
+    verb = "recalled" if len(recall) < len(results) else "solved"
+    return (f"{len(solved)} of {len(recall)} {verb}" + (f" · {beat} beat the reference" if beat else "")
+            + (f" · {times[len(times) // 2]:.1f}s a task" if times else ""))
+
+
 def _longest_run(runs: list[list[str]], wanted: set[str]) -> tuple[str, int]:
     best, length = "", 0
     for tokens in runs:

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/endless.py

@@ -49,6 +49,12 @@ def ladder(lessons: list[Lesson], start: int, length: int = RUNGS, seed: object
     return rungs
 
 
+def note(run: dict[str, int], best: int) -> str:
+    misses = f"{run['missed']} miss" if run["missed"] == 1 else f"{run['missed']} misses"
+    text = f"Level {run['start']} → {run['level']} · {misses}, {run['fixed']} recalled afterwards"
+    return text + " · a new best!" if run["level"] > best and run["climbed"] else text
+
+
 def summary(results: list, start: int) -> dict[str, int]:
     climbed = sum(r.task.phase == "climb" and r.status == "solved" for r in results)
     return {

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w1d2-pairs.yaml

@@ -105,3 +105,9 @@ tasks:
         target: |-
           <b>the tags stay</b>
         solution: 'citthe tags stay<Esc>'
+      - goal: 'Change the text inside the tag to "it is inside".'
+        start: |-
+          <i>only the ▮text goes</i>
+        target: |-
+          <i>it is inside</i>
+        solution: 'citit is inside<Esc>'

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w1d3-sentences.yaml

@@ -35,6 +35,19 @@ tasks:
           a is around: the paragraph and the blank line after it.
 
           One gap stays.
+      - goal: 'Delete the middle paragraph.'
+        start: |-
+          a paragraph runs to the blank line.
+
+          This block goes▮.
+          All of it.
+
+          It leaves no double gap behind.
+        target: |-
+          a paragraph runs to the blank line.
+
+          It leaves no double gap behind.
+        solution: 'dap'
   - goal: 'Duplicate the first paragraph.'
     start: |-
       ▮yap yanks a paragraph; P puts it above.
@@ -59,6 +72,18 @@ tasks:
           P puts above, p puts below.
 
           Done.
+      - goal: 'Duplicate the first paragraph.'
+        start: |-
+          ▮y yanks, a is around, p is paragraph.
+
+          Done.
+        target: |-
+          y yanks, a is around, p is paragraph.
+
+          y yanks, a is around, p is paragraph.
+
+          Done.
+        solution: 'yapP'
   - goal: 'Fix the wrong sentence: it should say "A sentence ends at a full stop."'
     start: |-
       s is for sentence. A sentence ends at a ▮comma. cis changes just one.
@@ -73,6 +98,12 @@ tasks:
         target: |-
           cis keeps the spaces. The i means inner. das takes one along.
         solution: 'cisThe i means inner.<Esc>'
+      - goal: 'Fix the wrong sentence: it should say "A sentence ends at a full stop."'
+        start: |-
+          c changes. A sentence ends at a ▮comma. The next one stays.
+        target: |-
+          c changes. A sentence ends at a full stop. The next one stays.
+        solution: 'cisA sentence ends at a full stop.<Esc>'
   - goal: 'Delete the middle sentence.'
     start: |-
       das deletes a sentence. This one ▮is wrong. Its space goes too.
@@ -85,6 +116,12 @@ tasks:
           a is around: a sentence and its space. This sentence ▮is spare. The next one moves up.
         target: |-
           a is around: a sentence and its space. The next one moves up.
+      - goal: 'Delete the middle sentence.'
+        start: |-
+          d deletes. This sent▮ence goes. a takes the space.
+        target: |-
+          d deletes. a takes the space.
+        solution: 'das'
   - goal: 'Indent the three lines.'
     start: |-
       What ip covers:
@@ -114,3 +151,17 @@ tasks:
               one
               two
               three
+      - goal: 'Indent the three lines.'
+        start: |-
+          i is inner, p is paragraph:
+
+          ▮the block
+          the block
+          then > indents
+        target: |-
+          i is inner, p is paragraph:
+
+              the block
+              the block
+              then > indents
+        solution: '>ip'

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w1d4-find.yaml

@@ -39,6 +39,12 @@ tasks:
         target: |-
           let f = "find"; let t = "till";
         solution: 'ct;"find"<Esc>'
+      - goal: 'Change the value to "till" (keep the semicolon).'
+        start: |-
+          let dt = ▮"lands"; let df = "find";
+        target: |-
+          let dt = "till"; let df = "find";
+        solution: 'ct;"till"<Esc>'
   - goal: 'Keep only the folder path: delete the file name.'
     start: |-
       lessons/week-1/till/backwards.ya▮ml
@@ -51,6 +57,12 @@ tasks:
           vim/motions/capital-T/goes-back.tx▮t
         target: |-
           vim/motions/capital-T/
+      - goal: 'Keep only the folder path: delete the file name.'
+        start: |-
+          keys/capital/T/looks-back.m▮d
+        target: |-
+          keys/capital/T/
+        solution: 'T/D'
   - goal: 'Turn the third comma into a semicolon.'
     start: |-
       ▮count, then f, then the comma, done
@@ -63,6 +75,12 @@ tasks:
           ▮f, t, F, T
         target: |-
           f, t, F; T
+      - goal: 'Turn the third comma into a semicolon.'
+        start: |-
+          ▮one, two, three, then r
+        target: |-
+          one, two, three; then r
+        solution: '3f,r;'
   - goal: 'Replace the whole before(char) call with on_it.'
     ft: python
     start: |-
@@ -78,6 +96,13 @@ tasks:
         target: |-
           t_stops = till  # one short of it
         solution: 'ct till<Esc>'
+      - goal: 'Replace the whole past(char) call with till_it.'
+        ft: python
+        start: |-
+          ct_stops = ▮past(char)  # ct stops at the space
+        target: |-
+          ct_stops = till_it  # ct stops at the space
+        solution: 'ct till_it<Esc>'
   - goal: 'Delete the part in brackets: from the cursor up to and including the ")".'
     start: |-
       f lands on▮ (not before) the letter.
@@ -90,3 +115,9 @@ tasks:
           F finds backwards▮ (to the left) on the line.
         target: |-
           F finds backwards on the line.
+      - goal: 'Delete the part in brackets: from the cursor up to and including the ")".'
+        start: |-
+          df deletes▮ (through) the letter.
+        target: |-
+          df deletes the letter.
+        solution: 'df)'

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w1d5-lines.yaml

@@ -41,6 +41,12 @@ tasks:
         target: |-
           C is a big c: it changes the rest of the line
         solution: 'Cthe rest of the line<Esc>'
+      - goal: 'Change the rest of the line to "the end of the line".'
+        start: |-
+          C goes big: ▮a little
+        target: |-
+          C goes big: the end of the line
+        solution: 'Cthe end of the line<Esc>'
   - goal: 'Replace the middle line with "cc changes a line".'
     start: |-
       c changes
@@ -63,6 +69,16 @@ tasks:
           cc changes a line
           yy yanks a line
         solution: 'cccc changes a line<Esc>'
+      - goal: 'Replace the middle line with "cc changes a line".'
+        start: |-
+          p puts a line
+          ▮ww changes a line
+          o opens a line
+        target: |-
+          p puts a line
+          cc changes a line
+          o opens a line
+        solution: 'cccc changes a line<Esc>'
   - goal: 'Join the two lines.'
     generate: J-split
     start: |-
@@ -134,3 +150,10 @@ tasks:
           start = ▮"I goes to the first letter"
         target: |-
           # start = "I goes to the first letter"
+      - goal: 'Comment the line out with "# ".'
+        ft: python
+        start: |-
+          big_i = ▮"capital I starts the line"
+        target: |-
+          # big_i = "capital I starts the line"
+        solution: 'I# <Esc>'

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w1d6-counts.yaml

@@ -63,6 +63,12 @@ tasks:
         target: |-
           c2w: change two words.
         solution: 'c2wtwo words<Esc>'
+      - goal: 'Change "three words" to "two words".'
+        start: |-
+          2 on cw changes ▮three words.
+        target: |-
+          2 on cw changes two words.
+        solution: 'c2wtwo words<Esc>'
   - goal: 'Fix the number: 5, not 500000.'
     generate: count-x
     start: |-
@@ -90,6 +96,11 @@ tasks:
           ▮c changes, d deletes, y yanks, z naps
         target: |-
           c changes, d deletes, y yanks
+      - goal: 'Delete from the third comma to the end (z is not an operator).'
+        start: |-
+          ▮p puts, x cuts, u undoes, z naps
+        target: |-
+          p puts, x cuts, u undoes
   - goal: 'Join the three lines into one.'
     start: |-
       ▮3J
@@ -146,6 +157,23 @@ tasks:
           four
           six
         solution: '5jdd'
+      - goal: 'Delete the line five lines below the cursor.'
+        start: |-
+          ▮the count is relative:
+          one
+          two
+          three
+          four
+          this line goes
+          six
+        target: |-
+          the count is relative:
+          one
+          two
+          three
+          four
+          six
+        solution: '5jdd'
 
   - goal: 'Fix "Teh" three lines up.'
     start: |-
@@ -173,3 +201,15 @@ tasks:
           so 3k goes
           three lines up.
         solution: '3kciwRelative<Esc>'
+      - goal: 'Fix "Cuont" three lines up.'
+        start: |-
+          Cuont first
+          then k,
+          so 3k goes
+          ▮three lines up.
+        target: |-
+          Count first
+          then k,
+          so 3k goes
+          three lines up.
+        solution: '3kciwCount<Esc>'

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w1d7-review.yaml

@@ -58,6 +58,13 @@ tasks:
         target: |-
           ci_paren(inside)
         solution: 'ci(inside<Esc>'
+      - goal: 'Replace all three arguments with new.'
+        ft: python
+        start: |-
+          args(▮old, old, old)
+        target: |-
+          args(new)
+        solution: 'ci(new<Esc>'
   - goal: 'Delete the wrong sentence.'
     start: |-
       d deletes. ▮y means yell. c changes.
@@ -96,6 +103,17 @@ tasks:
         target: |-
           import yank
           import put
+      - goal: 'Delete the cut_one and cut_two imports.'
+        ft: python
+        start: |-
+          import two
+          ▮import cut_one
+          import cut_two
+          import dd
+        target: |-
+          import two
+          import dd
+        solution: '2dd'
   - goal: 'Change the subdomain to www.'
     start: |-
       url = 'https://▮old.vimhelp.org'
@@ -133,3 +151,14 @@ tasks:
           def put():
               text = yanked
               return text
+      - goal: 'Indent the body of the function.'
+        ft: python
+        start: |-
+          def indent():
+          ▮push = ">"
+          return push
+        target: |-
+          def indent():
+              push = ">"
+              return push
+        solution: '>j'

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w2d1-dot.yaml

@@ -23,6 +23,12 @@ tasks:
         target: |-
           dot = again + again
         solution: 'ciwagain<Esc>ww.'
+      - goal: 'Change both "change" to "repeat".'
+        start: |-
+          keys = ▮change + change
+        target: |-
+          keys = repeat + repeat
+        solution: 'ciwrepeat<Esc>ww.'
   - goal: 'Add a semicolon to every line.'
     generate: dot-append
     start: |-
@@ -60,6 +66,14 @@ tasks:
         target: |-
           ␣   repeat
               the change
+      - goal: 'Indent both lines.'
+        start: |-
+          ▮> then j
+          then dot
+        target: |2-
+              > then j
+              then dot
+        solution: '>>j.'
   - goal: 'Delete all three "again".'
     start: |-
       The dot ▮again again again repeats the last change.
@@ -73,6 +87,12 @@ tasks:
           The . key ▮dot dot dot repeats your last change.
         target: |-
           The . key repeats your last change.
+      - goal: 'Delete all three "repeat".'
+        start: |-
+          The dot ▮repeat repeat repeat repeats the last change.
+        target: |-
+          The dot repeats the last change.
+        solution: 'dw..'
   - goal: 'Turn the lines into a list with "- ".'
     generate: dot-prefix
     start: |-

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w2d2-search.yaml

@@ -51,6 +51,12 @@ tasks:
         target: |-
           Slash leans forward
         solution: 'd/S<CR>'
+      - goal: 'Delete the hedging before "So".'
+        start: |-
+          ▮um, well, so, So d/ goes till it
+        target: |-
+          So d/ goes till it
+        solution: 'd/S<CR>'
   - goal: 'Rename the second "starred" to found.'
     ft: python
     start: |-
@@ -70,6 +76,15 @@ tasks:
           star = "*"
           found = match
         solution: '*ciwmatch<Esc>'
+      - goal: 'Rename the second "marked" to found.'
+        ft: python
+        start: |-
+          ▮marked = "this word"
+          then = marked
+        target: |-
+          marked = "this word"
+          then = found
+        solution: '*ciwfound<Esc>'
   - goal: 'Delete the third "next".'
     start: |-
       n means ▮next, and N means the next next one back.
@@ -102,3 +117,9 @@ tasks:
         target: |-
           ? asks backward; / leans forward; ? looks backward from the end.
         solution: '?fo<CR>cwbackward<Esc>'
+      - goal: 'Change the last "forward" to "backward", searching backwards.'
+        start: |-
+          the slash goes forward; ? asks forward, from the en▮d.
+        target: |-
+          the slash goes forward; ? asks backward, from the end.
+        solution: '?fo<CR>cwbackward<Esc>'

{vimniscient-0.3.0 → vimniscient-0.3.1}/src/vimniscient/lessons/w2d3-cgn.yaml

@@ -33,6 +33,16 @@ tasks:
           c(match)
           dot(match)
         solution: '*cgnmatch<Esc>..'
+      - goal: 'Rename every x to match.'
+        start: |-
+          ▮x = star()
+          next(x)
+          dot(x)
+        target: |-
+          match = star()
+          next(match)
+          dot(match)
+        solution: '*cgnmatch<Esc>..'
   - goal: 'Change the first and the last "the" to "a", keep the middle one.'
     start: |-
       ▮the change, the skip and the repeat
@@ -45,6 +55,12 @@ tasks:
           ▮the star, the next and the dot
         target: |-
           a star, the next and a dot
+      - goal: 'Change the first and the last "the" to "a", keep the middle one.'
+        start: |-
+          ▮the find, the pass and the dot
+        target: |-
+          a find, the pass and a dot
+        solution: '*Ncgna<Esc>nn.'
   - goal: 'Replace "the last" with "the next" on both lines.'
     start: |-
       ▮gn goes to the last match.
@@ -63,6 +79,14 @@ tasks:
           cgn changes the next match.
           The dot changes the next match.
         solution: '/one match<CR>cgnthe next match<Esc>.'
+      - goal: 'Replace "one match" with "the next match" on both lines.'
+        start: |-
+          ▮gn finds one match.
+          Dot repeats on one match.
+        target: |-
+          gn finds the next match.
+          Dot repeats on the next match.
+        solution: '/one match<CR>cgnthe next match<Esc>.'
   - goal: 'Change all four match to dot.'
     start: |-
       cgn ▮match; cgn match; cgn match; cgn match
@@ -77,6 +101,12 @@ tasks:
         target: |-
           say again; say again; say again; say again
         solution: '*cgnagain<Esc>...'
+      - goal: 'Change all four it to again.'
+        start: |-
+          do i▮t; do it; do it; do it
+        target: |-
+          do again; do again; do again; do again
+        solution: '*cgnagain<Esc>...'
   - goal: 'Delete every "um, ".'
     start: |-
       dgn ▮um, deletes um, the next match um, each time.
@@ -91,3 +121,9 @@ tasks:
         target: |-
           dgn deletes every match in turn.
         solution: '/so, <CR>dgn..'
+      - goal: 'Delete every "er, ".'
+        start: |-
+          dgn ▮er, cuts er, the next match er, each time.
+        target: |-
+          dgn cuts the next match each time.
+        solution: '/er, <CR>dgn..'