From 0d147b382f46d9f19145d03295519ca4558858af Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:36:08 +0100
Subject: [PATCH] detect internal error via `error.code` instead of error
 message

---
 editors/code/src/lang_client.ts | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/editors/code/src/lang_client.ts b/editors/code/src/lang_client.ts
index e28330e6db..09d64efc04 100644
--- a/editors/code/src/lang_client.ts
+++ b/editors/code/src/lang_client.ts
@@ -2,15 +2,25 @@ import * as lc from "vscode-languageclient/node";
 import * as vscode from "vscode";
 
 export class RaLanguageClient extends lc.LanguageClient {
-    override error(message: string, data?: any, showNotification?: boolean | "force"): void {
-        // ignore `Request TYPE failed.` errors
+    override handleFailedRequest<T>(
+        type: lc.MessageSignature,
+        token: vscode.CancellationToken | undefined,
+        error: any,
+        defaultValue: T,
+        showNotification?: boolean | undefined,
+    ): T {
         const showError = vscode.workspace
             .getConfiguration("rust-analyzer")
             .get("showRequestFailedErrorNotification");
-        if (!showError && message.startsWith("Request") && message.endsWith("failed.")) {
-            return;
+        if (
+            !showError &&
+            error instanceof lc.ResponseError &&
+            error.code === lc.ErrorCodes.InternalError
+        ) {
+            // Don't show notification for internal errors, these are emitted by r-a when a request fails.
+            showNotification = false;
         }
 
-        super.error(message, data, showNotification);
+        return super.handleFailedRequest(type, token, error, defaultValue, showNotification);
     }
 }