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

Some TODOs

Browse source
This commit is contained in:
Noah Santschi-Cooney 2018-06-24 20:54:14 +01:00
parent 17d84bad6b
commit f93c26a59d
No known key found for this signature in database
GPG key ID: 3B22282472C8AE48
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
server/src/linter.ts
View file

@ -59,6 +59,7 @@ export function preprocess(document: TextDocument, topLevel: boolean, incStack:
let inComment = false let inComment = false
for (let i = 0; i < lines.length; i++) { for (let i = 0; i < lines.length; i++) {
const line = lines[i] const line = lines[i]
//TODO something better than this
if (line.includes('/*')) inComment = true if (line.includes('/*')) inComment = true
if (line.includes('*/')) inComment = false if (line.includes('*/')) inComment = false
if (line.trim().startsWith('//')) continue if (line.trim().startsWith('//')) continue
@ -86,11 +87,12 @@ export function preprocess(document: TextDocument, topLevel: boolean, incStack:
}) })
} }
console.log(lines.join('\n')) console.log(lines.join('\n'))
lint(docURI, lines.join('\n'), includes) lint(docURI, lines, includes)
} }
const formatURI = (uri: string) => uri.replace(/^file:\/\//, '') const formatURI = (uri: string) => uri.replace(/^file:\/\//, '')
//TODO not include in comments
const getIncludes = (lines: string[]) => lines const getIncludes = (lines: string[]) => lines
.map((line, i) => ({num: i, line})) .map((line, i) => ({num: i, line}))
.filter((obj) => reInclude.test(obj.line)) .filter((obj) => reInclude.test(obj.line))
@ -111,16 +113,17 @@ function absPath(currFile: string, includeFile: string): string {
} }
} }
function lint(uri: string, text: string, includes: {lineNum: number, match: RegExpMatchArray}[]) { 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 child = exec(`${conf.glslangPath} --stdin -S ${ext[path.extname(uri)]}`, (error, out) => {
const diagnostics: {[uri: string]: Diagnostic[]} = {} const diagnostics: {[uri: string]: Diagnostic[]} = {}
diagnostics[uri] = [] diagnostics[uri] = []
includes.forEach(obj => { includes.forEach(obj => {
diagnostics[absPath(uri, obj.match[1])] = [] diagnostics[absPath(uri, obj.match[1])] = []
}) })
const matches = filterMatches(out) as RegExpMatchArray[] const matches = filterMatches(out) as RegExpMatchArray[]
matches.forEach((match) => { matches.forEach((match) => {
const [type, file, line, msg] = match.slice(1) const [whole, type, file, line, msg] = match
const diag = { const diag = {
severity: type === 'ERROR' ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning, severity: type === 'ERROR' ? DiagnosticSeverity.Error : DiagnosticSeverity.Warning,
range: calcRange(parseInt(line) - 1, uri), range: calcRange(parseInt(line) - 1, uri),
@ -129,11 +132,12 @@ function lint(uri: string, text: string, includes: {lineNum: number, match: RegE
} }
diagnostics[file].push(diag) diagnostics[file].push(diag)
}) })
daigsArray(diagnostics).forEach((d) => { daigsArray(diagnostics).forEach((d) => {
connection.sendDiagnostics({uri: 'file://' + d.uri, diagnostics: d.diag}) connection.sendDiagnostics({uri: 'file://' + d.uri, diagnostics: d.diag})
}) })
}) })
child.stdin.write(text) lines.forEach(line => child.stdin.write(line))
child.stdin.end() child.stdin.end()
} }
@ -145,7 +149,7 @@ const filterMatches = (output: string) => output
.map(s => s.match(reDiag)) .map(s => s.match(reDiag))
.filter(match => match && match.length === 5) .filter(match => match && match.length === 5)
const replaceWord = (msg: string) => { function replaceWord(msg: string) {
for (const token of Object.keys(tokens)) { for (const token of Object.keys(tokens)) {
if (msg.includes(token)) { if (msg.includes(token)) {
msg = msg.replace(token, tokens[token]) msg = msg.replace(token, tokens[token])
@ -155,7 +159,6 @@ const replaceWord = (msg: string) => {
} }
function calcRange(lineNum: number, uri: string): Range { function calcRange(lineNum: number, uri: string): Range {
//TODO lineNum needs to be subtracted based off includes
const lines = documents.get('file://' + uri).getText().split('\n') const lines = documents.get('file://' + uri).getText().split('\n')
const line = lines[lineNum] const line = lines[lineNum]
const startOfLine = line.length - line.leftTrim().length const startOfLine = line.length - line.leftTrim().length