Merge pull request #21 from deathaxe/issue-19

[#19] Fix context structure

Author: nk9

Syntax/Just.sublime-syntax

@@ -503,61 +503,71 @@ contexts:
 # Ex: "set shell := ['zsh', '-cu']", "set dotenv-load", "set export := false"
 
   settings:
-    - match: ^set(?=\s+)
+    - match: ^set(?=\s)
       scope: storage.modifier.definition.just
-      push:
-        - settings-invalid
-        - settings-shell
-        - settings-boolean
-        - settings-string
+      push: settings-name
 
-  settings-invalid:
-    - match: \b({{valid_name}})\b\s*:=
-      captures:
-        1: invalid.illegal.just
+  settings-name:
+    - include: settings-boolean-name
+    - include: settings-shell-name
+    - include: settings-string-name
+    - include: settings-invalid-name
     - include: else-pop
 
-  settings-shell:
-    - match: \b{{shell_settings}}\b
+  settings-boolean-name:
+    - match: '{{boolean_settings}}\b'
       scope: entity.name.definition.just
       set:
-        - string-array
+        - settings-boolean-value
         - assignment-operator
-    - include: else-pop
 
-  settings-boolean:
-    - match: \b{{boolean_settings}}\b
-      scope: entity.name.definition.just
-      set:
-        - constant-boolean
-        - assignment-operator
+  settings-boolean-value:
+    - match: (?:true|false)\b
+      scope: constant.language.boolean.just
+      pop: 1
     - include: else-pop
+    - include: eol-pop
 
-  settings-string:
-    - match: \b{{string_settings}}\b
+  settings-invalid-name:
+    - match: ({{valid_name}})\b\s*:=
+      captures:
+        1: invalid.illegal.just
+      push: eol-pop
+
+  settings-shell-name:
+    - match: '{{shell_settings}}\b'
       scope: entity.name.definition.just
-      push:
+      set:
+        - settings-shell-value
         - assignment-operator
-    - include: strings
-    - include: else-pop
 
-  constant-boolean:
-    - match: \b(true|false)\b
-      captures:
-        1: constant.language.boolean.just
-      pop: 1
+  settings-shell-value:
+    - match: \[
+      scope: punctuation.section.brackets.start.just
+      set: string-array-body
     - include: else-pop
+    - include: eol-pop
 
-  string-array:
+  string-array-body:
     - meta_scope: meta.sequence.list.just
-    - match: \[
-      scope: punctuation.section.brackets.start.just
-    - match: ','
-      scope: punctuation.separator.parameters.just
     - match: \]
       scope: punctuation.section.brackets.end.just
       pop: 1
+    - match: ','
+      scope: punctuation.separator.parameters.just
+    - include: strings
+    - include: eol-pop #??
+
+  settings-string-name:
+    - match: '{{string_settings}}\b'
+      scope: entity.name.definition.just
+      set:
+        - settings-string-value
+        - assignment-operator
+
+  settings-string-value:
     - include: strings
+    - include: eol-pop
 
 # ###[ General Types ]##########################################################
 

Syntax/tests/syntax_test_just.settings.just

@@ -114,20 +114,29 @@ export ONE := "1"
 #^^^^^ keyword.declaration.variable.just
 #      ^^^ variable.other.just
 #          ^^ keyword.operator.assignment.just
-#             ^^^ string.quoted.double.just 
+#             ^^^ string.quoted.double.just
 
 set export := true
 export TRY := "1"
 #<- keyword.declaration.variable.just
 #^^^^^ keyword.declaration.variable.just
 #      ^^^ variable.other.just
 #          ^^ keyword.operator.assignment.just
-#             ^^^ string.quoted.double.just 
+#             ^^^ string.quoted.double.just
 
 set shell := ["sh", "-c"]
 export TWO := "2"
 #<- keyword.declaration.variable.just
 #^^^^^ keyword.declaration.variable.just
 #      ^^^ variable.other.just
 #          ^^ keyword.operator.assignment.just
-#             ^^^ string.quoted.double.just 
+#             ^^^ string.quoted.double.just
+
+set tempdir := ""
+export := true
+# <- - entity
+
+set tempdir := ""
+export := true
+shell := ["sh", "-c"]
+# <- - entity