Skip to content

feat: Update vscode-languageclient #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 21, 2025
Merged
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
6 changes: 6 additions & 0 deletions .vscode-test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { defineConfig } from '@vscode/test-cli';

export default defineConfig({
files: 'out/test/**/*.test.js',
workspaceFolder: 'src/test'
});
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## [unreleased]

- Update vscode-languageclient to support debugger inline values

## [1.6.0] - 2024-12-05

- Bundle phpactor 2024.11.28.1
Expand Down
1,050 changes: 989 additions & 61 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"eslint": "eslint \"src/**/*.ts\"",
"prettier": "prettier \"**/{*.json,*.yml,.*.yml,*.ts,.prettierrc,*.md}\" --write --list-different",
"prettier-check": "npm run prettier -- --write=false",
"test": "node ./out/test/runTests.js"
"test": "vscode-test"
},
"activationEvents": [
"onLanguage:php",
Expand Down Expand Up @@ -141,6 +141,7 @@
"@types/vscode": "^1.61.0",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"@vscode/test-cli": "^0.0.10",
"@vscode/test-electron": "^2.1.3",
"@vscode/vsce": "^3.0.0",
"eslint": "^8.51.0",
Expand All @@ -157,7 +158,7 @@
"typescript": "^5.0.0"
},
"dependencies": {
"vscode-languageclient": "^6.1.3"
"vscode-languageclient": "^9.0"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions src/extension.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LanguageClient, ServerOptions, LanguageClientOptions, StreamInfo } from 'vscode-languageclient'
import { LanguageClient, ServerOptions, LanguageClientOptions, StreamInfo } from 'vscode-languageclient/node'
import { EvaluatableExpressionRequest } from './protocol'

import * as vscode from 'vscode'
Expand All @@ -23,7 +23,7 @@ interface PhpactorConfig {
launchServerArgs: string[]
}

export function activate(context: vscode.ExtensionContext): void {
export async function activate(context: vscode.ExtensionContext): Promise<void> {
if (!checkPlatform()) {
return
}
Expand All @@ -50,7 +50,7 @@ export function activate(context: vscode.ExtensionContext): void {
if (enable === false) return

languageClient = createClient(config)
languageClient.start()
await languageClient.start()

context.subscriptions.push(
vscode.languages.registerEvaluatableExpressionProvider('php', {
Expand Down
2 changes: 1 addition & 1 deletion src/protocol.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* eslint @typescript-eslint/no-namespace: 0 */
import { Range } from 'vscode'
// import { Range } from 'vscode-languageserver-types'
import { ProtocolRequestType } from 'vscode-languageserver-protocol/lib/messages'
import { ProtocolRequestType } from 'vscode-languageserver-protocol/lib/common/messages'
import {
TextDocumentPositionParams,
TextDocumentRegistrationOptions,
Expand Down
25 changes: 0 additions & 25 deletions src/test/runTests.ts

This file was deleted.

33 changes: 0 additions & 33 deletions src/test/suite/index.ts

This file was deleted.