language-servers/mcshader-lsp
1
0
Fork 0
mirror of https://github.com/Strum355/mcshader-lsp.git synced 2025-07-19 09:15:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed server crashing if glslangValidator wasnt found

Browse source
This commit is contained in:
Noah Santschi-Cooney 2018-06-29 19:31:56 +01:00
parent f93c26a59d
commit d2e58f475d
3 changed files with 46 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

56
server/src/linter.ts
View file

@ -1,4 +1,4 @@
import { conf, connection, documents } from './server'
import { conf, connection, documents, checkBinary } from './server'
import './global'
import { TextDocument, Diagnostic, DiagnosticSeverity, Range } from 'vscode-languageserver'
import { exec } from 'child_process'
@ -95,8 +95,8 @@ const formatURI = (uri: string) => uri.replace(/^file:\/\//, '')
//TODO not include in comments
const getIncludes = (lines: string[]) => lines
.map((line, i) => ({num: i, line}))
.filter((obj) => reInclude.test(obj.line))
.map((obj) => ({lineNum: obj.num, match: obj.line.match(reInclude)}))
.filter(obj => reInclude.test(obj.line))
.map(obj => ({lineNum: obj.num, match: obj.line.match(reInclude)}))
function absPath(currFile: string, includeFile: string): string {
if (!currFile.startsWith(conf.shaderpacksPath)) {
@ -114,31 +114,35 @@ function absPath(currFile: string, includeFile: string): string {
}
function lint(uri: string, lines: string[], includes: {lineNum: number, match: RegExpMatchArray}[]) {
const child = exec(`${conf.glslangPath} --stdin -S ${ext[path.extname(uri)]}`, (error, out) => {
const diagnostics: {[uri: string]: Diagnostic[]} = {}
diagnostics[uri] = []
includes.forEach(obj => {
diagnostics[absPath(uri, obj.match[1])] = []
})
checkBinary(
() => {
const child = exec(`${conf.glslangPath} --stdin -S ${ext[path.extname(uri)]}`, (error, out) => {
const diagnostics: {[uri: string]: Diagnostic[]} = {}
diagnostics[uri] = []
includes.forEach(obj => {
diagnostics[absPath(uri, obj.match[1])] = []
})
const matches = filterMatches(out) as RegExpMatchArray[]
matches.forEach((match) => {
const [whole, type, file, line, msg] = match
const diag = {
severity: type === 'ERROR' ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning,
range: calcRange(parseInt(line) - 1, uri),
message: replaceWord(msg),
source: 'mc-glsl'
}
diagnostics[file].push(diag)
})
const matches = filterMatches(out) as RegExpMatchArray[]
matches.forEach((match) => {
const [whole, type, file, line, msg] = match
const diag = {
severity: type === 'ERROR' ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning,
range: calcRange(parseInt(line) - 1, uri),
message: replaceWord(msg),
source: 'mc-glsl'
}
diagnostics[file].push(diag)
})
daigsArray(diagnostics).forEach((d) => {
connection.sendDiagnostics({uri: 'file://' + d.uri, diagnostics: d.diag})
})
})
lines.forEach(line => child.stdin.write(line))
child.stdin.end()
daigsArray(diagnostics).forEach(d => {
connection.sendDiagnostics({uri: 'file://' + d.uri, diagnostics: d.diag})
})
})
lines.forEach(line => child.stdin.write(line))
child.stdin.end()
}
)
}
const daigsArray = (diags: {[uri: string]: Diagnostic[]}) => Object.keys(diags).map(uri => ({uri, diag: diags[uri]}))

25
server/src/server.ts
View file

@ -24,9 +24,7 @@ connection.onInitialize((params): vsclang.InitializeResult => {
}
})
connection.onExit(() => {
})
connection.onExit(() => {})
documents.onDidOpen(onEvent)
@ -38,16 +36,23 @@ function onEvent(event: TextDocumentChangeEvent) {
preprocess(event.document, true, [event.document.uri.replace(/^file:\/\//, '')])
}
export function checkBinary(ok: () => void, fail?: () => any) {
exec(conf.glslangPath, (error) => {
if (error['code'] !== 1) {
if (fail) fail()
return
}
ok()
})
}
connection.onDidChangeConfiguration((change) => {
const temp = change.settings.mcglsl as Config
conf = new Config(temp['shaderpacksPath'], temp['glslangValidatorPath'])
exec(conf.glslangPath, (error) => {
if (error['code'] !== 1) {
connection.window.showErrorMessage(`[mc-glsl] glslangValidator not found at: ${conf.glslangPath}`)
return
}
documents.all().forEach((document) => preprocess(document, true, [document.uri.replace(/^file:\/\//, '')]))
})
checkBinary(
() => {documents.all().forEach(document => preprocess(document, true, [document.uri.replace(/^file:\/\//, '')]))},
() => {connection.window.showErrorMessage(`[mc-glsl] glslangValidator not found at: ${conf.glslangPath}`)}
)
})
connection.onCompletion((textDocumentPosition: vsclang.TextDocumentPositionParams) => completions)