demotape 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9703d45771aaa186b951e020ed1f30f6eb0ef4c12aa9de87a55cc6b229dacb07
-  data.tar.gz: 3f16d0099cffbc04e345c062e04c176dcec891063177bcdb2850056b2f24d29f
+  metadata.gz: 7d52409cc191aed4c00084f2de0fcccd3ddb80d121bdeffda786ac680d7c3632
+  data.tar.gz: 5a69e7d5bf40278b1466a00e18f9e3fdf7020aa1f769dc75229b16140193e866
 SHA512:
-  metadata.gz: e71e511638f3bb46d93bc332f79df365c9a80e5a6daef615500685a1f9e5a7760e37bbb7e0f2faf333a5a439685439defe0140baab13fdbcf2119d8ac718871f
-  data.tar.gz: d563b7107de203799897fcf840f045f8d73b009a7e9a60c54f16f55f61b0570accfbe656756603abb32a845aaed304fc7151a911103bdd273197ad42efa82099
+  metadata.gz: 11e842eedd0656db535abf4572408cb0c2ebfc576f5fa3fa809f3699efc272e540244fce66a8dd62098164c9daea0be3f6e958ff57e49a21a8a60e7a656765c3
+  data.tar.gz: 25a9b6cfb6daf5f84831980e1ede66ed5b5fabd617a71682c7790cc973a1a8adc884b60bdb5c65eef38c2c633cabc7179672b0e9c35fde2f7d4fbcaf3f873427

data/CHANGELOG.md

@@ -11,6 +11,11 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## v0.0.8
+
+- [Added] Add `WaitUntilDone`, which is just a shortcut for
+  `WaitUntil /::done::/`.
+
 ## v0.0.7
 
 - [Fixed] Fix key combos that had numbers in them not being recognized.

data/Makefile

@@ -29,3 +29,10 @@ theme-examples:
 			optipng -quiet -o2 examples/themes/$${name}.png; \
 		fi; \
 	done;
+
+zed:
+	@cd editors/zed/tree-sitter && \
+			npm install && \
+			node_modules/.bin/tree-sitter generate && \
+			node_modules/.bin/tree-sitter build-wasm && \
+			mv tree-sitter-demotape.wasm ../grammars/demotape.wasm

data/README.md

@@ -282,6 +282,14 @@ WaitUntil@10s /complete/
 The pattern is a regular expression. The command waits until the terminal output
 matches the pattern or the timeout is reached.
 
+**WaitUntilDone** - Wait for output matching `/::done::`. This is just a
+shortcut for `WaitUntil /::done::/`.
+
+```demotape
+WaitUntilDone
+WaitUntilDone@5s
+```
+
 #### Clipboard
 
 **Copy** - Copy text to clipboard

data/editors/sublime-text/DemoTape.sublime-completions

@@ -23,6 +23,8 @@
     { "trigger": "Sleep", "contents": "Sleep ${1:1s}" },
     { "trigger": "WaitUntil", "contents": "WaitUntil /${1:pattern}/" },
     { "trigger": "WaitUntil@", "contents": "WaitUntil@${1:5s} /${2:pattern}/" },
+    { "trigger": "WaitUntilDone", "contents": "WaitUntilDone" },
+    { "trigger": "WaitUntilDone@", "contents": "WaitUntilDone@${1:5s}" },
 
     // Control commands
     "Clear",

data/editors/sublime-text/DemoTape.sublime-syntax

@@ -40,10 +40,10 @@ contexts:
       captures:
         2: entity.name.function.demotape
 
-    # Commands with @ duration/speed
-    - match: '\b(Type|TypeFile|WaitUntil|Run)\b'
+    # Commands with @ duration
+    - match: '\b(Type|TypeFile|WaitUntil|WaitUntilDone|Run)\b'
       scope: keyword.control.demotape
-      push: command_with_speed_or_timeout
+      push: command_with_duration
 
     # Set command with option value
     - match: '\b(Set)\b'
@@ -97,7 +97,7 @@ contexts:
   key_combo:
     - match: '\+'
       scope: keyword.operator.demotape
