Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions src/cli/app-version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,30 @@ import { fileURLToPath } from 'node:url'
import pathe from 'pathe'
import { Constants } from '../constants'

export function appVersion(options?: { name?: string; withAVMVersion?: boolean }): string {
export function packageVersion(): string {
let dirName = pathe.dirname(fileURLToPath(import.meta.url))
const name = options?.name ?? 'puya-ts'
const withAVMVersion = options?.withAVMVersion ?? true

while (true) {
const packageJsonPath = pathe.join(dirName, 'package.json')
if (fs.existsSync(packageJsonPath)) {
const version = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')).version
return [`${name} ${version}`]
.concat(
withAVMVersion
? ['', 'Targets:', `puya ${Constants.targetedPuyaVersion}`, `AVM ${Constants.supportedAvmVersions.join(', ')}`]
: [`puya ${Constants.targetedPuyaVersion}`],
)
.join('\r\n')
return JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')).version
}
if (dirName === pathe.dirname(dirName)) break
dirName = pathe.dirname(dirName)
}
return `Cannot determine puya-ts version`
return 'unknown'
}

export function appVersion(options?: { name?: string; withAVMVersion?: boolean }): string {
const name = options?.name ?? 'puya-ts'
const withAVMVersion = options?.withAVMVersion ?? true

const version = packageVersion()
return [`${name} ${version}`]
.concat(
withAVMVersion
? ['', 'Targets:', `puya ${Constants.targetedPuyaVersion}`, `AVM ${Constants.supportedAvmVersions.join(', ')}`]
: [`puya ${Constants.targetedPuyaVersion}`],
)
.join('\n')
}
8 changes: 7 additions & 1 deletion src/language-server/puya-language-server.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TextDocument } from 'vscode-languageserver-textdocument'
import * as lsp from 'vscode-languageserver/node'
import { appVersion } from '../cli/app-version'
import { appVersion, packageVersion } from '../cli/app-version'
import { Constants } from '../constants'
import { logger, LogLevel } from '../logger'
import { LanguageServerLogSink } from '../logger/sinks/language-server-log-sink'
Expand Down Expand Up @@ -40,6 +40,8 @@ export type LanguageServerOptions = {
customPuyaPath?: string
}

const PACKAGE_VERSION = packageVersion()

export class PuyaLanguageServer {
readonly documents = new lsp.TextDocuments(TextDocument)
readonly triggers = new CompileTriggerQueue()
Expand Down Expand Up @@ -85,6 +87,10 @@ export class PuyaLanguageServer {
workspaces: this.workspaceFolders,
})
return {
serverInfo: {
name: 'Puya-TS Language Server',
version: PACKAGE_VERSION,
},
capabilities: {
textDocumentSync: lsp.TextDocumentSyncKind.Incremental,
codeActionProvider: {
Expand Down