fix: Fix tests

Author: CGNonofr

src/tests/infrastructure.test.ts

@@ -18,7 +18,7 @@ async function initializeLanguageClientAndGetConnection (
   const infrastructure = new TestInfrastructure(automaticTextDocumentUpdate, useMutualizedProxy)
 
   const languageClient = createLanguageClientManager(languageClientId, infrastructure)
-  await languageClient.start()
+  const startPromise = languageClient.start()
 
   const connection = await infrastructure.getConnection()
 
@@ -28,6 +28,8 @@ async function initializeLanguageClientAndGetConnection (
     capabilities
   })
 
+  await startPromise
+
   return [languageClient, connection]
 }
 

src/tests/tools.ts

@@ -1,12 +1,13 @@
 import { Uri } from 'monaco-editor'
-import { AbstractMessageReader, AbstractMessageWriter, createMessageConnection, DataCallback, Disposable, Message, MessageConnection, MessageReader, MessageWriter, NotificationHandler, RequestHandler, ServerCapabilities, TextDocumentSyncKind } from 'vscode-languageserver-protocol'
+import { AbstractMessageReader, AbstractMessageWriter, createMessageConnection, DataCallback, Disposable, Message, MessageReader, MessageWriter, NotificationHandler, RequestHandler } from 'vscode-languageserver-protocol'
 import {
   createConnection,
   WatchDog,
   _Connection,
   _
 } from 'vscode-languageserver/lib/common/api'
 import { monaco } from '@codingame/monaco-editor-wrapper'
+import { MessageTransports } from 'monaco-languageclient'
 import { getFile, updateFile } from '../customRequests'
 import { Infrastructure, LanguageClientId, LanguageClientManager, LanguageClientOptions, TextDocument, TextDocumentSaveReason } from '../'
 
@@ -54,13 +55,6 @@ function createPipedReaderWriter (): [MessageReader, MessageWriter] {
   return [reader, writer]
 }
 
-function createDuplexConnection (): [MessageConnection, MessageConnection] {
-  const [r1, w1] = createPipedReaderWriter()
-  const [r2, w2] = createPipedReaderWriter()
-
-  return [createMessageConnection(r1, w2), createMessageConnection(r2, w1)]
-}
-
 export interface DeferredPromise<ValueType> {
   promise: Promise<ValueType>
   resolve(value?: ValueType | PromiseLike<ValueType>): void
@@ -153,8 +147,11 @@ export class TestInfrastructure implements Infrastructure {
     }
   }
 
-  async openConnection (): Promise<MessageConnection> {
-    const [c1, c2] = createDuplexConnection()
+  async openConnection (): Promise<MessageTransports> {
+    const [r1, w1] = createPipedReaderWriter()
+    const [r2, w2] = createPipedReaderWriter()
+
+    const c2 = createMessageConnection(r2, w1)
 
     const watchDog: WatchDog = {
       shutdownReceived: false,
@@ -165,6 +162,9 @@ export class TestInfrastructure implements Infrastructure {
     this.connectionDeferred.resolve(clientConnection)
     c2.listen()
 
-    return c1
+    return {
+      reader: r1,
+      writer: w2
+    }
   }
 }