Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 66 additions & 3 deletions packages/pi-fff/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -450,13 +450,76 @@ export default function fffExtension(pi: ExtensionAPI) {
setEditorComponent: (
factory: ((tui: any, theme: any, keybindings: any) => any) | undefined,
) => void;
getEditorComponent?: () =>
| ((tui: any, theme: any, keybindings: any) => any)
| undefined;
};
}) {
if (!shouldEnableMentions()) return;

ctx.ui.setEditorComponent(
(tui: any, theme: any, keybindings: any) => new FffEditor(tui, theme, keybindings),
);
// Compose with previous editor if available (Pi composability pattern)
const previousFactory = ctx.ui.getEditorComponent?.();

ctx.ui.setEditorComponent((tui: any, theme: any, keybindings: any) => {
// If previous editor exists, instantiate and wrap it
if (previousFactory) {
const baseEditor = previousFactory(tui, theme, keybindings);
const originalSetAutocomplete =
baseEditor.setAutocompleteProvider?.bind(baseEditor);

// Intercept setAutocompleteProvider to chain FFF autocomplete
baseEditor.setAutocompleteProvider = (provider: AutocompleteProvider) => {
const mentionProvider = createFffMentionProvider(getMentionItems);
const compositeProvider: AutocompleteProvider = {
getSuggestions: async (lines, cursorLine, cursorCol, options) => {
// Try @-mention first
const mentionResult = await mentionProvider.getSuggestions(
lines,
cursorLine,
cursorCol,
options,
);
if (mentionResult) return mentionResult;
// Fall back to base provider
return (
provider?.getSuggestions(lines, cursorLine, cursorCol, options) ?? null
);
},
applyCompletion: (lines, cursorLine, cursorCol, item, prefix) => {
// Let mention provider handle @ completions, base provider for others
if (prefix?.startsWith("@")) {
return mentionProvider.applyCompletion!(
lines,
cursorLine,
cursorCol,
item,
prefix,
);
}
return (
provider?.applyCompletion?.(
lines,
cursorLine,
cursorCol,
item,
prefix,
) ?? {
lines,
cursorLine,
cursorCol,
}
);
},
};
originalSetAutocomplete?.(compositeProvider);
};

return baseEditor;
}

// No previous editor - use standalone FffEditor
return new FffEditor(tui, theme, keybindings);
});
}

// --- Flags / lifecycle ---
Expand Down
Loading