Skip to content

Improvements for execution hovering #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
melnikga merged 1 commit into from
Jan 9, 2026
Merged

Improvements for execution hovering #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 26 additions & 41 deletions src/components/code-viewer/code-viewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function CodeViewer({
const breakpointDecorationsRef = useRef<string[]>([]);
const monaco = useMonaco();
const [hoverLine, setHoverLine] = useState<number | null>(null);
const [prevCodeValue, setPrevCodeValue] = useState<string | null>(null);
const codeLocationRef = useRef<CodeLocation | undefined>(codeLocation);
const activeFileRef = useRef<string | undefined>(undefined);
const classHashRef = useRef<string | undefined>(undefined);
const breakPointsLinesRef = useRef<number[] | undefined>(undefined);
Expand Down Expand Up @@ -79,12 +79,16 @@ export function CodeViewer({
return fileEntry ? fileEntry.map((bp) => bp + 1) : [];
}, [classFileBreakpoints]);

useEffect(() => {
codeLocationRef.current = codeLocation;
}, [codeLocation]);

const highlightCodeLocation = useCallback(
(
codeLocation: CodeLocation,
editor: Editor.IStandaloneCodeEditor,
_monaco: Monaco,
isSmoothScroll: boolean
smooth: boolean
) => {
if (!_monaco || !editor) return;
const range = new _monaco.Range(
Expand All @@ -93,23 +97,9 @@ export function CodeViewer({
codeLocation.end.line + 1,
codeLocation.end.col + 1
);

const isHighlightOnScreen = isRangeVisible(range.startLineNumber, range.endLineNumber);

if (!isHighlightOnScreen) {
editor.revealRangeInCenter(
range.plusRange(
new _monaco.Range(
range.startLineNumber - 2,
range.startColumn,
range.endLineNumber,
range.endColumn
)
),
isSmoothScroll ? 0 : 1
);
}

const lineHeight = editor.getOption(_monaco.editor.EditorOption.lineHeight);
const targetScrollTop = (range.startLineNumber - 1) * lineHeight;
editor.setScrollTop(targetScrollTop, smooth ? 0 : 1);
editorDecorations?.clear();
setTimeout(() => {
const decorations = [
Expand All @@ -127,6 +117,14 @@ export function CodeViewer({
[editorDecorations, highlightClass]
);

useEffect(() => {
if (editorRef.current && content) {
editorRef.current.setScrollTop(0);
editorRef.current.setScrollLeft(0);
editorRef.current.setPosition({ lineNumber: 1, column: 1 });
}
}, [content]);

const handleEditorDidMount = useCallback(
async (editor: Editor.IStandaloneCodeEditor, monaco: Monaco) => {
editorRef.current = editor;
Expand Down Expand Up @@ -180,11 +178,12 @@ export function CodeViewer({
}
});

if (codeLocation) {
highlightCodeLocation(codeLocation, editor, monaco, false);
const loc = codeLocationRef.current;
if (loc && activeFileRef.current && loc.filePath === activeFileRef.current) {
highlightCodeLocation(loc, editor, monaco, false);
}
},
[codeLocation, hoverLine, toggleBreakpoint, highlightCodeLocation, args, results]
[hoverLine, toggleBreakpoint, highlightCodeLocation]
);

const updateBreakpointDecorations = useCallback(
Expand Down Expand Up @@ -232,17 +231,14 @@ export function CodeViewer({

useEffect(() => {
if (editorRef.current && monaco) {
if (codeLocation) {
// Use smooth scroll when content changes, instant when same content
const isSmoothScroll = content !== prevCodeValue;
highlightCodeLocation(codeLocation, editorRef.current, monaco, isSmoothScroll);
if (codeLocation && activeFile && codeLocation.filePath === activeFile) {
highlightCodeLocation(codeLocation, editorRef.current, monaco, true);
} else {
editorRef.current.revealLineNearTop(0, 1);
}
setPrevCodeValue(content);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [codeLocation, args, results, isExpressionHover, content, contractSwitchCount]);
}, [codeLocation, args, results, isExpressionHover]);

useEffect(() => {
const styleId = 'breakpoint-style';
Expand All @@ -267,18 +263,6 @@ export function CodeViewer({
}
}, []);

const isRangeVisible = (startLine: number, endLine: number) => {
const editor = editorRef.current;
if (editor) {
const visibleRanges = editor.getVisibleRanges();
return visibleRanges.some(
(visibleRange) =>
visibleRange.startLineNumber <= endLine && visibleRange.endLineNumber >= startLine
);
}
return false;
};

return (
<MonacoEditor
onMount={handleEditorDidMount}
Expand All @@ -291,7 +275,8 @@ export function CodeViewer({
smoothScrolling: true,
lineNumbers: 'on',
lineNumbersMinChars: 3,
lineDecorationsWidth: 15
lineDecorationsWidth: 15,
stickyScroll: { enabled: false }
}}
value={content}
language="solidity"
Expand Down
Loading