diff options
| author | Laurențiu Nicola <lnicola@dend.ro> | 2024-03-17 11:04:52 +0200 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2024-03-17 11:04:52 +0200 |
| commit | 20ecf0744d112cb40e628fee3f5cb738e226e4a1 (patch) | |
| tree | 6da0cbe91a43bc1435031f31bdd597451ea05db2 /src/tools/rust-analyzer/editors/code | |
| parent | 1eb882ef6d8630109c7b7ea5dcc5ef1c504bb976 (diff) | |
| parent | 5ecace48f693afaa6adf8cb23086b651db3aec96 (diff) | |
| download | rust-20ecf0744d112cb40e628fee3f5cb738e226e4a1.tar.gz rust-20ecf0744d112cb40e628fee3f5cb738e226e4a1.zip | |
Merge commit '5ecace48f693afaa6adf8cb23086b651db3aec96' into sync-from-ra
Diffstat (limited to 'src/tools/rust-analyzer/editors/code')
4 files changed, 13 insertions, 4 deletions
diff --git a/src/tools/rust-analyzer/editors/code/language-configuration.json b/src/tools/rust-analyzer/editors/code/language-configuration.json index 1c348b63f1a..bdae0e6ba9b 100644 --- a/src/tools/rust-analyzer/editors/code/language-configuration.json +++ b/src/tools/rust-analyzer/editors/code/language-configuration.json @@ -18,7 +18,7 @@ { "open": "[", "close": "]" }, { "open": "(", "close": ")" }, { "open": "\"", "close": "\"", "notIn": ["string"] }, - { "open": "/*", "close": " */" }, + { "open": "/*", "close": " */", "notIn": ["string"] }, { "open": "`", "close": "`", "notIn": ["string"] } ], "autoCloseBefore": ";:.,=}])> \n\t", diff --git a/src/tools/rust-analyzer/editors/code/package-lock.json b/src/tools/rust-analyzer/editors/code/package-lock.json index 291cef926f8..bd8b0e9c4e0 100644 --- a/src/tools/rust-analyzer/editors/code/package-lock.json +++ b/src/tools/rust-analyzer/editors/code/package-lock.json @@ -2290,9 +2290,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true, "funding": [ { diff --git a/src/tools/rust-analyzer/editors/code/src/lsp_ext.ts b/src/tools/rust-analyzer/editors/code/src/lsp_ext.ts index 31ac3d9413e..ca8106371b0 100644 --- a/src/tools/rust-analyzer/editors/code/src/lsp_ext.ts +++ b/src/tools/rust-analyzer/editors/code/src/lsp_ext.ts @@ -100,6 +100,9 @@ export const discoveredTests = new lc.NotificationType<DiscoverTestResults>( export const runTest = new lc.RequestType<RunTestParams, void, void>("experimental/runTest"); export const abortRunTest = new lc.NotificationType0("experimental/abortRunTest"); export const endRunTest = new lc.NotificationType0("experimental/endRunTest"); +export const appendOutputToRunTest = new lc.NotificationType<string>( + "experimental/appendOutputToRunTest", +); export const changeTestState = new lc.NotificationType<ChangeTestStateParams>( "experimental/changeTestState", ); diff --git a/src/tools/rust-analyzer/editors/code/src/test_explorer.ts b/src/tools/rust-analyzer/editors/code/src/test_explorer.ts index 2f0b4d5b5cf..ac4ffb19263 100644 --- a/src/tools/rust-analyzer/editors/code/src/test_explorer.ts +++ b/src/tools/rust-analyzer/editors/code/src/test_explorer.ts @@ -142,6 +142,12 @@ export const prepareTestExplorer = ( ); ctx.pushClientCleanup( + client.onNotification(ra.appendOutputToRunTest, (output) => { + currentTestRun!.appendOutput(`${output}\r\n`); + }), + ); + + ctx.pushClientCleanup( client.onNotification(ra.changeTestState, (results) => { const test = idToTestMap.get(results.testId)!; if (results.state.tag === "failed") { |