[ivette] Update ASTview to marker API changes.

ivette/api/kernel/ast/index.ts

@@ -43,10 +43,6 @@ export const compute: Server.ExecRequest<null,null>= compute_internal;
 
 /** Marker kind */
 export enum markerKind {
-  /** Variable */
-  variable = 'variable',
-  /** Function */
-  function = 'function',
   /** Expression */
   expression = 'expression',
   /** Lvalue */
@@ -83,12 +79,44 @@ const markerKindTags_internal: Server.GetRequest<null,tag[]> = {
 /** Registered tags for the above type. */
 export const markerKindTags: Server.GetRequest<null,tag[]>= markerKindTags_internal;
 
+/** Marker variable */
+export enum markerVar {
+  /** None */
+  none = 'none',
+  /** Variable */
+  variable = 'variable',
+  /** Function */
+  function = 'function',
+}
+
+/** Loose decoder for `markerVar` */
+export const jMarkerVar: Json.Loose<markerVar> = Json.jEnum(markerVar);
+
+/** Safe decoder for `markerVar` */
+export const jMarkerVarSafe: Json.Safe<markerVar> =
+  Json.jFail(Json.jEnum(markerVar),'kernel.ast.markerVar expected');
+
+/** Natural order for `markerVar` */
+export const byMarkerVar: Compare.Order<markerVar> =
+  Compare.byEnum(markerVar);
+
+const markerVarTags_internal: Server.GetRequest<null,tag[]> = {
+  kind: Server.RqKind.GET,
+  name:   'kernel.ast.markerVarTags',
+  input:  Json.jNull,
+  output: Json.jList(jTag),
+};
+/** Registered tags for the above type. */
+export const markerVarTags: Server.GetRequest<null,tag[]>= markerVarTags_internal;
+
 /** Data for array rows [`markerInfo`](#markerinfo)  */
 export interface markerInfoData {
   /** Entry identifier. */
   key: Json.key<'#markerInfo'>;
   /** Marker kind */
   kind: markerKind;
+  /** Marker variable */
+  var: markerVar;
   /** Marker short name */
   name: string;
   /** Marker declaration or description */
@@ -101,6 +129,7 @@ export const jMarkerInfoData: Json.Loose<markerInfoData> =
     key: Json.jFail(Json.jKey<'#markerInfo'>('#markerInfo'),
            '#markerInfo expected'),
     kind: jMarkerKindSafe,
+    var: jMarkerVarSafe,
     name: Json.jFail(Json.jString,'String expected'),
     descr: Json.jFail(Json.jString,'String expected'),
   });
@@ -112,10 +141,11 @@ export const jMarkerInfoDataSafe: Json.Safe<markerInfoData> =
 /** Natural order for `markerInfoData` */
 export const byMarkerInfoData: Compare.Order<markerInfoData> =
   Compare.byFields
-    <{ key: Json.key<'#markerInfo'>, kind: markerKind, name: string,
-       descr: string }>({
+    <{ key: Json.key<'#markerInfo'>, kind: markerKind, var: markerVar,
+       name: string, descr: string }>({
     key: Compare.string,
     kind: byMarkerKind,
+    var: byMarkerVar,
     name: Compare.alpha,
     descr: Compare.string,
   });

ivette/src/renderer/ASTview.tsx

@@ -133,18 +133,8 @@ const ASTview = () => {
   async function onContextMenu(id: key<'#markerInfo'>) {
     const items = [];
     const selectedMarkerInfo = markersInfo.find((e) => e.key === id);
-    switch (selectedMarkerInfo?.kind) {
-      case 'function': {
-        items.push({
-          label: `Go to definition of ${selectedMarkerInfo.name}`,
-          onClick: () => {
-            const location = { function: selectedMarkerInfo.name };
-            updateSelection({ location });
-          },
-        });
-        break;
-      }
-      case 'declaration': {
+    if (selectedMarkerInfo?.var === 'function') {
+      if (selectedMarkerInfo.kind === 'declaration') {
         if (selectedMarkerInfo?.name) {
           const locations = await functionCallers(selectedMarkerInfo.name);
           const locationsByFunction = _.groupBy(locations, (e) => e.function);
@@ -162,10 +152,15 @@ const ASTview = () => {
               });
             });
         }
-        break;
+      } else {
+        items.push({
+          label: `Go to definition of ${selectedMarkerInfo.name}`,
+          onClick: () => {
+            const location = { function: selectedMarkerInfo.name };
+            updateSelection({ location });
+          },
+        });
       }
-      default:
-        break;
     }
     if (items.length > 0)
       Dome.popupMenu(items);

src/plugins/server/kernel_ast.ml

@@ -52,8 +52,6 @@ module MarkerKind = struct
       ~descr:(Md.plain (String.capitalize_ascii name))
       kinds
 
-  let var  = kind "variable"
-  let fct  = kind "function"
   let expr = kind "expression"
   let lval = kind "lvalue"
   let decl = kind "declaration"