Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

fix(obsidian): avoid command palette crashes from null tooltip entries (#2804)

Stanleyce34a6e2907e
diff --git a/packages/obsidian-plugin/src/lint.test.ts b/packages/obsidian-plugin/src/lint.test.ts
new file mode 100644
index 000000000..c10ea899e
--- /dev/null
+++ b/packages/obsidian-plugin/src/lint.test.ts
@@ -0,0 +1,20 @@
+import type { EditorView } from '@codemirror/view';
+import { expect, test } from 'vitest';
+import { canApplySuggestionFromVisibleTooltip } from './lint';
+
+test('canApplySuggestionFromVisibleTooltip handles null tooltip entries', () => {
+ const mockView = {
+ state: {
+ field: () => ({
+ commandTooltip: null,
+ diagnostics: {
+ between: () => {},
+ },
+ }),
+ facet: () => [null],
+ },
+ } as unknown as EditorView;
+
+ expect(() => canApplySuggestionFromVisibleTooltip(mockView, 1)).not.toThrow();
+ expect(canApplySuggestionFromVisibleTooltip(mockView, 1)).toBe(false);
+});
diff --git a/packages/obsidian-plugin/src/lint.ts b/packages/obsidian-plugin/src/lint.ts
index 0141e67f5..5c2748a3e 100644
--- a/packages/obsidian-plugin/src/lint.ts
+++ b/packages/obsidian-plugin/src/lint.ts
@@ -805,8 +805,12 @@ function getActiveTooltipMatch(view: EditorView): SelectedDiagnostic | null {
return lState.commandTooltip;
}
- const active = view.state.facet(showTooltip) as (Tooltip & HarperTooltipMeta)[];
+ const active = view.state.facet(showTooltip) as
+ | readonly ((Tooltip & HarperTooltipMeta) | null)[]
+ | null;
+ if (!active) return null;
for (const tooltip of active) {
+ if (!tooltip || tooltip.harperLint !== true) continue;
const from = tooltip.pos;
const to = tooltip.end ?? from;
const matched = getDiagnosticForTooltipRange(lState.diagnostics, from, to);