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

Diagnostics aggregating works now, meaning missing includes now error along with any others

Browse source
This commit is contained in:
Noah Santschi-Cooney 2018-07-19 13:00:03 +01:00
parent 3e30f359df
commit c8c7a29abb
2 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
server/src/linter.ts
View file

@ -91,24 +91,26 @@ export function preprocess(lines: string[], docURI: string) {
const incStack = [docURI]
const allIncludes: IncludeObj[] = []
processIncludes(lines, incStack, allIncludes)
const diagnostics = new Map<string, Diagnostic[]>()
processIncludes(lines, incStack, allIncludes, diagnostics)
const includeMap = new Map<string, IncludeObj>(allIncludes.map(obj => [obj.path, obj]) as [string, IncludeObj][])
try {
lint(docURI, lines, new Map<string, IncludeObj>(allIncludes.map(obj => [obj.path, obj]) as [string, IncludeObj][]))
lint(docURI, lines, includeMap, diagnostics)
} catch (e) {
console.log(e)
}
}
function processIncludes(lines: string[], incStack: string[], allIncludes: IncludeObj[]) {
function processIncludes(lines: string[], incStack: string[], allIncludes: IncludeObj[], diagnostics: Map<string, Diagnostic[]>) {
const includes = getIncludes(incStack[0], lines)
allIncludes.push(...includes)
if (includes.length > 0) {
includes.reverse().forEach(inc => {
mergeInclude(inc, lines, incStack)
mergeInclude(inc, lines, incStack, diagnostics)
})
// recursively check for more includes to be merged
processIncludes(lines, incStack, allIncludes)
processIncludes(lines, incStack, allIncludes, diagnostics)
}
}
@ -153,16 +155,21 @@ export function getIncludes(uri: string, lines: string[]) {
}, [])
}
function mergeInclude(inc: IncludeObj, lines: string[], incStack: string[]) {
function mergeInclude(inc: IncludeObj, lines: string[], incStack: string[], diagnostics: Map<string, Diagnostic[]>) {
if (!existsSync(inc.path)) {
const range = calcRange(inc.lineNumTopLevel, incStack[0])
// TODO this needs to be aggregated and passed to the lint function, else theyre overwritten
connection.sendDiagnostics({uri: 'file://' + inc.parent, diagnostics: [{
severity: DiagnosticSeverity.Error,
range,
message: `${inc.path} is missing.`,
source: 'mc-glsl'
}]})
diagnostics.set(
inc.parent,
[
...(diagnostics.get(inc.parent) || []),
{
severity: DiagnosticSeverity.Error,
range,
message: `${inc.path.replace(conf.shaderpacksPath, '')} is missing.`,
source: 'mc-glsl'
}
]
)
lines[inc.lineNumTopLevel] = ''
return
}
@ -178,7 +185,7 @@ function mergeInclude(inc: IncludeObj, lines: string[], incStack: string[]) {
lines.splice(inc.lineNumTopLevel + 1 + dataLines.length, 0, `#line ${inc.lineNum} "${inc.parent}"`)
}
function lint(uri: string, lines: string[], includes: Map<string, IncludeObj>) {
function lint(uri: string, lines: string[], includes: Map<string, IncludeObj>, diagnostics: Map<string, Diagnostic[]>) {
console.log(lines.join('\n'))
//return
let out: string = ''
@ -188,8 +195,10 @@ function lint(uri: string, lines: string[], includes: Map<string, IncludeObj>) {
out = e.stdout.toString()
}
const diagnostics = new Map([[uri, Array<Diagnostic>()]])
includes.forEach(obj => diagnostics.set(obj.path, []))
if (!diagnostics.has(uri)) diagnostics.set(uri, [])
includes.forEach(obj => {
if (!diagnostics.has(obj.path)) diagnostics.set(obj.path, [])
})
filterMatches(out).forEach((match) => {
const [whole, type, file, line, msg] = match

1
server/src/server.ts
View file

@ -34,6 +34,7 @@ documents.onDidOpen((event) => onEvent(event.document))
documents.onDidSave((event) => onEvent(event.document))
// dont do this for include files, for non-include files, clear diags for all its includes. Cache this maybe
documents.onDidClose((event) => connection.sendDiagnostics({uri: event.document.uri, diagnostics: []}))
//documents.onDidChangeContent(onEvent)