improving reserved words

gbaptista · Apr 2, 2022 · f2aaa75 · f2aaa75
1 parent d553afb
commit f2aaa75
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 2 deletions.
diff --git a/Fennel.sublime-syntax b/Fennel.sublime-syntax
@@ -97,8 +97,15 @@ contexts:
         1: storage.type.auto_gensym.fennel
     - match: '{{constants}}'
       scope: entity.other.inherited-class.constant.fennel
-    - match: '{{lua_variables}}|{{lua_functions}}'
-      scope: variable.language.lua_constant.fennel
+    # - match: '({{lua_variables}}|{{lua_functions}})+[\d\-\_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]'
+    #   scope: source.fennel
+    - match: '({{lua_variables}}|{{lua_functions}})[\s\n]'
+      captures:
+        1: variable.language.lua_constant.fennel
+    - match: '({{lua_variables}}|{{lua_functions}})(\))'
+      captures:
+        0: punctuation.section.parens.end.fennel
+        1: variable.language.lua_constant.fennel
     - match: '\?'
       scope: variable.function.optional.fennel
       push: pop-expr

diff --git a/tests/syntax_test_fennel_reference_110.fnl b/tests/syntax_test_fennel_reference_110.fnl
@@ -160,6 +160,46 @@ _1 7/8 1_
 ; ^ entity.name.tag.lua_support.fennel
 ;  ^^^ source.fennel
 
+(if error2 true false)
+; <- punctuation.section.parens.begin.fennel
+;^^ entity.name.tag.lua_support.fennel
+;   ^^^^^^ source.fennel
+;          ^^^^ constant.language.fennel
+;               ^^^^^ constant.language.fennel
+;                    ^ punctuation.section.parens.end.fennel
+
+(if has-error true false)
+; <- punctuation.section.parens.begin.fennel
+;^^ entity.name.tag.lua_support.fennel
+;   ^^^^^^^^^ source.fennel
+;             ^^^^ constant.language.fennel
+;                  ^^^^^ constant.language.fennel
+;                       ^ punctuation.section.parens.end.fennel
+
+(if has_error true false)
+; <- punctuation.section.parens.begin.fennel
+;^^ entity.name.tag.lua_support.fennel
+;   ^^^^^^^^^ source.fennel
+;             ^^^^ constant.language.fennel
+;                  ^^^^^ constant.language.fennel
+;                       ^ punctuation.section.parens.end.fennel
+
+(if hasError true false)
+; <- punctuation.section.parens.begin.fennel
+;^^ entity.name.tag.lua_support.fennel
+;   ^^^^^^^^ source.fennel
+;            ^^^^ constant.language.fennel
+;                 ^^^^^ constant.language.fennel
+;                      ^ punctuation.section.parens.end.fennel
+
+(if errorMessage true false)
+; <- punctuation.section.parens.begin.fennel
+;^^ entity.name.tag.lua_support.fennel
+;   ^^^^^^^^^^^^ source.fennel
+;                ^^^^ constant.language.fennel
+;                     ^^^^^ constant.language.fennel
+;                          ^ punctuation.section.parens.end.fennel
+
 (match-try a
 ; <- punctuation.section.parens.begin.fennel
 ;^^^^^^^^^ entity.name.tag.fennel_support.fennel

diff --git a/tests/syntax_test_lua.fnl b/tests/syntax_test_lua.fnl
@@ -52,6 +52,13 @@
 ;                ^ constant.numeric.integer.decimal.fennel
 ;                 ^^ punctuation.section.parens.end.fennel
 
+(print assert
+; <- punctuation.section.parens.begin.fennel
+;^^^^^ entity.name.tag.lua_support.fennel
+;      ^^^^^^ variable.language.lua_constant.fennel
+)
+; <- punctuation.section.parens.end.fennel
+
 (print assert)
 ; <- punctuation.section.parens.begin.fennel
 ;^^^^^ entity.name.tag.lua_support.fennel