diff options
| -rw-r--r-- | ale_linters/glsl/glslang.vim | 6 | ||||
| -rw-r--r-- | test/handler/test_glslang_handler.vader | 24 |
2 files changed, 28 insertions, 2 deletions
diff --git a/ale_linters/glsl/glslang.vim b/ale_linters/glsl/glslang.vim index bbddce90..54fc0caa 100644 --- a/ale_linters/glsl/glslang.vim +++ b/ale_linters/glsl/glslang.vim @@ -17,13 +17,15 @@ function! ale_linters#glsl#glslang#Handle(buffer, lines) abort " Matches patterns like the following: " " ERROR: 0:5: 'foo' : undeclared identifier - let l:pattern = '^\(.\+\): \(\d\+\):\(\d\+\): \(.\+\)' + " or when using options like -V or -G or --target-env + " ERROR: filename:5: 'foo' : undeclared identifier + let l:pattern = '^\(.\+\): \(.\+\):\(\d\+\): \(.\+\)' let l:output = [] for l:match in ale#util#GetMatches(a:lines, l:pattern) call add(l:output, { \ 'lnum': str2nr(l:match[3]), - \ 'col': str2nr(l:match[2]), + \ 'col' : 0, \ 'text': l:match[4], \ 'type': l:match[1] is# 'ERROR' ? 'E' : 'W', \}) diff --git a/test/handler/test_glslang_handler.vader b/test/handler/test_glslang_handler.vader index 6d3a7999..9952c0a8 100644 --- a/test/handler/test_glslang_handler.vader +++ b/test/handler/test_glslang_handler.vader @@ -22,3 +22,27 @@ Execute(The glsl glslang handler should parse lines correctly): \ 'WARNING: 0:121: ''switch'' : last case/default label not followed by statements', \ 'ERROR: 2 compilation errors. No code generated.', \ ]) + +Execute(The glsl glslang handler should parse lines with options -V or -G correctly): + AssertEqual + \ [ + \ { + \ 'lnum': 7, + \ 'col': 0, + \ 'type': 'E', + \ 'text': '''non-opaque uniforms outside a block'' : not allowed when using GLSL for Vulkan', + \ }, + \ { + \ 'lnum': 14, + \ 'col': 0, + \ 'type': 'W', + \ 'text': '''__shininess'' : identifiers containing consecutive underscores ("__") are reserved', + \ }, + \ ], + \ ale_linters#glsl#glslang#Handle(bufnr(''), [ + \ 'shader.vert', + \ 'ERROR: shader.vert:7: ''non-opaque uniforms outside a block'' : not allowed when using GLSL for Vulkan', + \ 'WARNING: shader.vert:14: ''__shininess'' : identifiers containing consecutive underscores ("__") are reserved', + \ 'ERROR: 1 compilation errors. No code generated.', + \ 'SPIR-V is not generated for failed compile or link', + \ ]) |