Update tests location

7 files changed, 253 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 9e9ec579..1ec9bf79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-.PHONY: all test dev
+.PHONY: build test dev
 
-all:
+build:
 	@ scripts/build
 
 test:
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index cdb96b50..ba187f91 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -366,6 +366,10 @@ if !has_key(s:disabled_packages, 'protobuf')
   au! BufRead,BufNewFile *.proto
 endif
 
+if !has_key(s:disabled_packages, 'puppet')
+  au! BufRead,BufNewFile *.pp
+endif
+
 if !has_key(s:disabled_packages, 'python')
   au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec,SConstruct
 endif
diff --git a/scripts/Gemfile b/scripts/Gemfile
deleted file mode 100644
index fc8e5745..00000000
--- a/scripts/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "jasherai-oniguruma"
diff --git a/scripts/test b/scripts/test
index 9e023bb9..227174d7 100755
--- a/scripts/test
+++ b/scripts/test
@@ -5,8 +5,8 @@ set -e
 vim --clean -N -u <(echo "
   let &rtp='$PWD,'.&rtp
   let g:polyglot_test = 1
-  source scripts/test_extensions.vim
-  source scripts/test_filetypes.vim
+  source tests/extensions.vim
+  source tests/filetypes.vim
   qa!
 ")
 
diff --git a/syntax/unison.vim b/syntax/unison.vim
index 8353dce9..2578add8 100644
--- a/syntax/unison.vim
+++ b/syntax/unison.vim
@@ -97,6 +97,7 @@ endif
 syn match   uLineComment      "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$"
 syn region  uBlockComment     start="{-"  end="-}" contains=uBlockComment
 syn region  uPragma	       start="{-#" end="#-}"
+syn region  uBelowFold	       start="^---" skip="." end="." contains=uBelowFold
 
 " Docs
 syn region  uDocBlock         start="\[:" end=":]" contains=uLink,uDocDirective
@@ -134,6 +135,7 @@ if version >= 508 || !exists("did_u_syntax_inits")
   HiLink uBlockComment		  uComment
   HiLink uLineComment			  uComment
   HiLink uComment			  Comment
+  HiLink uBelowFold			  Comment
   HiLink uDocBlock                String
   HiLink uLink                    uType
   HiLink uDocDirective            uImport
@@ -148,6 +150,7 @@ if version >= 508 || !exists("did_u_syntax_inits")
   delcommand HiLink
 endif
 
+
 let b:current_syntax = "unison"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
diff --git a/scripts/test_extensions.vim b/tests/extensions.vim
index 467ac86a..467ac86a 100644
--- a/scripts/test_extensions.vim
+++ b/tests/extensions.vim
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
new file mode 100644
index 00000000..02d44ca4
--- /dev/null
+++ b/tests/filetypes.vim
@@ -0,0 +1,242 @@
+function! TestFiletype(filetype)
+  try
+    enew
+    exec 'set ft=' . a:filetype
+  catch
+    echo 'Error loading filetype ' . a:filetype  . ':'
+    echo v:exception
+    echo v:throwpoint
+    exec ':cq!'
+  endtry
+endfunction
+
+call TestFiletype('8th')
+call TestFiletype('haproxy')
+call TestFiletype('a2ps')
+call TestFiletype('a65')
+call TestFiletype('aap')
+call TestFiletype('abap')
+call TestFiletype('abaqus')
+call TestFiletype('abc')
+call TestFiletype('abel')
+call TestFiletype('acedb')
+call TestFiletype('asl')
+call TestFiletype('ada')
+call TestFiletype('ahdl')
+call TestFiletype('aidl')
+call TestFiletype('alsaconf')
+call TestFiletype('aml')
+call TestFiletype('ampl')
+call TestFiletype('xml')
+call TestFiletype('ant')
+call TestFiletype('apache')
+call TestFiletype('apiblueprint')
+call TestFiletype('applescript')
+call TestFiletype('aptconf')
+call TestFiletype('arch')
+call TestFiletype('cpp')
+call TestFiletype('c')
+call TestFiletype('arduino')
+call TestFiletype('art')
+call TestFiletype('asciidoc')
+call TestFiletype('autohotkey')
+call TestFiletype('elf')
+call TestFiletype('automake')
+call TestFiletype('asn')
+call TestFiletype('aspvbs')
+call TestFiletype('aspperl')
+call TestFiletype('atlas')
+call TestFiletype('autoit')
+call TestFiletype('ave')
+call TestFiletype('awk')
+call TestFiletype('caddyfile')
+call TestFiletype('carp')
+call TestFiletype('clojure')
+call TestFiletype('cmake')
+call TestFiletype('coffee')
+call TestFiletype('litcoffee')
+call TestFiletype('cryptol')
+call TestFiletype('crystal')
+call TestFiletype('ecrystal')
+call TestFiletype('csv')
+call TestFiletype('cucumber')
+call TestFiletype('cuesheet')
+call TestFiletype('dart')
+call TestFiletype('dhall')
+call TestFiletype('d')
+call TestFiletype('dcov')
+call TestFiletype('dd')
+call TestFiletype('ddoc')
+call TestFiletype('dsdl')
+call TestFiletype('Dockerfile')
+call TestFiletype('yaml.docker-compose')
+call TestFiletype('elixir')
+call TestFiletype('eelixir')
+call TestFiletype('elm')
+call TestFiletype('ember-script')
+call TestFiletype('emblem')
+call TestFiletype('erlang')
+call TestFiletype('fennel')
+call TestFiletype('ferm')
+call TestFiletype('fish')
+call TestFiletype('fbs')
+call TestFiletype('forth')
+call TestFiletype('glsl')
+call TestFiletype('fsharp')
+call TestFiletype('gdscript3')
+call TestFiletype('gitconfig')
+call TestFiletype('gitrebase')
+call TestFiletype('gitsendemail')
+call TestFiletype('gitcommit')
+call TestFiletype('gmpl')
+call TestFiletype('gnuplot')
+call TestFiletype('go')
+call TestFiletype('gomod')
+call TestFiletype('gohtmltmpl')
+call TestFiletype('javascript')
+call TestFiletype('flow')
+call TestFiletype('javascriptreact')
+call TestFiletype('graphql')
+call TestFiletype('groovy')
+call TestFiletype('grub')
+call TestFiletype('haml')
+call TestFiletype('mustache')
+call TestFiletype('haskell')
+call TestFiletype('haxe')
+call TestFiletype('hcl')
+call TestFiletype('hive')
+call TestFiletype('html')
+call TestFiletype('i3config')
+call TestFiletype('icalendar')
+call TestFiletype('idris')
+call TestFiletype('idris2')
+call TestFiletype('lidris2')
+call TestFiletype('ion')
+call TestFiletype('Jenkinsfile')
+call TestFiletype('jinja.html')
+call TestFiletype('jq')
+call TestFiletype('json5')
+call TestFiletype('json')
+call TestFiletype('jsonnet')
+call TestFiletype('jst')
+call TestFiletype('julia')
+call TestFiletype('kotlin')
+call TestFiletype('ledger')
+call TestFiletype('less')
+call TestFiletype('lilypond')
+call TestFiletype('livescript')
+call TestFiletype('llvm')
+call TestFiletype('tablegen')
+call TestFiletype('log')
+call TestFiletype('lua')
+call TestFiletype('m4')
+call TestFiletype('mako')
+call TestFiletype('mma')
+call TestFiletype('markdown')
+call TestFiletype('markdown.mdx')
+call TestFiletype('meson')
+call TestFiletype('dosini')
+call TestFiletype('moon')
+call TestFiletype('murphi')
+call TestFiletype('nginx')
+call TestFiletype('nim')
+call TestFiletype('nix')
+call TestFiletype('objc')
+call TestFiletype('ocaml')
+call TestFiletype('omake')
+call TestFiletype('opam')
+call TestFiletype('oasis')
+call TestFiletype('dune')
+call TestFiletype('ocamlbuild_tags')
+call TestFiletype('ocpbuild')
+call TestFiletype('ocpbuildroot')
+call TestFiletype('sexplib')
+call TestFiletype('octave')
+call TestFiletype('opencl')
+call TestFiletype('perl')
+call TestFiletype('pod')
+call TestFiletype('mason')
+call TestFiletype('tt2')
+call TestFiletype('tt2html')
+call TestFiletype('xs')
+call TestFiletype('sql')
+call TestFiletype('cql')
+call TestFiletype('php')
+call TestFiletype('blade')
+call TestFiletype('plantuml')
+call TestFiletype('pony')
+call TestFiletype('ps1')
+call TestFiletype('ps1xml')
+call TestFiletype('proto')
+call TestFiletype('pug')
+call TestFiletype('puppet')
+call TestFiletype('embeddedpuppet')
+call TestFiletype('purescript')
+call TestFiletype('python')
+call TestFiletype('requirements')
+call TestFiletype('qmake')
+call TestFiletype('qml')
+call TestFiletype('r')
+call TestFiletype('rhelp')
+call TestFiletype('racket')
+call TestFiletype('ragel')
+call TestFiletype('raku')
+call TestFiletype('raml')
+call TestFiletype('razor')
+call TestFiletype('reason')
+call TestFiletype('rst')
+call TestFiletype('ruby')
+call TestFiletype('eruby')
+call TestFiletype('ruby')
+call TestFiletype('brewfile')
+call TestFiletype('rust')
+call TestFiletype('scala')
+call TestFiletype('sbt.scala')
+call TestFiletype('scss')
+call TestFiletype('sh')
+call TestFiletype('zsh')
+call TestFiletype('slim')
+call TestFiletype('slime')
+call TestFiletype('smt2')
+call TestFiletype('solidity')
+call TestFiletype('stylus')
+call TestFiletype('svelte')
+call TestFiletype('svg')
+call TestFiletype('swift')
+call TestFiletype('sxhkdrc')
+call TestFiletype('systemd')
+call TestFiletype('terraform')
+call TestFiletype('textile')
+call TestFiletype('thrift')
+call TestFiletype('tmux')
+call TestFiletype('toml')
+call TestFiletype('tptp')
+call TestFiletype('html.twig')
+call TestFiletype('xml.twig')
+call TestFiletype('typescript')
+call TestFiletype('typescriptreact')
+call TestFiletype('unison')
+call TestFiletype('v')
+call TestFiletype('vala')
+call TestFiletype('vbnet')
+call TestFiletype('vcl')
+call TestFiletype('velocity')
+call TestFiletype('vmasm')
+call TestFiletype('vue')
+call TestFiletype('xdc')
+call TestFiletype('xsl')
+call TestFiletype('yaml')
+call TestFiletype('yaml.ansible')
+call TestFiletype('helm')
+call TestFiletype('help')
+call TestFiletype('zephir')
+call TestFiletype('zir')
+call TestFiletype('zig')
+call TestFiletype('trasys')
+call TestFiletype('basic')
+call TestFiletype('vb')
+call TestFiletype('dosini')
+call TestFiletype('odin')
+call TestFiletype('bzl')
+call TestFiletype('prolog')
+call TestFiletype('tads')