language-servers/mcshader-lsp
1
0
Fork 0
mirror of https://github.com/Strum355/mcshader-lsp.git synced 2025-08-04 00:49:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

includes no longer give off syntax error unless there is a syntax error. Also ill never be happy with function names...

Browse source
This commit is contained in:
Noah Santschi-Cooney 2018-05-27 20:02:01 +01:00
parent 891d2ebf5a
commit 9fd344d8f5
No known key found for this signature in database
GPG key ID: 3B22282472C8AE48
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/linter/glslProvider.ts
View file

@ -134,9 +134,18 @@ export default class GLSLProvider implements vscode.CodeActionProvider {
// Split output by line, remove empty lines, remove the first and 2 trailing lines,
// and then remove all lines that match any of the regex
private parseOutput = (res: string) => res
private filterMessages = (res: string) => res
.split('\n')
.filter((s: string) => s.length > 1 || !this.matchesFilters(s))
.filter((s: string) => s.length > 1 && !this.matchesFilters(s))
.map((s: string) => s.match(outputMatch))
.filter(match => match && match.length > 3)
private filterPerLine(matches: RegExpMatchArray[], document: vscode.TextDocument) {
return matches.filter((match) => {
let line = document.lineAt(parseInt(match![2]))
return !(syntaxError.test(match[0]) && line.text.leftTrim().startsWith('#include'))
})
}
// The big boi that does all the shtuff
private lint(document: vscode.TextDocument) {
@ -147,15 +156,12 @@ export default class GLSLProvider implements vscode.CodeActionProvider {
this.createSymlinks(linkname, document)
const res = cp.spawnSync(this.config.glslangPath, [linkname]).output[1].toString()
const problems = this.parseOutput(res)
let messageMatches = this.filterPerLine(this.filterMessages(res) as RegExpMatchArray[], document)
const diags: vscode.Diagnostic[] = []
problems.forEach((problem: string) => {
const matches = problem.match(outputMatch)
if (!matches || (matches && matches.length < 4)) return
const [type, lineString, message] = matches.slice(1,4)
messageMatches.forEach((match) => {
const [type, lineString, message] = match!.slice(1)
const lineNum = parseInt(lineString)
// Default to error