aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ARCHITECTURE.md2
-rw-r--r--editors/code/src/commands/apply_source_change.ts3
2 files changed, 3 insertions, 2 deletions
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index b326f9c71..277b29c12 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -87,7 +87,7 @@ fixes a bug in the grammar.
87 87
88### `crates/ra_db` 88### `crates/ra_db`
89 89
90We use [salsa][https://github.com/salsa-rs/salsa] crate for incremental and 90We use the [salsa](https://github.com/salsa-rs/salsa) crate for incremental and
91on-demand computation. Roughly, you can think of salsa as a key-value store, but 91on-demand computation. Roughly, you can think of salsa as a key-value store, but
92it also can compute derived values using specified functions. The `ra_db` crate 92it also can compute derived values using specified functions. The `ra_db` crate
93provides a basic infrastructure for interacting with salsa. Crucially, it 93provides a basic infrastructure for interacting with salsa. Crucially, it
diff --git a/editors/code/src/commands/apply_source_change.ts b/editors/code/src/commands/apply_source_change.ts
index 10dbf72c0..d96ace979 100644
--- a/editors/code/src/commands/apply_source_change.ts
+++ b/editors/code/src/commands/apply_source_change.ts
@@ -26,7 +26,8 @@ export async function handle(change: SourceChange) {
26 const toReveal = change.cursorPosition; 26 const toReveal = change.cursorPosition;
27 await vscode.workspace.applyEdit(wsEdit); 27 await vscode.workspace.applyEdit(wsEdit);
28 if (toOpen) { 28 if (toOpen) {
29 const doc = await vscode.workspace.openTextDocument(toOpen); 29 const toOpenUri = vscode.Uri.parse(toOpen);
30 const doc = await vscode.workspace.openTextDocument(toOpenUri);
30 await vscode.window.showTextDocument(doc); 31 await vscode.window.showTextDocument(doc);
31 } else if (toReveal) { 32 } else if (toReveal) {
32 const uri = Server.client.protocol2CodeConverter.asUri( 33 const uri = Server.client.protocol2CodeConverter.asUri(