From e488f131572dd7b956efff97fc3e374e9895e1d3 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Wed, 15 Jan 2025 16:47:41 -0800 Subject: [PATCH 1/2] Stop sending err.message. --- Extension/src/LanguageServer/extension.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index 642831c25..f01d3b56b 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -1455,7 +1455,7 @@ async function onCopilotHover(): Promise { } catch (err) { if (err instanceof vscode.LanguageModelError) { console.log(err.message, err.code, err.cause); - await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.message); + await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.code); } else { throw err; } @@ -1475,9 +1475,11 @@ async function onCopilotHover(): Promise { content += fragment; } } catch (err) { - if (err instanceof Error) { - console.log(err.message, err.cause); - await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.message); + if (err instanceof vscode.LanguageModelError) { + console.log(err.message, err.code, err.cause); + await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.code); + } else { + throw err; } return; } From aa4917e93df6fa16e45a26390864584e0bf5c0b8 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Wed, 15 Jan 2025 17:00:15 -0800 Subject: [PATCH 2/2] Handle any potential Error case. --- Extension/src/LanguageServer/extension.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index f01d3b56b..5cd0e2af1 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -1478,8 +1478,9 @@ async function onCopilotHover(): Promise { if (err instanceof vscode.LanguageModelError) { console.log(err.message, err.code, err.cause); await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.code); - } else { - throw err; + } else if (err instanceof Error) { + console.log(err.message, err.cause); + await reportCopilotFailure(copilotHoverProvider, hoverDocument, hoverPosition, err.name); } return; }