Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 05:06:37 +02:00
Code Issues Packages Projects Releases Activity

feat(code): reindent on changing tab width

Browse Source
This commit is contained in:
Elian Doran
2026-04-15 09:14:55 +03:00
parent b20e2459c3
commit f12d73a5c7
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/client/src/widgets/layout/StatusBar.tsx
View File

@@ -440,12 +440,39 @@ function NotePaths({ note, hoistedNoteId, notePath }: StatusBarContext) {
//#region Tab width switcher
const TAB_WIDTH_OPTIONS = [1, 2, 3, 4, 6, 8] as const;
function TabWidthSwitcher({ note }: StatusBarContext) {
/**
* Re-indents leading spaces on each line, converting from `fromWidth` indent units
* to `toWidth` indent units. Tabs and non-leading whitespace are preserved as-is.
*/
function reindentSpaces(content: string, fromWidth: number, toWidth: number): string {
if (fromWidth === toWidth || fromWidth <= 0) return content;
return content.replace(/^( +)/gm, (leading) => {
const levels = Math.round(leading.length / fromWidth);
const remainder = leading.length - levels * fromWidth;
return " ".repeat(levels * toWidth + Math.max(remainder, 0));
});
}
function TabWidthSwitcher({ note, noteContext }: StatusBarContext) {
const [ globalTabWidth ] = useTriliumOptionInt("codeNoteTabWidth");
const [ noteTabWidth, setNoteTabWidth ] = useNoteLabelInt(note, "tabWidth");
const effectiveTabWidth = noteTabWidth ?? globalTabWidth;
const hasPerNoteOverride = noteTabWidth != null;
const changeTabWidth = async (newWidth: number | null) => {
const oldWidth = effectiveTabWidth;
const resolvedNewWidth = newWidth ?? globalTabWidth;
setNoteTabWidth(newWidth);
if (oldWidth === resolvedNewWidth) return;
const editor = await noteContext.getCodeEditor();
if (!editor) return;
const reindented = reindentSpaces(editor.getText(), oldWidth, resolvedNewWidth);
if (reindented !== editor.getText()) {
editor.setText(reindented);
}
};
return (note.type === "code" &&
<StatusBarDropdown
icon="bx bx-right-indent"
@@ -456,14 +483,14 @@ function TabWidthSwitcher({ note }: StatusBarContext) {
<FormListItem
key={size}
checked={effectiveTabWidth === size}
onClick={() => setNoteTabWidth(size)}
onClick={() => changeTabWidth(size)}
>
{t("status_bar.tab_width_spaces", { count: size })}
</FormListItem>
))}
{hasPerNoteOverride && <>
<FormDropdownDivider />
<FormListItem icon="bx bx-x" onClick={() => setNoteTabWidth(null)}>
<FormListItem icon="bx bx-x" onClick={() => changeTabWidth(null)}>
{t("status_bar.tab_width_use_default", { width: globalTabWidth })}
</FormListItem>
</>}