Merge branch 'master' into fix-hide-lsp-popup

Author: zobo

.vscode-test.mjs

@@ -0,0 +1,6 @@
+import { defineConfig } from '@vscode/test-cli';
+
+export default defineConfig({
+	files: 'out/test/**/*.test.js',
+	workspaceFolder: 'src/test'
+}); 

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [unreleased]
 
+- Update vscode-languageclient to support debugger inline values
 - Do not popup warning dialog on LSP errors
 
 ## [1.6.0] - 2024-12-05

package-lock.json

@@ -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",
@@ -141,10 +141,11 @@
         "@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",
-        "eslint-config-prettier": "^9.0.0",
+        "eslint-config-prettier": "^10.0.0",
         "eslint-plugin-jsdoc": "^50.0.0",
         "glob": "^11.0.0",
         "mocha": "^11.0.0",
@@ -157,7 +158,7 @@
         "typescript": "^5.0.0"
     },
     "dependencies": {
-        "vscode-languageclient": "^6.1.3"
+        "vscode-languageclient": "^9.0"
     },
     "repository": {
         "type": "git",

package.json

@@ -4,9 +4,11 @@ import {
     LanguageClientOptions,
     StreamInfo,
     RevealOutputChannelOn,
-} from 'vscode-languageclient'
+} from 'vscode-languageclient/node'
 import { EvaluatableExpressionRequest } from './protocol'
 
+import { spawn } from 'child_process'
+
 import * as vscode from 'vscode'
 import { join } from 'path'
 import * as net from 'net'
@@ -29,7 +31,7 @@ interface PhpactorConfig {
     launchServerArgs: string[]
 }
 
-export function activate(context: vscode.ExtensionContext): void {
+export async function activate(context: vscode.ExtensionContext): Promise<void> {
     if (!checkPlatform()) {
         return
     }
@@ -56,7 +58,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', {
@@ -98,7 +100,10 @@ function checkPlatform(): boolean {
 
 function getServerOptions(config: PhpactorConfig): ServerOptions {
     let serverOptions
-    if (!config.remote.enabled) {
+    if (!config.remote.enabled && process.platform === 'win32') {
+        // PHP on windows has problems with STDIO so we need special handling
+        serverOptions = getWindowsServerOptions(config)
+    } else if (!config.remote.enabled) {
         // launch language server via stdio
         serverOptions = <ServerOptions>{
             run: {
@@ -139,6 +144,71 @@ function getServerOptions(config: PhpactorConfig): ServerOptions {
     return serverOptions
 }
 
+function getWindowsServerOptions(config: PhpactorConfig): ServerOptions {
+    // Find a free port, start PHPActor and connect to it
+    const serverOptions = async () => {
+        const findPort = new Promise<number>(resolve => {
+            const server = net.createServer()
+            server.listen(0, '127.0.0.1', () => {
+                const freePort = (server.address()! as net.AddressInfo).port
+                server.close()
+                resolve(freePort)
+            })
+        })
+
+        const freePort = await findPort
+
+        const startServer = new Promise<void>((resolve, reject) => {
+            const childProcess = spawn(
+                config.executablePath,
+                [config.path, 'language-server', `--address=127.0.0.1:${freePort}`, ...config.launchServerArgs],
+
+                {
+                    env: {
+                        ...process.env,
+                        XDEBUG_MODE: 'debug',
+                        PHPACTOR_ALLOW_XDEBUG: '1',
+                    },
+                }
+            )
+
+            childProcess.stderr.on('data', (chunk: Buffer) => {
+                const str = chunk.toString()
+                languageClient.outputChannel.appendLine(str)
+
+                // when we get the first line, the server is running
+                resolve()
+            })
+            childProcess.on('exit', (code, signal) => {
+                languageClient.outputChannel.appendLine(
+                    `Language server exited ` + (signal ? `from signal ${signal}` : `with exit code ${code}`)
+                )
+                if (code !== 0) {
+                    languageClient.outputChannel.show()
+                }
+
+                reject(new Error('Language Server exited'))
+            })
+        })
+
+        await startServer
+
+        const socket = net.connect({
+            host: '127.0.0.1',
+            port: freePort,
+        })
+
+        const result = <StreamInfo>{
+            writer: socket,
+            reader: socket,
+        }
+
+        return result
+    }
+
+    return serverOptions
+}
+
 function createClient(config: PhpactorConfig): LanguageClient {
     const serverOptions = getServerOptions(config)
 

src/extension.ts

@@ -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,