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

Added proper line terminator to regex, return string for abs path on failure and -1 for lineNum for windows in another placec

Browse source
This commit is contained in:
Noah Santschi-Cooney 2018-07-23 22:00:09 +01:00
parent 1cec184e04
commit b5c47e827a
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server/src/linter.ts
View file

@ -9,7 +9,7 @@ import { platform } from 'os'
const reDiag = /^(ERROR|WARNING): ([^?<>:*|"]+?):(\d+): (?:'.*?' : )?(.+)[\r\n|\n]/
const reVersion = /#version [\d]{3}/
const reInclude = /^(?:\s)*?(?:#include) "((?:\/?[^?<>:*|"]+?)+?\.(?:[a-zA-Z]+?))"$/
const reInclude = /^(?:\s)*?(?:#include) "((?:\/?[^?<>:*|"]+?)+?\.(?:[a-zA-Z]+?))"[\r\n|\n]/
const reIncludeExt = /#extension GL_GOOGLE_include_directive ?: ?require/
const include = '#extension GL_GOOGLE_include_directive : require'
const win = platform() === 'win32'
@ -161,7 +161,7 @@ export function getIncludes(uri: string, lines: string[]) {
function mergeInclude(inc: IncludeObj, lines: string[], incStack: string[], diagnostics: Map<string, Diagnostic[]>) {
if (!existsSync(inc.path)) {
const range = calcRange(inc.lineNumTopLevel, incStack[0])
const range = calcRange(inc.lineNumTopLevel - (win ? 1 : 0), incStack[0])
diagnostics.set(
inc.parent,
[
@ -271,9 +271,10 @@ function calcRange(lineNum: number, uri: string): Range {
export const formatURI = (uri: string) => uri.replace(/^file:\/\//, '')
export function absPath(currFile: string, includeFile: string): string {
console.log(currFile)
if (!currFile.startsWith(conf.shaderpacksPath) || conf.shaderpacksPath === '') {
connection.window.showErrorMessage(`Shaderpacks path may not be correct. Current file is in '${currFile}' but the path is set to '${conf.shaderpacksPath}'`)
return
return ''
}
// TODO add explanation comment