Merge #5500
5500: ProblemMatcher fixes/improvements. r=matklad a=rickvanprim Fixes https://github.com/rust-analyzer/rust-analyzer/issues/5482. ProblemMatcher auto detects relative/absolute paths and matches VSCode LSP's owner and source. VSCode LSP updated to specify owner. Co-authored-by: James Leitch <rickvanprim@gmail.com>
This commit is contained in:
commit
803f3613ba
2 changed files with 10 additions and 3 deletions
|
@ -655,24 +655,30 @@
|
|||
"problemMatchers": [
|
||||
{
|
||||
"name": "rustc",
|
||||
"owner": "rustc",
|
||||
"source": "rustc",
|
||||
"fileLocation": [
|
||||
"relative",
|
||||
"autoDetect",
|
||||
"${workspaceRoot}"
|
||||
],
|
||||
"pattern": "$rustc"
|
||||
},
|
||||
{
|
||||
"name": "rustc-json",
|
||||
"owner": "rustc",
|
||||
"source": "rustc",
|
||||
"fileLocation": [
|
||||
"relative",
|
||||
"autoDetect",
|
||||
"${workspaceRoot}"
|
||||
],
|
||||
"pattern": "$rustc-json"
|
||||
},
|
||||
{
|
||||
"name": "rustc-watch",
|
||||
"owner": "rustc",
|
||||
"source": "rustc",
|
||||
"fileLocation": [
|
||||
"relative",
|
||||
"autoDetect",
|
||||
"${workspaceRoot}"
|
||||
],
|
||||
"background": {
|
||||
|
|
|
@ -41,6 +41,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
|
|||
const clientOptions: lc.LanguageClientOptions = {
|
||||
documentSelector: [{ scheme: 'file', language: 'rust' }],
|
||||
initializationOptions: vscode.workspace.getConfiguration("rust-analyzer"),
|
||||
diagnosticCollectionName: "rustc",
|
||||
traceOutputChannel,
|
||||
middleware: {
|
||||
// Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576
|
||||
|
|
Loading…
Reference in a new issue