Add option in settings to enable autocompletion

This commit is contained in:
Roipoussiere 2023-06-09 16:38:48 +02:00
parent 6f04a1b8fa
commit 2d2d0cabb3
4 changed files with 36 additions and 4 deletions

View File

@ -103,6 +103,7 @@ export default function CodeMirror({
theme,
keybindings,
isLineNumbersDisplayed,
isAutoCompletionEnabled,
fontSize = 18,
fontFamily = 'monospace',
options,
@ -114,12 +115,14 @@ export default function CodeMirror({
},
[onChange],
);
const handleOnCreateEditor = useCallback(
(view) => {
onViewChanged?.(view);
},
[onViewChanged],
);
const handleOnUpdate = useCallback(
(viewUpdate) => {
if (viewUpdate.selectionSet && onSelectionChange) {
@ -128,6 +131,7 @@ export default function CodeMirror({
},
[onSelectionChange],
);
const extensions = useMemo(() => {
let bindings = {
vim,
@ -138,6 +142,11 @@ export default function CodeMirror({
}
return staticExtensions;
}, [keybindings]);
const setAutoCompletion = isAutoCompletionEnabled => isAutoCompletionEnabled ?
javascriptLanguage.data.of({ autocomplete: strudelAutocomplete }) :
autocompletion({ override: [] })
return (
<div style={{ fontSize, fontFamily }} className="w-full">
<_CodeMirror
@ -146,7 +155,7 @@ export default function CodeMirror({
onChange={handleOnChange}
onCreateEditor={handleOnCreateEditor}
onUpdate={handleOnUpdate}
extensions={extensions}
extensions={[ ...extensions, setAutoCompletion(isAutoCompletionEnabled) ]}
basicSetup={{ lineNumbers: isLineNumbersDisplayed }}
/>
</div>

View File

@ -364,7 +364,15 @@ const fontFamilyOptions = {
};
function SettingsTab({ scheduler }) {
const { theme, keybindings, isLineNumbersDisplayed, fontSize, fontFamily } = useSettings();
const {
theme,
keybindings,
isLineNumbersDisplayed,
isAutoCompletionEnabled,
fontSize,
fontFamily
} = useSettings();
return (
<div className="text-foreground p-4 space-y-4">
{/* <FormItem label="Tempo">
@ -406,7 +414,7 @@ function SettingsTab({ scheduler }) {
/>
</FormItem>
</div>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
<FormItem label="Keybindings">
<ButtonGroup
value={keybindings}
@ -419,6 +427,11 @@ function SettingsTab({ scheduler }) {
onChange={(cbEvent) => settingsMap.setKey('isLineNumbersDisplayed', cbEvent.target.checked)}
value={isLineNumbersDisplayed}
/>
<Checkbox
label="Enable auto-completion"
onChange={(cbEvent) => settingsMap.setKey('isAutoCompletionEnabled', cbEvent.target.checked)}
value={isAutoCompletionEnabled}
/>
</div>
<FormItem label="Reset Settings">
<button

View File

@ -105,7 +105,14 @@ export function Repl({ embedded = false }) {
const [lastShared, setLastShared] = useState();
const [pending, setPending] = useState(true);
const { theme, keybindings, fontSize, fontFamily, isLineNumbersDisplayed } = useSettings();
const {
theme,
keybindings,
fontSize,
fontFamily,
isLineNumbersDisplayed,
isAutoCompletionEnabled
} = useSettings();
const { code, setCode, scheduler, evaluate, activateCode, isDirty, activeCode, pattern, started, stop, error } =
useStrudel({
@ -272,6 +279,7 @@ export function Repl({ embedded = false }) {
value={code}
keybindings={keybindings}
isLineNumbersDisplayed={isLineNumbersDisplayed}
isAutoCompletionEnabled={isAutoCompletionEnabled}
fontSize={fontSize}
fontFamily={fontFamily}
onChange={handleChangeCode}

View File

@ -5,6 +5,7 @@ export const defaultSettings = {
activeFooter: 'intro',
keybindings: 'codemirror',
isLineNumbersDisplayed: true,
isAutoCompletionEnabled: false,
theme: 'strudelTheme',
fontFamily: 'monospace',
fontSize: 18,
@ -21,6 +22,7 @@ export function useSettings() {
...state,
isZen: [true, 'true'].includes(state.isZen) ? true : false,
isLineNumbersDisplayed: [true, 'true'].includes(state.isLineNumbersDisplayed) ? true : false,
isAutoCompletionEnabled: [true, 'true'].includes(state.isAutoCompletionEnabled) ? true : false,
fontSize: Number(state.fontSize),
};
}