Skip to content

Commit 346834d

Browse files
committed
vim-config work in progress
1 parent 92ea85a commit 346834d

36 files changed

+10
-10
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
*.cabal linguist-generated=true
22
/ghc-diagnostics/test/fixtures/**/*.yaml linguist-generated=true
33
/ghc-diagnostics/test/fixtures/**/Foo.hs linguist-generated=true
4-
/vim/test/assets/*.errors linguist-generated=true
4+
/vim/test/fixtures/*.errors linguist-generated=true

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- run: vim/test/run.vim
8383
if: runner.os == 'Linux'
8484

85-
- run: vim/test/assets/generate.sh
85+
- run: vim/test/fixtures/generate.sh
8686
if: ${{ runner.os == 'Linux' && matrix.ghc != '9.4' }}
8787

8888
- run: git diff --exit-code
@@ -107,7 +107,7 @@ jobs:
107107

108108
- uses: actions/checkout@v4
109109
- name: Check for trailing whitespace
110-
run: "! git grep -nI '[[:blank:]]$' -- . ':!vim/test/assets'"
110+
run: "! git grep -nI '[[:blank:]]$' -- . ':!vim/test/fixtures'"
111111

112112
- run: curl -sSL https://raw.githubusercontent.com/sol/hpack/main/get-hpack.sh | bash
113113
- run: hpack && git diff --exit-code

vim/sensei.test.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function PopulateQuickFixList(name)
2222
endfunction
2323

2424
function GhcErrorsFor(name)
25-
let errors = glob("vim/test/assets/" . a:name . ".*.errors", v:true, v:true)
25+
let errors = glob("vim/test/fixtures/" . a:name . ".*.errors", v:true, v:true)
2626
call ShouldBe(len(errors), 5)
2727
return errors
2828
endfunction
@@ -151,11 +151,11 @@ for name in GhcErrorsFor("suggested-fix-multiline.hs")
151151
call ShouldBe(err.text, "\n The type signature for ‘bar’ lacks an accompanying binding")
152152
endfor
153153

154-
let errors = PopulateQuickFixList("vim/test/assets/hspec.hs.errors")
154+
let errors = PopulateQuickFixList("vim/test/fixtures/hspec.hs.errors")
155155
call ShouldBe(len(errors), 1)
156156

157157
let err = errors[0]
158-
call ShouldBe(bufname(err.bufnr), "vim/test/assets/hspec.hs")
158+
call ShouldBe(bufname(err.bufnr), "vim/test/fixtures/hspec.hs")
159159
call ShouldBe(err.lnum, 6)
160160
call ShouldBe(err.col, 11)
161161
call ShouldBe(err.end_lnum, 0)

vim/test/assets/generate.sh renamed to vim/test/fixtures/generate.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
2-
cabal exec -- runhaskell vim/test/assets/hspec.hs --expert --seed 0 --no-color > vim/test/assets/hspec.hs.errors
3-
sed -i 's/Finished in 0.[0-9][0-9][0-9][0-9] seconds/Finished in 0.0005 seconds/' vim/test/assets/hspec.hs.errors
2+
cabal exec -- runhaskell vim/test/fixtures/hspec.hs --expert --seed 0 --no-color > vim/test/fixtures/hspec.hs.errors
3+
sed -i 's/Finished in 0.[0-9][0-9][0-9][0-9] seconds/Finished in 0.0005 seconds/' vim/test/fixtures/hspec.hs.errors
44

5-
cd vim/test/assets
5+
cd vim/test/fixtures
66

77
for name in $(ls *.hs | grep -v hspec); do
88
for ghc in ghc-9.6 ghc-9.8 ghc-9.10; do
File renamed without changes.

vim/test/assets/hspec.hs.errors renamed to vim/test/fixtures/hspec.hs.errors

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

0 commit comments

Comments
 (0)