Skip to content

Commit 0211223

Browse files
authored
fix: onFileClick logic is crashing the whole process if no workspace is open (#1119)
1 parent f21700a commit 0211223

File tree

26 files changed

+98
-67
lines changed

26 files changed

+98
-67
lines changed

app/aws-lsp-antlr4-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"webpack": "webpack"
1313
},
1414
"dependencies": {
15-
"@aws/language-server-runtimes": "^0.2.74",
15+
"@aws/language-server-runtimes": "^0.2.76",
1616
"@aws/lsp-antlr4": "*",
1717
"antlr4-c3": "^3.4.1",
1818
"antlr4ng": "^3.0.4"

app/aws-lsp-codewhisperer-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"test": "node scripts/test-runner.js"
1414
},
1515
"dependencies": {
16-
"@aws/language-server-runtimes": "^0.2.74",
16+
"@aws/language-server-runtimes": "^0.2.76",
1717
"@aws/lsp-codewhisperer": "*",
1818
"copyfiles": "^2.4.1",
1919
"cross-env": "^7.0.3",

app/aws-lsp-identity-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.74",
10+
"@aws/language-server-runtimes": "^0.2.76",
1111
"@aws/lsp-identity": "^0.0.1"
1212
}
1313
}

app/aws-lsp-json-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"webpack": "webpack"
1212
},
1313
"dependencies": {
14-
"@aws/language-server-runtimes": "^0.2.74",
14+
"@aws/language-server-runtimes": "^0.2.76",
1515
"@aws/lsp-json": "*"
1616
},
1717
"devDependencies": {

app/aws-lsp-notification-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.74",
10+
"@aws/language-server-runtimes": "^0.2.76",
1111
"@aws/lsp-notification": "^0.0.1"
1212
}
1313
}

app/aws-lsp-yaml-json-webworker/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"serve:webpack": "NODE_ENV=development webpack serve"
1212
},
1313
"dependencies": {
14-
"@aws/language-server-runtimes": "^0.2.74",
14+
"@aws/language-server-runtimes": "^0.2.76",
1515
"@aws/lsp-json": "*",
1616
"@aws/lsp-yaml": "*"
1717
},

app/aws-lsp-yaml-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"webpack": "webpack"
1212
},
1313
"dependencies": {
14-
"@aws/language-server-runtimes": "^0.2.74",
14+
"@aws/language-server-runtimes": "^0.2.76",
1515
"@aws/lsp-yaml": "*"
1616
},
1717
"devDependencies": {

app/hello-world-lsp-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"dependencies": {
1717
"@aws/hello-world-lsp": "^0.0.1",
18-
"@aws/language-server-runtimes": "^0.2.74"
18+
"@aws/language-server-runtimes": "^0.2.76"
1919
},
2020
"devDependencies": {
2121
"@types/chai": "^4.3.5",

chat-client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
},
2323
"dependencies": {
2424
"@aws/chat-client-ui-types": "^0.1.28",
25-
"@aws/language-server-runtimes-types": "^0.1.23",
26-
"@aws/mynah-ui": "^4.31.0-beta.6"
25+
"@aws/language-server-runtimes-types": "^0.1.25",
26+
"@aws/mynah-ui": "^4.31.0-beta.7"
2727
},
2828
"devDependencies": {
2929
"@types/jsdom": "^21.1.6",

chat-client/src/client/mynahUi.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ export const createMynahUi = (
202202
messager.onUiReady()
203203
messager.onTabAdd(initialTabId)
204204
},
205-
onFileClick: (tabId, filePath, deleted, messageId, eventId) => {
206-
messager.onFileClick({ tabId, filePath, messageId })
205+
onFileClick: (tabId, filePath, deleted, messageId, eventId, fileDetails) => {
206+
messager.onFileClick({ tabId, filePath, messageId, fullPath: fileDetails?.data?.['fullPath'] })
207207
},
208208
onTabAdd: (tabId: string) => {
209209
const defaultTabBarData = tabFactory.getDefaultTabData()
@@ -515,6 +515,9 @@ export const createMynahUi = (
515515
: '',
516516
description: filePath,
517517
clickable: true,
518+
data: {
519+
fullPath: fileDetails.fullPath || '',
520+
},
518521
},
519522
])
520523
),

client/vscode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
"@aws-sdk/credential-providers": "^3.731.1",
342342
"@aws-sdk/types": "^3.734.0",
343343
"@aws/chat-client-ui-types": "^0.1.28",
344-
"@aws/language-server-runtimes": "^0.2.74",
344+
"@aws/language-server-runtimes": "^0.2.76",
345345
"@types/uuid": "^9.0.8",
346346
"@types/vscode": "^1.98.0",
347347
"jose": "^5.2.4",

client/vscode/src/chatActivation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import {
4444
} from 'vscode-languageclient/node'
4545
import * as jose from 'jose'
4646
import * as vscode from 'vscode'
47-
import * as fs from 'fs'
4847

4948
export function registerChat(languageClient: LanguageClient, extensionUri: Uri, encryptionKey?: Buffer) {
5049
const webviewInitialized: Promise<Webview> = new Promise(resolveWebview => {
@@ -189,6 +188,7 @@ export function registerChat(languageClient: LanguageClient, extensionUri: Uri,
189188
default:
190189
if (isServerEvent(message.command))
191190
languageClient.sendNotification(message.command, message.params)
191+
else languageClient.info(`[VSCode Client] Unhandled command: ${message.command}`)
192192
break
193193
}
194194
}, undefined)

package-lock.json

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/aws-lsp-antlr4/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"clean": "rm -rf node_modules"
2929
},
3030
"dependencies": {
31-
"@aws/language-server-runtimes": "^0.2.74",
31+
"@aws/language-server-runtimes": "^0.2.76",
3232
"@aws/lsp-core": "^0.0.3"
3333
},
3434
"peerDependencies": {

0 commit comments

Comments
 (0)