🧪 Breakdown test cases and add todos (#20)

* chore: move test files into subdirectories

* chore: first pass test run through

* feat: add hex constants

* chore: add todos

* chore: regen snapshots

syntaxes/just.tmLanguage.json

@@ -60,6 +60,11 @@
           "comment": "Integer",
           "name": "constant.language.integer.just",
           "match": "\\b\\d+\\b"
+        },
+        {
+          "comment": "Hex",
+          "name": "constant.language.hex.just",
+          "match": "\\b(HEX|HEXLOWER|HEXUPPER)\\b"
         }
       ]
     },

syntaxes/just.tmLanguage.yml

@@ -30,6 +30,9 @@ repository:
       - comment: Integer
         name: constant.language.integer.just
         match: "\\b\\d+\\b"
+      - comment: Hex
+        name: constant.language.hex.just
+        match: "\\b(HEX|HEXLOWER|HEXUPPER)\\b"
 
   keywords:
     patterns:

tests/embedded.just → tests/embedded/embedded.just

@@ -1,5 +1,7 @@
 # Embedded languages
 
+# TODO: how to test embedded grammars in snapshots?
+
 python:
   #!/usr/bin/env python3
   print('Hello from python!')

tests/embedded.just.snap → tests/embedded/embedded.just.snap

@@ -1,6 +1,9 @@
 ># Embedded languages
 #^^^^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
 >
+># TODO: how to test embedded grammars in snapshots?
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
+>
 >python:
 #^^^^^^ source.just entity.name.function.just
 #      ^ source.just keyword.operator.recipe.end.just

tests/builtins.just → tests/general/builtins.just

@@ -1,5 +1,20 @@
+# Builin keywords
+
+alias
+set
+export
+import
+mod
+
+# Control keywords
+
+if
+else
+
 # Builtin functions
 
+# TODO: should parentheses be optional or required?
+
 # System info
 
 arch()

tests/builtins.just.snap → tests/general/builtins.just.snap

@@ -1,6 +1,31 @@
+># Builin keywords
+#^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
+>
+>alias
+#^^^^^ source.just keyword.other.reserved.just
+>set
+#^^^ source.just keyword.other.reserved.just
+>export
+#^^^^^^ source.just keyword.other.reserved.just
+>import
+#^^^^^^ source.just keyword.other.reserved.just
+>mod
+#^^^ source.just keyword.other.reserved.just
+>
+># Control keywords
+#^^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
+>
+>if
+#^^ source.just keyword.control.conditional.just
+>else
+#^^^^ source.just keyword.control.conditional.just
+>
 ># Builtin functions
 #^^^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
 >
+># TODO: should parentheses be optional or required?
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
+>
 ># System info
 #^^^^^^^^^^^^^ source.just comment.line.number-sign.just
 >

tests/general/constants.just

@@ -0,0 +1,8 @@
+# Constants
+
+true
+false
+
+HEX
+HEXLOWER
+HEXUPPER

tests/general/constants.just.snap

@@ -0,0 +1,15 @@
+># Constants
+#^^^^^^^^^^^ source.just comment.line.number-sign.just
+>
+>true
+#^^^^ source.just constant.language.boolean.just
+>false
+#^^^^^ source.just constant.language.boolean.just
+>
+>HEX
+#^^^ source.just constant.language.hex.just
+>HEXLOWER
+#^^^^^^^^ source.just constant.language.hex.just
+>HEXUPPER
+#^^^^^^^^ source.just constant.language.hex.just
+>

tests/general/general.just

@@ -0,0 +1,17 @@
+# Comments
+
+# Standard comment
+
+something # Comment after code
+
+# Numbers
+
+123
+# TODO: should the "." be colored differently?
+123.456
+
+# Imports
+
+import 'foo/bar.just'
+
+mod bar

tests/general/general.just.snap

@@ -0,0 +1,37 @@
+># Comments
+#^^^^^^^^^^ source.just comment.line.number-sign.just
+>
+># Standard comment
+#^^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
+>
+>something # Comment after code
+#^^^^^^^^^^ source.just
+#          ^^^^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
+>
+># Numbers
+#^^^^^^^^^ source.just comment.line.number-sign.just
+>
+>123
+#^^^ source.just constant.language.integer.just
+># TODO: should the "." be colored differently?
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.just comment.line.number-sign.just
+>123.456
+#^^^ source.just constant.language.integer.just
+#   ^ source.just
+#    ^^^ source.just constant.language.integer.just
+>
+># Imports
+#^^^^^^^^^ source.just comment.line.number-sign.just
+>
+>import 'foo/bar.just'
+#^^^^^^ source.just keyword.other.reserved.just
+#      ^ source.just
+#       ^ source.just string.quoted.single.just string.quoted.single.just
+#        ^^^^^^^^^^^^ source.just string.quoted.single.just
+#                    ^ source.just string.quoted.single.just
+>
+>mod bar
+#^^^ source.just keyword.other.reserved.just
+#   ^ source.just
+#    ^^^^ source.just
+>

tests/general/multi-line-constructs.just

@@ -0,0 +1,63 @@
+# Multi-line constructs
+
+# TODO: do we need to validate this?
+# TODO: should just-specific highlighting in recipes be conditional (ex. only in interpolation blocks)
+# or always on?
+
+multi-line-recipe:
+  if true; then \
+    echo 'True!'; \
+  fi
+
+
+# Parenthesis blocks don't need explicit line breaks
+
+abc := ('a' +
+        'b'
+         + 'c')
+
+abc2 := (
+  'a' +
+  'b' +
+  'c'
+)
+
+# TODO: multi-line recipe def broken
+
+foo param=('foo'
+      + 'bar'
+    ):
+  echo {{param}}
+
+bar: (foo
+        'Foo'
+     )
+  echo 'Bar!'
+
+# Backslash continues as if whitespace
+
+a := 'foo' + \
+     'bar'
+
+foo param1 \
+  param2='foo' \
+  *varparam='': dep1 \
+                (dep2 'foo')
+  echo {{param1}} {{param2}} {{varparam}}
+
+dep1: \
+    # this comment is not part of the recipe body
+  echo 'dep1'
+
+dep2 \
+  param:
+    echo 'Dependency with parameter {{param}}'
+
+# Line continuation in interpolations
+
+recipe:
+  echo '{{ \
+  "This interpolation " + \
+    "has a lot of text." \
+  }}'
+  echo 'back to recipe body'