New indentation test runner

.github/workflows/indent.yml

@@ -0,0 +1,31 @@
+name: Indent
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  vim-latest:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch source
+        uses: actions/checkout@v3
+      - name: Install Vim
+        uses: rhysd/action-setup-vim@v1
+        with: { version: stable }
+      - name: Run indentation tests
+        run: EDITOR=vim do/test-indent
+        working-directory: ./dev
+
+  neovim-latest:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch source
+        uses: actions/checkout@v3
+      - name: Install Neovim
+        uses: rhysd/action-setup-vim@v1
+        with: { neovim: true, version: stable }
+      - name: Run indentation tests
+        run: EDITOR=nvim do/test-indent
+        working-directory: ./dev

.github/workflows/clojure.yml → .github/workflows/syntax.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Syntax
 on:
   push:
     branches:
@@ -29,17 +29,6 @@ jobs:
       with:
         lein: 2.11.2
 
-    - name: Install Vim
-      uses: rhysd/action-setup-vim@v1
-      with:
-        version: stable
-
-    - name: Install Neovim
-      uses: rhysd/action-setup-vim@v1
-      with:
-        neovim: true
-        version: stable
-
     - name: Cache m2
       uses: actions/cache@v3
       env:

dev/do/test-indent

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+# Run Clojure.vim indentation tests
+
+# TODO: colour messages?
+
+if [ "$EDITOR" != 'vim' ] && [ "$EDITOR" != 'nvim' ]; then
+    echo 'ERROR: Set the "EDITOR" environment variable to "vim" or "nvim" and run again.'
+    exit 1
+fi
+
+PASSED=()
+FAILED=()
+SKIPPED=()
+
+tmp_base_dir='/tmp/clojure.vim/indent'
+mkdir -p "$tmp_base_dir"
+tmp_dir="$(mktemp --directory "$tmp_base_dir/XXXXXX")"
+test_case_dir='tests'
+
+test_pass() { PASSED+=("$1"); }
+test_fail() {
+    FAILED+=("$1")
+    echo "::error file=clj/indent-test/$test_case_dir/$1/out.clj::Failed indent test case."
+}
+test_skip() {
+    SKIPPED+=("$1")
+    echo "::warning file=clj/indent-test/$test_case_dir/$1/out.clj::Skipped indent test case."
+}
+
+run_test_case() {
+    test_case="$1"
+    in_file="$test_case_dir/$test_case/in.clj"
+    expected_file="$test_case_dir/$test_case/out.clj"
+
+    echo "::group::$EDITOR -- $test_case"
+
+    if [ -f "$test_case_dir/$test_case/SKIP" ]; then
+        test_skip "$test_case"
+    else
+        actual_file="$tmp_dir/$test_case.clj"
+        cp "$in_file" "$actual_file"
+
+        # Override the default test commands with a `test.vim` file.
+        test_script="$test_case_dir/$test_case/test.vim"
+        if [ -f "$test_script" ]; then
+            test_cmd=('-S' "$test_script")
+        else
+            test_cmd=('+normal! gg=G')
+        fi
+
+        "$EDITOR" --clean -NXnu test-vimrc.vim "${test_cmd[@]}" '+xall!' -- "$actual_file"
+
+        diff --color=always -u "$expected_file" "$actual_file"
+
+        [ $? -eq 0 ] && test_pass "$test_case" || test_fail "$test_case"
+    fi
+
+    echo '::endgroup::'
+}
+
+for tcase in $test_case_dir/*/; do
+    run_test_case "$(basename "$tcase")"
+done
+
+echo "passed: ${#PASSED[@]}, failed: ${#FAILED[@]}, skipped: ${#SKIPPED[@]}"
+exit ${#FAILED[@]}

dev/test-vimrc.vim

@@ -0,0 +1,3 @@
+let &rtp = getcwd() . '/..,' . &rtp
+filetype plugin indent on
+syntax enable

dev/tests/multi-line_strings_pretty/test.vim

@@ -0,0 +1,5 @@
+let g:clojure_indent_multiline_strings = 'pretty'
+normal! gg=G
+normal! G
+exec "normal! o\<CR>test \"hello\<CR>world\""
+exec "normal! o\<CR>regex #\"asdf\<CR>bar\""

dev/tests/multi-line_strings_standard/test.vim

@@ -0,0 +1,5 @@
+let g:clojure_indent_multiline_strings = 'standard'
+normal! gg=G
+normal! G
+exec "normal! o\<CR>test \"hello\<CR>world\""
+exec "normal! o\<CR>regex #\"asdf\<CR>bar\""

dev/tests/multi-line_strings_traditional/test.vim

@@ -0,0 +1,5 @@
+let g:clojure_indent_multiline_strings = 'traditional'
+normal! gg=G
+normal! G
+exec "normal! o\<CR>test \"hello\<CR>world\""
+exec "normal! o\<CR>regex #\"asdf\<CR>bar\""

dev/tests/s-expr_traditional/test.vim

@@ -0,0 +1,2 @@
+let g:clojure_indent_style = 'traditional'
+normal! gg=G

dev/tests/s-expr_uniform/test.vim

@@ -0,0 +1,2 @@
+let g:clojure_indent_style = 'uniform'
+normal! gg=G