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

Missing imports throws error WIP

Browse source
This commit is contained in:
Noah Santschi-Cooney 2018-07-17 18:13:03 +01:00
parent a4380969b7
commit 6837bea05d
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/src/linter.ts
View file

@ -2,7 +2,7 @@ import { TextDocument, Diagnostic, DiagnosticSeverity, Range } from 'vscode-lang
import { connection, documents } from './server'
import { execSync } from 'child_process'
import * as path from 'path'
import { readFileSync } from 'fs'
import { readFileSync, existsSync } from 'fs'
import { conf } from './config'
const reDiag = /^(ERROR|WARNING): ([^?<>:*|"]+?):(\d+): (?:'.*?' : )?(.+)$/
@ -103,11 +103,23 @@ function processIncludes(lines: string[], incStack: string[]) {
function mergeInclude(inc: IncludeObj, lines: string[], incStack: string[]) {
const incPath = absPath(inc.parent, inc.match[1])
console.log(incPath)
if (!incPath) return false
if (!existsSync(incPath)) {
const range = calcRange(inc.lineNumParent, 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: `${incPath} is missing.`,
source: 'mc-glsl'
}]})
lines[inc.lineNumParent] = ''
return
}
const dataLines = readFileSync(incPath).toString().split('\n')
incStack.push(incPath)
// TODO deal with the fact that includes may not be the sole text on a line
// add #line indicating we are entering a new include block
lines[inc.lineNumParent] = `#line 0 "${incPath}"`
// merge the lines of the file into the current document
@ -116,8 +128,6 @@ function mergeInclude(inc: IncludeObj, lines: string[], incStack: string[]) {
lines.splice(inc.lineNumParent + 1 + dataLines.length, 0, `#line ${inc.lineNum} "${inc.parent}"`)
}
export const formatURI = (uri: string) => uri.replace(/^file:\/\//, '')
// TODO no
export function getIncludes(uri: string, lines: string[]) {
const out: IncludeObj[] = []
@ -160,6 +170,8 @@ export function getIncludes(uri: string, lines: string[]) {
return out
}
export const formatURI = (uri: string) => uri.replace(/^file:\/\//, '')
export function isInComment(line: string, state: Comment): Comment {
const indexOf = line.indexOf('#include')
if (indexOf > -1 && line.indexOf('//') < indexOf) {

6
server/src/server.ts
View file

@ -17,8 +17,8 @@ import { Config, onConfigChange } from './config'
export const documents = new vsclang.TextDocuments()
documents.listen(connection)
connection.onInitialize((params): vsclang.InitializeResult => {
return {
connection.onInitialize((params): vsclang.InitializeResult => (
{
capabilities: {
textDocumentSync: documents.syncKind,
completionProvider: {
@ -26,7 +26,7 @@ connection.onInitialize((params): vsclang.InitializeResult => {
},
}
}
})
))
connection.onExit(() => {})