Fix: Middlewares also expect null regions

savoirfairelinux · Nov 14, 2023 · c8712c7 · c8712c7
1 parent 1ce27a2
commit c8712c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/client/src/language/middlewareCompletion.ts b/client/src/language/middlewareCompletion.ts
@@ -11,7 +11,7 @@ import { getEmbeddedLanguageDocPosition } from './utils'
 
 export const middlewareProvideCompletion: CompletionMiddleware['provideCompletionItem'] = async (document, position, context, token, next) => {
   const embeddedLanguageDocInfos = await requestsManager.getEmbeddedLanguageDocInfos(document.uri.toString(), position)
-  if (embeddedLanguageDocInfos === undefined) {
+  if (embeddedLanguageDocInfos === undefined || embeddedLanguageDocInfos === null) {
     return await next(document, position, context, token)
   }
   const adjustedPosition = await getEmbeddedLanguageDocPosition(document, embeddedLanguageDocInfos, position)

diff --git a/client/src/language/middlewareHover.ts b/client/src/language/middlewareHover.ts
@@ -11,7 +11,7 @@ import { getEmbeddedLanguageDocPosition } from './utils'
 
 export const middlewareProvideHover: HoverMiddleware['provideHover'] = async (document, position, token, next) => {
   const embeddedLanguageDocInfos = await requestsManager.getEmbeddedLanguageDocInfos(document.uri.toString(), position)
-  if (embeddedLanguageDocInfos === undefined) {
+  if (embeddedLanguageDocInfos === undefined || embeddedLanguageDocInfos === null) {
     return await next(document, position, token)
   }
   const adjustedPosition = await getEmbeddedLanguageDocPosition(document, embeddedLanguageDocInfos, position)

diff --git a/client/src/lib/src/types/requests.ts b/client/src/lib/src/types/requests.ts
@@ -19,7 +19,7 @@ export interface RequestParams {
 }
 
 export interface RequestResult {
-  [RequestType.EmbeddedLanguageDocInfos]: Promise<EmbeddedLanguageDocInfos | undefined>
+  [RequestType.EmbeddedLanguageDocInfos]: Promise<EmbeddedLanguageDocInfos | undefined | null> // for unknown reasons, the client receives null instead of undefined
 }
 
 interface RequestEmbeddedLanguageDocInfosParams {