Merge branch 'dev' of https://github.com/sslinky/vba-LanguageServer into dev

Author: SSlinky

.editorconfig

@@ -0,0 +1,21 @@
+# EditorConfig is awesome: http://EditorConfig.org
+# Template from: https://github.com/DecimalTurn/VBA-on-GitHub
+
+# top-most EditorConfig file
+root = true
+
+# Properties for VBA, VB6 and twinBASIC file extensions
+[*.{bas,cls,frm,vba,doccls,ctl,dsr,twin,tbform}]
+indent_style = space
+indent_size = 4
+end_of_line = crlf
+# Avoid line too long error (https://learn.microsoft.com/en-us/office/vba/language/reference/user-interface-help/line-too-long):
+max_line_length = 1023
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# The character set property isn't widely supported, but you can still add it. It just won't do anything if unsupported by your editor.
+# Reference: https://github.com/editorconfig/editorconfig/issues/209#issuecomment-445241830
+# Eg.:
+# charset = windows-1252
+# charset = us-ascii

client/src/syntaxes/vba.tmLanguage.yaml

@@ -284,7 +284,7 @@ repository:
 
           inlineIfElse:
             name: meta.flow.inline-if-else.vba
-            match: (?i)\s*((?:else)?if)\s+(.*?)\s+(then)\s+(.*)\s+(else)\s+([^'\n]*)
+            match: (?i)\s*((?:else\s+)?if)\s+(.*?)\s+(then)\s+(.*)\s+(else)\s+([^'\n]*)
             captures:
               1:
                 name: keyword.control.flow.decision.vba
@@ -296,8 +296,12 @@ repository:
                 name: keyword.control.flow.decision.vba
               4:
                 patterns:
+                  - include: "#inlineIfElse"
+                  - include: "#inlineIf"
                   - include: "#valueAssignment"
                   - include: "#language"
+                  - include: "#expression"
+                  - include: "#functionCall"
               5:
                 name: keyword.control.flow.decision.vba
               6:
@@ -319,10 +323,11 @@ repository:
                 name: keyword.control.flow.decision.vba
               4:
                 patterns:
+                  - include: "#inlineIfElse"
+                  - include: "#inlineIf"
                   - include: "#valueAssignment"
                   - include: "#language"
 
-
           flowCall:
             name: keyword.control.flow.call.vba
             match: "(?i)\\bcall\\b"

contributing.md

@@ -39,3 +39,11 @@ Note the grammar file for this project can be found at /server/src/antlr/vba.g4
   * Show ATN Graph for Rule
 
 The grammar call graph is interesting, but not particularly useful. Generating "valid" input generates garbage.
+
+### Run unit tests for TextMate grammar
+
+To verify that your changes haven't broken existing syntax or tests, and to ensure any new tests pass, run the following command:
+
+```
+npm run tmUnitTest
+```