Skip to content

Commit 30bd0dd

Browse files
committed
v0.9.2
1 parent bbcfe00 commit 30bd0dd

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

client/src/extension.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,34 @@ export class Extension {
8383
if (!exists) await this.state.updateServerVersion(undefined)
8484

8585
const release = await getReleaseInfo(this.package.version)
86+
log.info(`got release info from Github:\n\t`, JSON.stringify(release))
8687

8788
const platform = platforms[`${process.arch} ${process.platform}`]
8889
if (platform === undefined) {
8990
vscode.window.showErrorMessage('Unfortunately we don\'t ship binaries for your platform yet.')
91+
log.warn(`incompatible architecture/platform:\n\t${process.arch} ${process.platform}`)
9092
return
9193
}
9294

93-
if (release.tag_name === this.state.serverVersion) return
95+
if (release.tag_name === this.state.serverVersion) {
96+
log.info(`server version is same as extension:\n\t`, this.state.serverVersion)
97+
return
98+
}
9499

95100
const artifact = release.assets.find(artifact => artifact.name === `mcshader-lsp-${platform}${(process.platform === 'win32' ? '.exe' : '')}`)
96101

102+
log.info(`artifact with url ${artifact.browser_download_url} found`)
103+
97104
const userResponse = await vscode.window.showInformationMessage(
98105
this.state.serverVersion == undefined ?
99106
`Language server version ${this.package.version} is not installed.` :
100107
`An update is available. Upgrade from ${this.state.serverVersion} to ${release.tag_name}?`,
101108
'Download now'
102109
)
103-
if (userResponse !== 'Download now') return
110+
if (userResponse !== 'Download now') {
111+
log.info('user chose not to download server...')
112+
return
113+
}
104114

105115
await download(artifact.browser_download_url, dest)
106116

client/src/net.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export async function getReleaseInfo(releaseTag: string): Promise<GithubRelease>
2929

3030
const json = await response.json()
3131
if(!isRelease(json)) {
32-
throw new TypeError('Received malformed request from Github Release API')
32+
throw new TypeError('Received malformed request from Github Release API ' + JSON.stringify(json))
3333
}
3434
return json
3535
}
@@ -72,7 +72,7 @@ async function downloadFile(
7272

7373
const totalBytes = Number(res.headers.get('content-length'))
7474

75-
log.debug('downloading file of', totalBytes, 'bytes size from', url, 'to', destFilePath)
75+
log.debug('downloading file with', totalBytes, 'bytes size from', url, 'to', destFilePath)
7676

7777
let readBytes = 0
7878
res.body.on('data', (chunk: Buffer) => {

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-mc-shader",
33
"displayName": "Minecraft GLSL Shaders",
44
"description": "A Visual Studio Code extension for linting/etc Minecraft GLSL Shaders",
5-
"version": "0.9.1",
5+
"version": "0.9.2",
66
"publisher": "Strum355",
77
"author": "Noah Santschi-Cooney (Strum355)",
88
"license": "MIT",
@@ -19,9 +19,7 @@
1919
],
2020
"activationEvents": [
2121
"onLanguage:glsl",
22-
"workspaceContains:**/*.fsh",
23-
"workspaceContains:**/*.vsh",
24-
"workspaceContains:**/*.gsh"
22+
"workspaceContains:shaders/"
2523
],
2624
"extensionDependencies": [
2725
"slevesque.shader"

server/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mcshader-lsp"
3-
version = "0.1.0"
3+
version = "0.9.2"
44
authors = ["Noah Santschi-Cooney <noah@santschi-cooney.ch>"]
55
edition = "2018"
66

0 commit comments

Comments
 (0)