Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge multiple compile_commands.json files #12911

Closed
wants to merge 14 commits into from
Prev Previous commit
Next Next commit
Merge branch 'main' into mergeCompileCommands
yiftahw committed Oct 23, 2024
commit 631b15f57ee2f31d6804eabab8cf32db1c9da13d
6 changes: 2 additions & 4 deletions Extension/src/LanguageServer/lmTool.ts
Original file line number Diff line number Diff line change
@@ -43,13 +43,11 @@ const knownValues: { [Property in keyof ChatContextResult]?: { [id: string]: str
'macos': 'macOS'
}
};
// todo revert changes before pull request

export class CppConfigurationLanguageModelTool implements vscode.LanguageModelTool<void> {
public async invoke(options: vscode.LanguageModelToolInvocationOptions<void>, token: vscode.CancellationToken): Promise<vscode.LanguageModelToolResult> {
const result: vscode.LanguageModelToolResult = { "content": [] };
result.content.push(await this.getContext(token));
return result;
return new vscode.LanguageModelToolResult([
new vscode.LanguageModelTextPart(await this.getContext(token))]);
}

private async getContext(token: vscode.CancellationToken): Promise<string> {
You are viewing a condensed version of this merge commit. You can view the full changes here.