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

Updated some types

Browse source
This commit is contained in:
Noah Santschi-Cooney 2019-04-21 16:27:05 +01:00
parent d198e5fdd0
commit 3ac2a6b479
No known key found for this signature in database
GPG key ID: 3B22282472C8AE48
5 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
server/package-lock.json generated
View file

@ -137,32 +137,32 @@
"integrity": "sha512-T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA=="
},
"vscode-languageserver": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.4.0.tgz",
"integrity": "sha512-NO4JQg286YLSdU11Fko6cke19kwSob3O0bhf6xDxIJuDhUbFy0VEPRB5ITc3riVmp13+Ki344xtqJYmqfcmCrg==",
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.4.2.tgz",
"integrity": "sha512-61y8Raevi9EigDgg9NelvT9cUAohiEbUl1LOwQQgOCAaNX62yKny/ddi0uC+FUTm4CzsjhBu+06R+vYgfCYReA==",
"requires": {
"vscode-languageserver-protocol": "^3.10.0",
"vscode-uri": "^1.0.3"
"vscode-languageserver-protocol": "^3.10.3",
"vscode-uri": "^1.0.5"
}
},
"vscode-languageserver-protocol": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.10.0.tgz",
"integrity": "sha512-PNNmKM0IcQPRiY1oUIxfwseBvxS5Sa5aZUpTcq/qsXWclnl8FFNs8oCCoAtyLhBXnuJvybWUNafiA78y0unJDA==",
"version": "3.12.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz",
"integrity": "sha512-evY6hmyzLnwQrqlQWPrNBq1z8wrSNjLesmgPzeS6Zv11mVS5UJRel26hbM/DH5tHdn45huNzRW0eFHRmIm8LpA==",
"requires": {
"vscode-jsonrpc": "^3.6.2",
"vscode-languageserver-types": "^3.10.0"
"vscode-languageserver-types": "^3.12.0"
}
},
"vscode-languageserver-types": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.10.0.tgz",
"integrity": "sha512-vxmCsVZGwq8X40SuLP8Ix7V0rq5V/7iQUjRVe2Oxm+TbmjxtjK4dpHHXQCUawjA4fhPA9FwjSRbDhbvQmYCfMw=="
"version": "3.12.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz",
"integrity": "sha512-UxqnpzBToPO7Mi2tr/s5JeyPOSKSJtLB8lIdxCg9ZNdvP2cU8wS7iTDtwQKz91Ne4CUmTdf85ddR5SIZKXmMjQ=="
},
"vscode-uri": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.5.tgz",
"integrity": "sha1-O4majvccN/MFTXm9vdoxx7828g0="
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.6.tgz",
"integrity": "sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww=="
}
}
}

2
server/package.json
View file

@ -16,7 +16,7 @@
"node-fetch": "^2.2.0",
"typescript-logging": "^0.6.2",
"unzip-stream": "^0.3.0",
"vscode-languageserver": "^4.4.0"
"vscode-languageserver": "^4.4.2"
},
"scripts": {
"installServer": "installServerIntoExtension ../client ./package.json ./tsconfig.json",

6
server/src/linter.ts
View file

@ -260,7 +260,7 @@ function mergeInclude(inc: IncludeObj, lines: string[], incStack: string[], diag
}
function lint(docURI: string, lines: string[], diagnostics: Map<string, Diagnostic[]>, hasDirective: boolean) {
//console.log(lines.join('\n'))
console.log(lines.join('\n'))
let out: string = ''
try {
@ -352,7 +352,7 @@ const filterMatches = (output: string) => output
.map(s => s.match(reDiag))
.filter(match => match && match.length === 5)
function calcRange(lineNum: number, uri: string): Range {
function calcRange(lineNum: number, uri: string) {
linterLog.debug(() => `calculating range for ${trimPath(uri)} at L${lineNum + 1}, index ${lineNum}`)
const lines = getDocumentContents(uri).split('\n')
@ -363,7 +363,7 @@ function calcRange(lineNum: number, uri: string): Range {
return Range.create(lineNum, startOfLine, lineNum, endOfLine)
}
function absPath(currFile: string, includeFile: string): string {
function absPath(currFile: string, includeFile: string) {
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 ''