Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
16 changes: 10 additions & 6 deletions packages/amazonq/src/lsp/chat/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import {
insertToCursorPositionNotificationType,
} from '@aws/language-server-runtimes/protocol'
import { v4 as uuidv4 } from 'uuid'
import { window } from 'vscode'
import * as vscode from 'vscode'
import { Disposable, LanguageClient, Position, State, TextDocumentIdentifier } from 'vscode-languageclient'
import * as jose from 'jose'
import { AmazonQChatViewProvider } from './webviewProvider'
import { AuthUtil } from 'aws-core-vscode/codewhisperer'
import { AmazonQPromptSettings } from 'aws-core-vscode/shared'
import { AmazonQPromptSettings, messages } from 'aws-core-vscode/shared'

export function registerLanguageServerEventListener(languageClient: LanguageClient, provider: AmazonQChatViewProvider) {
languageClient.onDidChangeState(({ oldState, newState }) => {
Expand Down Expand Up @@ -62,11 +62,15 @@ export function registerMessageListeners(

switch (message.command) {
case COPY_TO_CLIPBOARD:
// TODO see what we need to hook this up
languageClient.info('[VSCode Client] Copy to clipboard event received')
try {
await messages.copyToClipboard(message.params.code)
} catch (e) {
languageClient.error(`[VSCode Client] Failed to copy to clipboard: ${(e as Error).message}`)
}
break
case INSERT_TO_CURSOR_POSITION: {
const editor = window.activeTextEditor
const editor = vscode.window.activeTextEditor
let textDocument: TextDocumentIdentifier | undefined = undefined
let cursorPosition: Position | undefined = undefined
if (editor) {
Expand Down Expand Up @@ -119,8 +123,8 @@ export function registerMessageListeners(
)

const editor =
window.activeTextEditor ||
window.visibleTextEditors.find((editor) => editor.document.languageId !== 'Log')
vscode.window.activeTextEditor ||
vscode.window.visibleTextEditors.find((editor) => editor.document.languageId !== 'Log')
if (editor) {
message.params.cursorPosition = [editor.selection.active]
message.params.textDocument = { uri: editor.document.uri.toString() }
Expand Down
40 changes: 40 additions & 0 deletions packages/amazonq/test/unit/amazonq/lsp/chat/messages.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/

import * as sinon from 'sinon'
import * as vscode from 'vscode'
import { LanguageClient } from 'vscode-languageclient'
import { AuthUtil } from 'aws-core-vscode/codewhisperer'
import { registerMessageListeners } from '../../../../../src/lsp/chat/messages'
Expand Down Expand Up @@ -126,4 +127,43 @@ describe('registerMessageListeners', () => {
})
})
})

describe('COPY_TO_CLIPBOARD', () => {
const testCode = 'test'
const copyMessage = {
command: 'copyToClipboard',
params: {
code: testCode,
},
}
let writeTextStub: sinon.SinonStub

beforeEach(() => {
writeTextStub = sinon.stub()
sandbox.stub(vscode.env, 'clipboard').value({
writeText: writeTextStub,
})
})

it('successfully copies code to clipboard', async () => {
writeTextStub.resolves()

await messageHandler(copyMessage)

sinon.assert.calledWith(writeTextStub, testCode)
})

it('handles clipboard copy failure', async () => {
const errorMessage = 'Failed to copy'
writeTextStub.rejects(new Error(errorMessage))

await messageHandler(copyMessage)

sinon.assert.calledOnce(errorStub)
sinon.assert.calledWith(
errorStub,
sinon.match(`[VSCode Client] Failed to copy to clipboard: ${errorMessage}`)
)
})
})
})
Loading