diff options
author | vsrs <[email protected]> | 2020-06-05 13:25:01 +0100 |
---|---|---|
committer | vsrs <[email protected]> | 2020-06-05 13:25:01 +0100 |
commit | 78c9223b7bd4bffe64b7ec69e5fee08604dc0057 (patch) | |
tree | ab1770311871a80703fadb50f4fa05a09512e235 /editors/code | |
parent | 0fe43a124bb2b135cfd1268fda2941c3ac170c96 (diff) |
Remove hover contents marking as trusted.
Hover contents might be extracted from raw
doc comments and need some validation.
Diffstat (limited to 'editors/code')
-rw-r--r-- | editors/code/src/client.ts | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index f2094b5ce..65ad573d8 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts | |||
@@ -7,20 +7,11 @@ import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.pr | |||
7 | import { SemanticTokensFeature, DocumentSemanticsTokensSignature } from 'vscode-languageclient/lib/semanticTokens.proposed'; | 7 | import { SemanticTokensFeature, DocumentSemanticsTokensSignature } from 'vscode-languageclient/lib/semanticTokens.proposed'; |
8 | import { assert } from './util'; | 8 | import { assert } from './util'; |
9 | 9 | ||
10 | function toTrusted(obj: vscode.MarkedString): vscode.MarkedString { | 10 | function renderCommand(cmd: ra.CommandLink) { |
11 | const md = <vscode.MarkdownString>obj; | ||
12 | if (md && md.value.includes("```rust")) { | ||
13 | md.isTrusted = true; | ||
14 | return md; | ||
15 | } | ||
16 | return obj; | ||
17 | } | ||
18 | |||
19 | function renderCommand(cmd: CommandLink) { | ||
20 | return `[${cmd.title}](command:${cmd.command}?${encodeURIComponent(JSON.stringify(cmd.arguments))} '${cmd.tooltip!}')`; | 11 | return `[${cmd.title}](command:${cmd.command}?${encodeURIComponent(JSON.stringify(cmd.arguments))} '${cmd.tooltip!}')`; |
21 | } | 12 | } |
22 | 13 | ||
23 | function renderHoverActions(actions: CommandLinkGroup[]): vscode.MarkdownString { | 14 | function renderHoverActions(actions: ra.CommandLinkGroup[]): vscode.MarkdownString { |
24 | const text = actions.map(group => | 15 | const text = actions.map(group => |
25 | (group.title ? (group.title + " ") : "") + group.commands.map(renderCommand).join(' | ') | 16 | (group.title ? (group.title + " ") : "") + group.commands.map(renderCommand).join(' | ') |
26 | ).join('___'); | 17 | ).join('___'); |
@@ -63,10 +54,6 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient | |||
63 | (result) => { | 54 | (result) => { |
64 | const hover = client.protocol2CodeConverter.asHover(result); | 55 | const hover = client.protocol2CodeConverter.asHover(result); |
65 | if (hover) { | 56 | if (hover) { |
66 | // Workaround to support command links (trusted vscode.MarkdownString) in hovers | ||
67 | // https://github.com/microsoft/vscode/issues/33577 | ||
68 | hover.contents = hover.contents.map(toTrusted); | ||
69 | |||
70 | const actions = (<any>result).actions; | 57 | const actions = (<any>result).actions; |
71 | if (actions) { | 58 | if (actions) { |
72 | hover.contents.push(renderHoverActions(actions)); | 59 | hover.contents.push(renderHoverActions(actions)); |