Skip to content

Commit abd21b3

Browse files
committed
Fix
1 parent b70b82c commit abd21b3

File tree

2 files changed

+33
-23
lines changed

2 files changed

+33
-23
lines changed

src/lsptoolshost/copilot.ts

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { CopilotRelatedDocumentsReport, CopilotRelatedDocumentsRequest } from '.
99
import { RoslynLanguageServer } from './roslynLanguageServer';
1010
import { UriConverter } from './uriConverter';
1111
import { TextDocumentIdentifier } from 'vscode-languageserver-protocol';
12+
import { languageServerOptions } from '../shared/options';
1213

1314
interface CopilotRelatedFilesProviderRegistration {
1415
registerRelatedFilesProvider(
@@ -19,24 +20,35 @@ interface CopilotRelatedFilesProviderRegistration {
1920

2021
export async function registerCopilotExtensionAsync(
2122
languageServer: RoslynLanguageServer,
22-
tracingChannel: vscode.OutputChannel
23+
channel: vscode.OutputChannel
2324
) {
25+
const isTraceLogLevel =
26+
languageServerOptions.logLevel &&
27+
(languageServerOptions.logLevel === 'Trace' || languageServerOptions.logLevel === 'Debug');
28+
2429
const ext = vscode.extensions.getExtension('github.copilot');
2530
if (!ext) {
26-
tracingChannel.appendLine(
27-
'GitHub Copilot extension not installed. Skip registeration of C# related files provider.'
28-
);
31+
if (isTraceLogLevel) {
32+
channel.appendLine(
33+
'GitHub Copilot extension not installed. Skip registeration of C# related files provider.'
34+
);
35+
}
2936
return;
3037
}
3138
await ext.activate();
3239
const relatedAPI = ext.exports as CopilotRelatedFilesProviderRegistration | undefined;
3340
if (!relatedAPI) {
34-
tracingChannel.appendLine(
35-
'Incompatible GitHub Copilot extension installed. Skip registeration of C# related files provider.'
36-
);
41+
if (isTraceLogLevel) {
42+
channel.appendLine(
43+
'Incompatible GitHub Copilot extension installed. Skip registeration of C# related files provider.'
44+
);
45+
}
3746
return;
3847
}
39-
tracingChannel.appendLine('registeration of C# related files provider for GitHub Copilot extension succeeded.');
48+
49+
if (isTraceLogLevel) {
50+
channel.appendLine('registeration of C# related files provider for GitHub Copilot extension succeeded.');
51+
}
4052

4153
const id = {
4254
extensionId: CSharpExtensionId,
@@ -58,23 +70,21 @@ export async function registerCopilotExtensionAsync(
5870
const relatedFiles: vscode.Uri[] = [];
5971
const uriString = UriConverter.serialize(uri);
6072
const textDocument = TextDocumentIdentifier.create(uriString);
61-
const responsePromise = languageServer.sendRequestWithProgress(
62-
CopilotRelatedDocumentsRequest.type,
63-
{
64-
_vs_textDocument: textDocument,
65-
position: {
66-
line: 0,
67-
character: 0,
68-
},
69-
},
70-
async (r) => buildResult(r, relatedFiles)
71-
);
72-
7373
try {
74-
await responsePromise;
74+
await languageServer.sendRequestWithProgress(
75+
CopilotRelatedDocumentsRequest.type,
76+
{
77+
_vs_textDocument: textDocument,
78+
position: {
79+
line: 0,
80+
character: 0,
81+
},
82+
},
83+
async (r) => buildResult(r, relatedFiles)
84+
);
7585
} catch (e) {
7686
if (e instanceof Error) {
77-
tracingChannel.appendLine(e.message);
87+
channel.appendLine(e.message);
7888
}
7989
}
8090
return { entries: relatedFiles };

src/lsptoolshost/roslynLanguageServer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ export async function activateRoslynLanguageServer(
10371037
);
10381038

10391039
registerLanguageStatusItems(context, languageServer, languageServerEvents);
1040-
await registerCopilotExtensionAsync(languageServer, _traceChannel);
1040+
await registerCopilotExtensionAsync(languageServer, _channel);
10411041

10421042
// Register any commands that need to be handled by the extension.
10431043
registerCommands(context, languageServer, hostExecutableResolver, _channel);

0 commit comments

Comments
 (0)