-    - match: '\b(Ctrl|Control|Alt|Option|Shift|Meta|Command|Enter|Return|Tab|Backspace|Delete|Escape|Esc|Space|Up|Down|Left|Right|Home|End|PageUp|PageDown|Insert|Cancel|Help|Pause|Semicolon|Colon|Equals|Slash|BackSlash|Numpad[0-9]|Multiply|Add|Separator|Subtract|Decimal|Divide|F[1-9]|F1[0-2]|[A-Za-z0-9])\b'
+    - match: '\b(Ctrl|Control|Alt|Option|Shift|Meta|Command|Cmd|Enter|Return|Tab|Backspace|Delete|Escape|Esc|Space|Up|Down|Left|Right|Home|End|PageUp|PageDown|Insert|Cancel|Help|Pause|Semicolon|Colon|Equals|Slash|BackSlash|Numpad[0-9]|Multiply|Add|Separator|Subtract|Decimal|Divide|F[1-9]|F1[0-2]|[A-Za-z0-9])\b'
       scope: keyword.control.demotape
     - match: '\d+'
       scope: constant.numeric.integer.demotape
@@ -145,7 +145,7 @@ contexts:
     - match: "$"
       pop: true
 
-  command_with_speed_or_timeout:
+  command_with_duration:
     - match: "@"
       scope: keyword.operator.demotape
       push: duration_value

data/editors/vim/syntax/demotape.vim

@@ -11,7 +11,7 @@ endif
 syn match demotapeComment "#.*$"
 
 " Commands
-syn keyword demotapeCommand Type TypeFile WaitUntil Run Set Output Copy Paste Send Include Screenshot
+syn keyword demotapeCommand Type TypeFile WaitUntil WaitUntilDone Run Set Output Copy Paste Send Include Screenshot
 syn keyword demotapeCommand Wait Sleep Require Pause Resume Clear nextgroup=demotapeString,demotapeDuration,demotapeNumber skipwhite
 
 " Group blocks

data/editors/vscode/demotape.tmLanguage.json

@@ -45,8 +45,8 @@
           }
         },
         {
-          "comment": "Commands with @ duration/speed",
-          "match": "\\b(Type|TypeFile|WaitUntil|Run)\\b",
+          "comment": "Commands with @ duration",
+          "match": "\\b(Type|TypeFile|WaitUntil|WaitUntilDone|Run)\\b",
           "name": "keyword.control.demotape",
           "captures": {
             "1": { "name": "keyword.control.demotape" }
@@ -100,7 +100,7 @@
         },
         {
           "comment": "Key combinations with +",
-          "match": "\\b(Ctrl|Control|Alt|Option|Shift|Meta|Command|Enter|Return|Tab|Backspace|Delete|Escape|Esc|Space|Up|Down|Left|Right|Home|End|PageUp|PageDown|Insert|Cancel|Help|Pause|Semicolon|Colon|Equals|Slash|BackSlash|Numpad[0-9]|Multiply|Add|Separator|Subtract|Decimal|Divide|F[1-9]|F1[0-2]|[A-Za-z0-9])\\s*\\+\\s*(Ctrl|Control|Alt|Option|Shift|Meta|Command|Enter|Return|Tab|Backspace|Delete|Escape|Esc|Space|Up|Down|Left|Right|Home|End|PageUp|PageDown|Insert|Cancel|Help|Pause|Semicolon|Colon|Equals|Slash|Numpad[0-9]|Multiply|Add|Separator|Subtract|Decimal|Divide|F[1-9]|F1[0-2]|[A-Za-z0-9])",
+          "match": "\\b(Ctrl|Control|Alt|Option|Shift|Meta|Command|Cmd|Enter|Return|Tab|Backspace|Delete|Escape|Esc|Space|Up|Down|Left|Right|Home|End|PageUp|PageDown|Insert|Cancel|Help|Pause|Semicolon|Colon|Equals|Slash|BackSlash|Numpad[0-9]|Multiply|Add|Separator|Subtract|Decimal|Divide|F[1-9]|F1[0-2]|[A-Za-z0-9])\\s*\\+\\s*(Ctrl|Control|Alt|Option|Shift|Meta|Command|Cmd|Enter|Return|Tab|Backspace|Delete|Escape|Esc|Space|Up|Down|Left|Right|Home|End|PageUp|PageDown|Insert|Cancel|Help|Pause|Semicolon|Colon|Equals|Slash|Numpad[0-9]|Multiply|Add|Separator|Subtract|Decimal|Divide|F[1-9]|F1[0-2]|[A-Za-z0-9])",
           "captures": {
             "0": { "name": "keyword.control.demotape" }
           }
@@ -119,7 +119,7 @@
           }
         },
         {
-          "comment": "At symbol for speed/timeout",
+          "comment": "At symbol for duration",
           "match": "@",
           "name": "keyword.operator.demotape"
         },

