Skip to content
Snippets Groups Projects
Commit e7139443 authored by David Bühler's avatar David Bühler
Browse files

Merge branch '1258-ivette-name-of-lvalues-and-expressions-in-inspector' into 'master'

Resolve "[Ivette] Name of lvalues and expressions in Inspector"

Closes #1258

See merge request frama-c/frama-c!4361
parents e7af8e05 cca981d3
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,6 @@
import React from 'react';
import * as Dome from 'dome';
import { classes } from 'dome/misc/utils';
import * as Server from 'frama-c/server';
import * as States from 'frama-c/states';
import * as DATA from 'frama-c/kernel/api/data';
import * as AST from 'frama-c/kernel/api/ast';
......@@ -143,9 +142,7 @@ function MarkInfos(props: InfoSectionProps): JSX.Element {
const foreign = !!scope && fct !== scope;
const [unfold, setUnfold] = React.useState(true);
const [expand, setExpand] = React.useState(false);
const req = React.useMemo(() =>
Server.send(AST.getInformation, marker), [marker]);
const { result: markerFields = [] } = Dome.usePromise(req);
const markerFields = States.useRequest(AST.getInformation, marker) ?? [];
const isScrolled = marker === scrolled;
const isHovered = marker === hovered;
const isSelected = marker === selected;
......@@ -153,7 +150,7 @@ function MarkInfos(props: InfoSectionProps): JSX.Element {
isSelected && 'selected',
isHovered && 'hovered',
);
const { labelKind, titleKind, name, descr } = attrs;
const { labelKind, titleKind, descr } = attrs;
const filtered = markerFields.filter((fd) => !excluded.includes(fd.id));
const hasMore = filtered.length < markerFields.length;
const displayed = expand ? markerFields : filtered;
......@@ -208,7 +205,7 @@ function MarkInfos(props: InfoSectionProps): JSX.Element {
<Code key="NAME" className="astinfo-markercode">
<span className="astinfo-markerkind" title={titleKind}>
{labelKind}
</span> {name}
</span> {descr}
</Code>
<Code key="SCOPE" className="" display={foreign}>
[in: {scope}]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment