else
@@ -236,6 +282,9 @@ if version >= 508 || !exists("did_smarty_syn_inits")
HiLink smartyDRepeat Keyword
HiLink smartyDTags Keyword
HiLink smartyDollarSign Statement
+ HiLink smartyHashSign Statement
+ HiLink smartyForeachConstruct Keyword
+ HiLink smartyForeachProperty Keyword
HiLink smartyGlue Statement
HiLink smartyInBacktick Statement
HiLink smartyInBracket PreProc
@@ -261,9 +310,9 @@ endif
syn include syntax/php.vim
syn region phpRegion matchgroup=Delimiter start="{php}" end="{/php}" contains=@phpClTop
-let b:current_syntax = "smarty"
+let b:current_syntax = 'smarty'
-if main_syntax == 'smarty'
+if main_syntax ==# 'smarty'
unlet main_syntax
endif
diff --git a/test/filetype/smarty.vader b/test/filetype/smarty.vader
new file mode 100644
index 0000000..43ba5a9
--- /dev/null
+++ b/test/filetype/smarty.vader
@@ -0,0 +1,5 @@
+Execute (Load simple smarty file):
+ edit simple.tpl
+
+Then (Detected simple.tpl as a smarty file):
+ AssertEqual &filetype, 'smarty'
diff --git a/test/indent/hardtab.vader b/test/indent/hardtab.vader
new file mode 100644
index 0000000..99e56a5
--- /dev/null
+++ b/test/indent/hardtab.vader
@@ -0,0 +1,81 @@
+Execute (setup hardtab indent configuration):
+ set noexpandtab
+ set shiftwidth=4
+ set tabstop=4
+ set softtabstop=4
+ let g:smarty_indent_block=1
+
+Given smarty (non indented smarty template):
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (hardtab indented result):
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+############################################
+
+Given smarty (softtab indented result):
+
+
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (hardtab indented smarty template):
+
+
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+
+
+############################################
+
+Execute (setup softtab indent configuration):
+ set expandtab
+
+Given smarty (hardtab indented smarty template):
+
+
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (softtab indented result):
+
+
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+
+
diff --git a/test/indent/indent.vader b/test/indent/indent.vader
new file mode 100644
index 0000000..b689ba1
--- /dev/null
+++ b/test/indent/indent.vader
@@ -0,0 +1,329 @@
+Execute (setup indent configuration):
+ set expandtab
+ set shiftwidth=4
+ set tabstop=4
+ set softtabstop=4
+ let g:smarty_indent_block=1
+
+Given smarty (non indented smarty template):
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (very basic indentation result):
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if $test}
+ {if $test}
+ black
+ {/if}
+ {else}
+ {if $test}
+ white
+ {/if}
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (two levels elsif indentation result):
+ {if $test}
+ {if $test}
+ black
+ {/if}
+ {else}
+ {if $test}
+ white
+ {/if}
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if $test}
+ {if $test}
+ black
+ {/if}
+ {elseif $test2}
+ {if $test}
+ white
+ {/if}
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (two levels elsif indentation result):
+ {if $test}
+ {if $test}
+ black
+ {/if}
+ {elseif $test2}
+ {if $test}
+ white
+ {/if}
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (several oneline tags alone):
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ bla {if $test}bla{/if} bla
+ bla {if $test}bla{/if} bla
+ bla {if $test}bla{/if} bla
+ bla {if $test}bla{/if} bla
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (several oneline tags with text before and after):
+ bla {if $test}bla{/if} bla
+ bla {if $test}bla{/if} bla
+ bla {if $test}bla{/if} bla
+ bla {if $test}bla{/if} bla
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if $test2}
+ {if $test}bla{/if}
+ {else}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (several oneline tags alone and nested):
+ {if $test2}
+ {if $test}bla{/if}
+ {else}
+ {if $test}bla{/if}
+ {if $test}bla{/if}
+ {/if}
+
+############################################
+# multiline tags
+
+Given smarty (non indented smarty template):
+ {if $test1 }
+
+
+ simple
+
+
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (onleline starting tag + html):
+ {if $test1 }
+
+
+ simple
+
+
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if
+ $test1
+ }
+
+
+ multi 1 condition
+
+
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (multiline starting tag one condition):
+ {if
+ $test1
+ }
+
+
+ multi 1 condition
+
+
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if $test1 &&
+ $test2 ||
+ $test3}
+
+
+ multi several conditions
+
+
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (multiline starting tag several simple conditions):
+ {if $test1 &&
+ $test2 ||
+ $test3}
+
+
+ multi several conditions
+
+
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if $test1 &&
+ $test2 ||
+ $test3
+ }
+
+
+ multi several conditions
+
+
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (multiline starting tag several simple conditions end bracket alone):
+ {if $test1 &&
+ $test2 ||
+ $test3
+ }
+
+
+ multi several conditions
+
+
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if {plugin $test1} &&
+ {$test2} ||
+ {$test3}}
+
+
+ multi several conditions and nested
+
+
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (multiline starting tag several conditions inside nested tags):
+ {if {plugin $test1} &&
+ {$test2} ||
+ {$test3}}
+
+
+ multi several conditions and nested
+
+
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if
+ {$test1} &&
+ {$test2} ||
+ {$test3}}
+
+
+ multi several conditions and nested
+
+
+ {/if}
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (multiline starting tag several conditions inside nested tags bracket and if on separate tag):
+ {if
+ {$test1} &&
+ {$test2} ||
+ {$test3}}
+
+
+ multi several conditions and nested
+
+
+ {/if}
+
+############################################
+
+Given smarty (non indented smarty template):
+ {if
+ ($test1) &&
+ ($test2) ||
+ ($test3)}
+
+
+ multi several conditions with parentheses
+
+
+ {/if}
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (multiline starting tag several conditions with parentheses):
+ {if
+ ($test1) &&
+ ($test2) ||
+ ($test3)}
+
+
+ multi several conditions with parentheses
+
+
+ {/if}
+
+############################################
diff --git a/test/indent/nosmartyindent.vader b/test/indent/nosmartyindent.vader
new file mode 100644
index 0000000..af94fda
--- /dev/null
+++ b/test/indent/nosmartyindent.vader
@@ -0,0 +1,44 @@
+Execute (setup indent configuration):
+ set expandtab
+ set shiftwidth=4
+ set tabstop=4
+ set softtabstop=4
+ let g:smarty_indent_block=0
+
+Given smarty (indented smarty template):
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+Do (Indent the whole buffer without smarty indent option):
+ gg=G
+
+Expect smarty (non indented result):
+ {if $test}
+ black
+ {elseif $test2}
+ white
+ {/if}
+
+############################################
+
+Given smarty (non indented html content):
+
+
+ black
+
+
+
+Do (indented html content):
+ gg=G
+
+Expect smarty (non indented result):
+
+
+ black
+
+
+
+############################################
diff --git a/test/indent/smartyinjs.vader b/test/indent/smartyinjs.vader
new file mode 100644
index 0000000..61ad9da
--- /dev/null
+++ b/test/indent/smartyinjs.vader
@@ -0,0 +1,64 @@
+Execute (setup indent configuration):
+ set expandtab
+ set shiftwidth=4
+ set tabstop=4
+ set softtabstop=4
+ let g:smarty_indent_block=1
+ let g:html_indent_script1 = 'inc'
+
+Given smarty (indented smarty in
+
+# does not work in vim 8, maybe bug in syntax/html.vim
+Do (TODO: Indent the whole buffer):
+ gg=G
+
+Expect smarty (indented smarty in
+
+############################################
+
+Given smarty (indented smarty in
+
+Do (Indent the whole buffer):
+ gg=G
+
+Expect smarty (indented smarty in
diff --git a/test/init.vim b/test/init.vim
new file mode 100644
index 0000000..cdf2549
--- /dev/null
+++ b/test/init.vim
@@ -0,0 +1,19 @@
+" minimum vim configuration for test runner
+set nocompatible
+"let &packpath = expand(':p:h:h')
+" Remove first and last entry from runtimepath, to prevent loading plugins from ~/.vim
+" Replace first entry rom runtimepath, by current directory, preventing
+" loading plugins from ~/.vim and ensure the local syntax file is loaded
+" instead of the bundled one
+let &runtimepath = substitute(&runtimepath, '\v^.{-},(.*),.*$', '.,\1', '')
+
+filetype off
+set runtimepath+=vader.vim
+set runtimepath+=.
+set runtimepath+=after
+"force loading current syntax file first
+filetype plugin indent on
+syntax enable
+" Avoid closing up any fold since it results in some tests skipping lines and
+" their output ends up diverging from what we expect them to be.
+set foldlevel=99
diff --git a/test/run-tests.sh b/test/run-tests.sh
new file mode 100755
index 0000000..7f83feb
--- /dev/null
+++ b/test/run-tests.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+# Download dependencies for tests and run full test suit
+# Can use TESTVIM env variable to choose between vim and nvim (neovim)
+# Optional first script argument can be path to vader file (run only one suite)
+#
+set -x
+TEST_FILE=$1
+SCRIPT_FOLDER=$(dirname "$(readlink -f "$0")")
+
+# TESTVIM env variable has precedence over installed programs
+# next in row is neovim and last one is vim
+if [ "$TESTVIM" == "vim" ]; then
+ RUNVIM=vim
+elif [ "$TESTVIM" == "nvim" ] || [ -x "$(command -v nvim)" ]; then
+ RUNVIM=nvim
+ VADER_OUTPUT_FILE=$(mktemp)
+ export VADER_OUTPUT_FILE
+ trap 'rm -f ${VADER_OUTPUT_FILE}' EXIT INT QUIT TERM
+elif [ -x "$(command -v vim)" ]; then
+ RUNVIM=vim
+else
+ echo 'Error: vim is not installed.' >&2
+ exit 1
+fi
+
+cd "${SCRIPT_FOLDER}/.." || exit
+
+if [ ! -d "vader.vim" ]; then
+ git clone https://github.com/junegunn/vader.vim.git
+fi
+
+if [ -z "$TEST_FILE" ]; then
+ TEST_SUITE='test/**/*.vader'
+else
+ TEST_SUITE=$TEST_FILE
+fi
+
+"${RUNVIM}" -u test/init.vim -c "Vader! ${TEST_SUITE}"
+vader_exit=$?
+[ -n "${VADER_OUTPUT_FILE}" ] && cat "${VADER_OUTPUT_FILE}"
+exit $vader_exit
+
diff --git a/test/syntax/comment.vader b/test/syntax/comment.vader
new file mode 100644
index 0000000..4ac4c9f
--- /dev/null
+++ b/test/syntax/comment.vader
@@ -0,0 +1,59 @@
+Given smarty (simple comment):
+ {* simple comment *}
+ content
+ {*
+ * multiline
+ *}
+
+
+Execute (comment detected inline, multiline and in html string):
+ AssertEqual 'smartyComment', SyntaxOf("comment")
+ AssertEqual 'smartyComment', SyntaxOf("multiline")
+ AssertEqual 'smartyComment', SyntaxOf("string")
+ AssertNotEqual 'smartyComment', SyntaxOf("content")
+
+############################################
+
+Given smarty (commented smarty code):
+ {* commented code
+ {if $condition}
+ {$variable}
+ {/if}
+ *}
+ {$outside}
+
+Execute (commented code detected as comment):
+ AssertEqual 'smartyComment', SyntaxOf("commented")
+ AssertEqual 'smartyComment', SyntaxOf("condition")
+ AssertEqual 'smartyComment', SyntaxOf("variable")
+ AssertNotEqual 'smartyComment', SyntaxOf("outside")
+
+############################################
+
+Given smarty (commented html code):
+ {* commented code
+
+ commented
+
+ *}
+ outside
+
+Execute (commented code detected as comment):
+ AssertEqual 'smartyComment', SyntaxOf("commented")
+ AssertEqual 'smartyComment', SyntaxOf("indiv")
+ AssertNotEqual 'smartyComment', SyntaxOf("outside")
+
+############################################
+
+Given smarty (commented html code):
+
+
+Execute (commented code detected as comment):
+ AssertEqual 'smartyComment', SyntaxOf("commented")
+ AssertEqual 'smartyComment', SyntaxOf("jsvar")
+ AssertNotEqual 'smartyComment', SyntaxOf("outside")
diff --git a/test/syntax/quote.vader b/test/syntax/quote.vader
new file mode 100644
index 0000000..886a9a0
--- /dev/null
+++ b/test/syntax/quote.vader
@@ -0,0 +1,31 @@
+Given smarty (simple quote):
+ {tag attribute='simple quote'}
+
+Execute (string in simple quote):
+ AssertEqual 'smartyString', SyntaxOf("simple")
+
+############################################
+
+Given smarty (double quote):
+ {tag attribute="double quote"}
+
+Execute (string in double quote):
+ AssertEqual 'smartyStringDouble', SyntaxOf("double")
+
+############################################
+
+Given smarty (simple escaped quote):
+ {tag attribute='simple quote \'escaped'}
+
+Execute (string in simple quote):
+ AssertEqual 'smartyString', SyntaxOf("escaped")
+
+############################################
+
+Given smarty (double escaped quote):
+ {tag attribute="double quote \"escaped"}
+
+Execute (string in double quote):
+ AssertEqual 'smartyStringDouble', SyntaxOf("escaped")
+
+############################################