Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import * as vscode from 'vscode';
import { Position, ResponseError } from 'vscode-languageclient';
import * as nls from 'vscode-nls';
import { getVSCodeLanguageModel } from '../../common';
import { modelSelector } from '../../constants';
import * as telemetry from '../../telemetry';
import { DefaultClient, GetCopilotHoverInfoParams, GetCopilotHoverInfoRequest, GetCopilotHoverInfoResult } from '../client';
Expand Down Expand Up @@ -42,7 +43,7 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
}

// Ensure the user has access to Copilot.
const vscodelm = (vscode as any).lm;
const vscodelm = getVSCodeLanguageModel();
if (vscodelm) {
const [model] = await vscodelm.selectChatModels(modelSelector);
if (!model) {
Expand Down
4 changes: 2 additions & 2 deletions Extension/src/LanguageServer/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1413,8 +1413,7 @@ export async function preReleaseCheck(): Promise<void> {
async function onCopilotHover(): Promise<void> {
telemetry.logLanguageServerEvent("CopilotHover");

// Check if the user has access to vscode language model.
const vscodelm = (vscode as any).lm;
const vscodelm = util.getVSCodeLanguageModel();
if (!vscodelm) {
return;
}
Expand Down Expand Up @@ -1477,6 +1476,7 @@ async function onCopilotHover(): Promise<void> {

let chatResponse: vscode.LanguageModelChatResponse | undefined;
try {
// Select the chat model.
const [model] = await vscodelm.selectChatModels(modelSelector);

chatResponse = await model.sendRequest(
Expand Down
13 changes: 13 additions & 0 deletions Extension/src/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1828,3 +1828,16 @@ export function equals(array1: string[] | undefined, array2: string[] | undefine
}
return true;
}

export function getVSCodeLanguageModel(): any | undefined {
// Check if the user has access to vscode language model.
const vscodelm = (vscode as any).lm;
if (!vscodelm) {
return undefined;
}
// Check that vscodelm has a method called 'selectChatModels'
if (!vscodelm.selectChatModels || typeof vscodelm.selectChatModels !== 'function') {
return undefined;
}
return vscodelm;
}