Merge pull request #64 from CodinGame/fix-php-serenata

Fix php serenata

Author: CGNonofr

src/createLanguageClient.ts

@@ -1,5 +1,4 @@
 import { MessageReader, MessageWriter, Message, Event, DataCallback, Disposable, PartialMessageInfo } from 'vscode-jsonrpc'
-import { Uri } from 'monaco-editor'
 import {
   MonacoLanguageClient, Middleware, ErrorHandler, IConnectionProvider, MessageTransports
 } from 'monaco-languageclient'
@@ -106,11 +105,10 @@ function hackTransports (transports: MessageTransports): MessageTransports {
       if (Message.isRequest(message) && message.method === InitializeRequest.type.method) {
         const params = message.params as InitializeParams
         // Hack to fix url converted from /toto/tata to \\toto\tata in windows
-        const rootPath = params.rootPath?.replace(/\\/g, '/')
         const fixedParams: InitializeParams = {
           ...params,
-          rootPath,
-          rootUri: rootPath != null ? Uri.from({ scheme: 'file', path: rootPath }).toString() : null
+          rootPath: params.rootPath?.replace(/\\/g, '/'),
+          rootUri: params.rootUri?.replace(/\\/g, '/') ?? null
         }
         return {
           ...message,

src/extensions/cobol.ts

@@ -13,7 +13,7 @@ export class CobolResolveSubroutineFeature extends ExtensionFeature {
   activate (context: vscode.ExtensionContext, capabilities: ServerCapabilities, documentSelector: DocumentSelector): void {
     context.subscriptions.push(this.languageClient.onRequest(ResolveCobolSubroutineRequestType, (routineName: string): string | undefined => {
       const constantRoutinePaths: Partial<Record<string, string>> = {
-        'assert-equals': `file:${vscode.workspace.rootPath ?? '/tmp/project'}/deps/assert-equals.cbl`
+        'assert-equals': `file:${vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '/tmp/project'}/deps/assert-equals.cbl`
       }
       const contantRoutinePath = constantRoutinePaths[routineName.toLowerCase()]
       if (contantRoutinePath != null) {

src/staticOptions.ts

@@ -1,5 +1,4 @@
 import * as vscode from 'vscode'
-import * as monaco from 'monaco-editor'
 import { Middleware } from 'monaco-languageclient'
 import type { LanguageClientOptions } from './languageClientOptions'
 
@@ -256,9 +255,7 @@ const staticOptions = asLanguageClientOptionsById({
     },
     initializationOptions: () => ({
       configuration: {
-        uris: [
-          monaco.Uri.file(vscode.workspace.rootPath!).toString()
-        ],
+        uris: vscode.workspace.workspaceFolders?.map(folder => folder.uri.toString()),
         phpVersion: 7.3,
         fileExtensions: [
           'php'