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

Proper errors if glslangValidator isnt found, woop

Browse source
This commit is contained in:
Noah Santschi-Cooney 2018-06-15 22:59:59 +01:00
parent 44ee663d06
commit ef643d8cdb
No known key found for this signature in database
GPG key ID: 3B22282472C8AE48
4 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/src/config.ts
View file

@ -1,11 +1,11 @@
import { join } from 'path'
export class Config {
public readonly minecraftPath: string
public readonly glslangPath: string
public minecraftPath: string
public glslangValidatorPath: string
constructor(mcPath: string, glslangPath: string) {
this.minecraftPath = join(mcPath, 'shaderpacks')
this.glslangPath = glslangPath || 'glslangValidator'
this.glslangValidatorPath = glslangPath || 'glslangValidator'
}
}

3
server/src/linter.ts
View file

@ -75,8 +75,7 @@ export function preprocess(document: TextDocument) {
}
function lint(text: string, uri: string) {
const child = exec(`${conf.glslangPath} --stdin -S frag`, (error, out, err) => {
if (error) return
const child = exec(`${conf.glslangValidatorPath} --stdin -S frag`, (error, out, err) => {
const diagnostics: Diagnostic[] = []
const matches = filterMatches(out) as RegExpMatchArray[]
matches.forEach((match) => {

17
server/src/server.ts
View file

@ -2,7 +2,7 @@ import * as vsclang from 'vscode-languageserver'
import { Config } from './config'
import { completions } from './completionProvider';
import { preprocess } from './linter';
import { stat } from 'fs';
import { exec } from 'child_process';
export const connection = vsclang.createConnection(new vsclang.IPCMessageReader(process), new vsclang.IPCMessageWriter(process));
@ -32,17 +32,18 @@ documents.onDidSave((event) => {
/* documents.onDidChangeContent((change) => {
preprocess(change.document);
});
*/
});*/
connection.onDidChangeConfiguration((change) => {
const temp = change.settings.mcglsl as Config
conf = new Config(temp.minecraftPath, temp.glslangPath)
stat(conf.glslangPath, (error) => {
if (error) {
connection.window.showErrorMessage('glslangValidator not found')
conf = new Config(temp.minecraftPath, temp.glslangValidatorPath)
exec(conf.glslangValidatorPath, (error) => {
if (error['code'] !== 1) {
connection.window.showErrorMessage(`[mc-glsl] glslangValidator not found at: ${conf.glslangValidatorPath}`)
return
}
documents.all().forEach(preprocess);
})
documents.all().forEach(preprocess);
});
connection.onCompletion((textDocumentPosition: vsclang.TextDocumentPositionParams): vsclang.CompletionItem[] => {

1
server/tslint.json
View file

@ -7,6 +7,7 @@
"semicolon": false,
"ordered-imports": false,
"object-literal-sort-keys": false,
"no-string-literal": false,
"interface-name": false,
"indent": [true, "spaces", 2],
"arrow-parens": false,