2 files changed, 6 insertions, 5 deletions

diff --git a/editors/code/rust.tmGrammar.json b/editors/code/rust.tmGrammar.json
index cdcd557dc..ab87cd39f 100644
--- a/editors/code/rust.tmGrammar.json
+++ b/editors/code/rust.tmGrammar.json
@@ -207,7 +207,7 @@
                 {
                         "comment": "Miscellaneous operator",
                         "name": "keyword.operator.misc.rust",
-                        "match": "(=>|::)"
+                        "match": "(=>|::|\\?)"
                 },
                 {
                         "comment": "Comparison operator",
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts
index 127a9e911..793c481fb 100644
--- a/editors/code/src/util.ts
+++ b/editors/code/src/util.ts
@@ -74,10 +74,11 @@ export type RustDocument = vscode.TextDocument & { languageId: "rust" };
 export type RustEditor = vscode.TextEditor & { document: RustDocument };
 
 export function isRustDocument(document: vscode.TextDocument): document is RustDocument {
-    return document.languageId === 'rust'
-        // SCM diff views have the same URI as the on-disk document but not the same content
-        && document.uri.scheme !== 'git'
-        && document.uri.scheme !== 'svn';
+    // Prevent corrupted text (particularly via inlay hints) in diff views
+    // by allowing only `file` schemes
+    // unfortunately extensions that use diff views not always set this
+    // to something different than 'file' (see ongoing bug: #4608)
+    return document.languageId === 'rust' && document.uri.scheme === 'file';
 }
 
 export function isRustEditor(editor: vscode.TextEditor): editor is RustEditor {