diff --git a/src/javadoc/JavadocCmpletionProvider.ts b/src/javadoc/JavadocCompletionProvider.ts similarity index 100% rename from src/javadoc/JavadocCmpletionProvider.ts rename to src/javadoc/JavadocCompletionProvider.ts diff --git a/src/javadoc/JavadocMarkdownEditor.tsx b/src/javadoc/JavadocMarkdownEditor.tsx index d324642..c05abf4 100644 --- a/src/javadoc/JavadocMarkdownEditor.tsx +++ b/src/javadoc/JavadocMarkdownEditor.tsx @@ -3,7 +3,7 @@ import { useObservable } from "../utils/UseObservable"; import { currentResult } from "../logic/Decompiler"; import { useEffect, useRef } from "react"; import type { editor } from "monaco-editor"; -import { JavdocCompletionProvider } from "./JavadocCmpletionProvider"; +import { JavdocCompletionProvider } from "./JavadocCompletionProvider"; const JavadocMarkdownEditor = ({ value, @@ -47,4 +47,4 @@ const JavadocMarkdownEditor = ({ ); }; -export default JavadocMarkdownEditor; \ No newline at end of file +export default JavadocMarkdownEditor; diff --git a/src/logic/Settings.ts b/src/logic/Settings.ts index 289c4e1..f4ef577 100644 --- a/src/logic/Settings.ts +++ b/src/logic/Settings.ts @@ -114,6 +114,7 @@ export const agreedEula = new BooleanSetting('eula', false); export const enableTabs = new BooleanSetting('enable_tabs', true); export const displayLambdas = new BooleanSetting('display_lambdas', false); export const bytecode = new BooleanSetting('bytecode', false); +export const showLines = new BooleanSetting('showLines', true); export const focusSearch = new KeybindSetting('focus_search', 'Ctrl+ '); export const supportsPermalinking = combineLatest([displayLambdas.observable, bytecode.observable]).pipe( @@ -130,4 +131,4 @@ export const supportsPermalinking = combineLatest([displayLambdas.observable, by export function resetPermalinkAffectingSettings(): void { displayLambdas.value = false; bytecode.value = false; -} \ No newline at end of file +} diff --git a/src/ui/FileList.tsx b/src/ui/FileList.tsx index 12f1a1b..5dc4063 100644 --- a/src/ui/FileList.tsx +++ b/src/ui/FileList.tsx @@ -8,6 +8,7 @@ import { selectedFile } from '../logic/State'; import { useState } from 'react'; import type { Key } from 'antd/es/table/interface'; import { openTab } from '../logic/Tabs'; +import { showLines } from '../logic/Settings'; // Sorts nodes with children first (directories before files), then alphabetically const sortTreeNodes = (nodes: TreeDataNode[] = []) => { @@ -41,7 +42,7 @@ const data: Observable = classesList.pipe( title: part.replace('.class', ''), key: parts.slice(0, index + 1).join('/'), children: [], - isLeaf: index === parts.length - 1 + isLeaf: index === parts.length - 1, }; currentLevel.push(existingNode); } @@ -74,8 +75,10 @@ function getPathKeys(filePath: string): Key[] { const FileList = () => { const [expandedKeys, setExpandedKeys] = useState(); + const showLine = useObservable(showLines.observable); const selectedKeys = useObservable(selectedFileKeys); const classes = useObservable(classesList); + const onSelect: TreeProps['onSelect'] = (selectedKeys) => { if (selectedKeys.length === 0) return; if (!classes || !classes.includes(selectedKeys[0] as string)) return; @@ -88,9 +91,10 @@ const FileList = () => { setExpandedKeys(getPathKeys(selectedKeys[0])); } + return ( } selectedKeys={selectedKeys} onSelect={onSelect} diff --git a/src/ui/SettingsModal.tsx b/src/ui/SettingsModal.tsx index 2a420be..919487b 100644 --- a/src/ui/SettingsModal.tsx +++ b/src/ui/SettingsModal.tsx @@ -2,7 +2,7 @@ import { Button, Modal, type CheckboxProps, Form, Tooltip } from "antd"; import { SettingOutlined } from '@ant-design/icons'; import { Checkbox } from 'antd'; import { useObservable } from "../utils/UseObservable"; -import { BooleanSetting, enableTabs, displayLambdas, focusSearch, KeybindSetting, type KeybindValue, bytecode } from "../logic/Settings"; +import { BooleanSetting, enableTabs, showLines, displayLambdas, focusSearch, KeybindSetting, type KeybindValue, bytecode } from "../logic/Settings"; import { capturingKeybind, rawKeydownEvent } from "../logic/Keybinds"; import { BehaviorSubject } from "rxjs"; @@ -30,6 +30,7 @@ const SettingsModal = () => { >
+ @@ -111,4 +112,4 @@ const KeybindControl: React.FC = ({ setting, title }) => { ); }; -export default SettingsModal; \ No newline at end of file +export default SettingsModal;