1 files changed, 26 insertions, 8 deletions

diff --git a/subprojects/frontend/src/xtext/OccurrencesService.ts b/subprojects/frontend/src/xtext/OccurrencesService.ts
index 21fe8644..35913f43 100644
--- a/subprojects/frontend/src/xtext/OccurrencesService.ts
+++ b/subprojects/frontend/src/xtext/OccurrencesService.ts
@@ -1,7 +1,10 @@
 import { Transaction } from '@codemirror/state';
 
 import type EditorStore from '../editor/EditorStore';
-import type { IOccurrence } from '../editor/findOccurrences';
+import {
+  type IOccurrence,
+  isCursorWithinOccurence,
+} from '../editor/findOccurrences';
 import Timer from '../utils/Timer';
 import getLogger from '../utils/getLogger';
 
@@ -15,10 +18,6 @@ import {
 
 const FIND_OCCURRENCES_TIMEOUT_MS = 1000;
 
-// Must clear occurrences asynchronously from `onTransaction`,
-// because we must not emit a conflicting transaction when handling the pending transaction.
-const CLEAR_OCCURRENCES_TIMEOUT_MS = 10;
-
 const log = getLogger('xtext.OccurrencesService');
 
 function transformOccurrences(regions: TextRegion[]): IOccurrence[] {
@@ -49,7 +48,7 @@ export default class OccurrencesService {
 
   private readonly clearOccurrencesTimer = new Timer(() => {
     this.clearOccurrences();
-  }, CLEAR_OCCURRENCES_TIMEOUT_MS);
+  });
 
   constructor(
     store: EditorStore,
@@ -63,12 +62,27 @@ export default class OccurrencesService {
 
   onTransaction(transaction: Transaction): void {
     if (transaction.docChanged) {
+      // Must clear occurrences asynchronously from `onTransaction`,
+      // because we must not emit a conflicting transaction when handling the pending transaction.
       this.clearOccurrencesTimer.schedule();
       this.findOccurrencesTimer.reschedule();
+      return;
     }
-    if (transaction.isUserEvent('select')) {
-      this.findOccurrencesTimer.reschedule();
+    if (!transaction.isUserEvent('select')) {
+      return;
     }
+    if (this.needsOccurrences) {
+      if (!isCursorWithinOccurence(this.store.state)) {
+        this.clearOccurrencesTimer.schedule();
+        this.findOccurrencesTimer.reschedule();
+      }
+    } else {
+      this.clearOccurrencesTimer.schedule();
+    }
+  }
+
+  private get needsOccurrences(): boolean {
+    return this.store.state.selection.main.empty;
   }
 
   private handleFindOccurrences() {
@@ -80,6 +94,10 @@ export default class OccurrencesService {
   }
 
   private async updateOccurrences() {
+    if (!this.needsOccurrences) {
+      this.clearOccurrences();
+      return;
+    }
     await this.updateService.update();
     const result = await this.webSocketClient.send({
       resource: this.updateService.resourceName,