data/editors/vscode/package.json

@@ -2,11 +2,10 @@
   "name": "demotape",
   "displayName": "Demo Tape",
   "description": "Syntax highlighting for DemoTape (.tape) files",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "publisher": "fnando",
   "icon": "icon.png",
   "license": "MIT",
-  "publisher": "fnando",
   "repository": {
     "url": "https://github.com/fnando/demotape"
   },
@@ -16,7 +15,8 @@
   "files": [
     "*.json",
     "*.png",
-    "*.md"
+    "LICENSE.md",
+    "README.md"
   ],
   "categories": [
     "Programming Languages"

data/editors/zed/languages/demotape/highlights.scm

@@ -5,6 +5,7 @@
 "Type" @keyword
 "TypeFile" @keyword
 "Run" @keyword
+"WaitUntilDone" @keyword
 "WaitUntil" @keyword
 "Set" @keyword
 "Output" @keyword

data/editors/zed/tree-sitter/grammar.js

@@ -36,6 +36,7 @@ module.exports = grammar({
     command: $ => choice(
       $.type_command,
       $.run_command,
+      $.wait_until_done_command,
       $.wait_until_command,
       $.type_file_command,
       $.set_command,
@@ -81,6 +82,12 @@ module.exports = grammar({
       field('command', $.string),
     ),
 
+    // WaitUntilDone command
+    wait_until_done_command: $ => seq(
+      'WaitUntilDone',
+      optional($.duration_modifier),
+    ),
+
     // WaitUntil command
     wait_until_command: $ => seq(
       'WaitUntil',

data/editors/zed/tree-sitter/package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "tree-sitter-demotape",
+  "name": "demotape",
   "version": "0.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "tree-sitter-demotape",
+      "name": "demotape",
       "version": "0.0.1",
       "license": "MIT",
       "dependencies": {

data/editors/zed/tree-sitter/src/grammar.json

@@ -93,6 +93,10 @@
           "type": "SYMBOL",
           "name": "run_command"
         },
+        {
+          "type": "SYMBOL",
+          "name": "wait_until_done_command"
+        },
         {
           "type": "SYMBOL",
           "name": "wait_until_command"
@@ -263,6 +267,27 @@
         }
       ]
     },
+    "wait_until_done_command": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "WaitUntilDone"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "duration_modifier"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
     "wait_until_command": {
       "type": "SEQ",
       "members": [
@@ -895,6 +920,10 @@
         {
           "type": "STRING",
           "value": "Command"
+        },
+        {
+          "type": "STRING",
+          "value": "Cmd"
         }
       ]
     },

data/editors/zed/tree-sitter/src/node-types.json

@@ -87,6 +87,10 @@
         {
           "type": "wait_until_command",
           "named": true
+        },
+        {
+          "type": "wait_until_done_command",
+          "named": true
         }
       ]
     }
@@ -559,6 +563,21 @@
       ]
     }
   },
+  {
+    "type": "wait_until_done_command",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "duration_modifier",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "\"",
     "named": false
@@ -603,6 +622,10 @@
     "type": "Cancel",
     "named": false
   },
+  {
+    "type": "Cmd",
+    "named": false
+  },
   {
     "type": "Colon",
     "named": false
@@ -787,6 +810,10 @@
     "type": "WaitUntil",
     "named": false
   },
+  {
+    "type": "WaitUntilDone",
+    "named": false
+  },
   {
     "type": "clear_command",
     "named": true