Merge branch 'feature/ivette/search-ast' into 'master'

[Ivette] Allow searching text in the AST view

See merge request frama-c/frama-c!4846

ivette/src/dome/renderer/text/editor.tsx

@@ -32,7 +32,8 @@ import { DOMEventMap as EventMap } from '@codemirror/view';
 import { GutterMarker, gutter } from '@codemirror/view';
 import { Tooltip, showTooltip } from '@codemirror/view';
 import { lineNumbers, keymap } from '@codemirror/view';
-import { searchKeymap, search, openSearchPanel } from '@codemirror/search';
+import { searchKeymap, search, openSearchPanel, closeSearchPanel,
+  searchPanelOpen, gotoLine } from '@codemirror/search';
 
 import { parser } from '@lezer/cpp';
 import { tags } from '@lezer/highlight';
@@ -357,10 +358,20 @@ export const LanguageHighlighter: Extension =
 
 export const ReadOnly = EditorState.readOnly.of(true);
 
+export const toggleSearchPanel = (view: EditorView) : void => {
+  if (searchPanelOpen(view.state))
+    closeSearchPanel(view);
+  else
+    openSearchPanel(view);
+};
+
 const SearchAlternativeKey = [{ key: 'Alt-f', run: openSearchPanel }];
 const SearchKeymap = searchKeymap.slice(1).concat(SearchAlternativeKey);
 export const Search : Extension = [ search(), keymap.of(SearchKeymap) ];
 
+const GotoKeymap = [{ key: 'Alt-g', run: gotoLine }];
+export const GotoLine : Extension = [ search(), keymap.of(GotoKeymap) ];
+
 export const Selection = createSelectionField();
 function createSelectionField(): Field<EditorSelection> {
   const cursor = EditorSelection.cursor(0);

ivette/src/frama-c/kernel/ASTview.tsx

@@ -29,6 +29,7 @@ import * as Utils from 'dome/data/arrays';
 import * as States from 'frama-c/states';
 import * as Settings from 'dome/data/settings';
 import { IconButton } from 'dome/controls/buttons';
+import { Inset } from 'dome/frame/toolbars';
 import * as Ast from 'frama-c/kernel/api/ast';
 import { text } from 'frama-c/kernel/api/data';
 import * as Eva from 'frama-c/plugins/eva/api/general';
@@ -663,6 +664,7 @@ const extensions: Editor.Extension[] = [
   Editor.ReadOnly,
   Editor.FoldGutter,
   Editor.LanguageHighlighter,
+  Editor.Search,
 ];
 
 // The component in itself.
@@ -711,9 +713,21 @@ export default function ASTview(): JSX.Element {
   const taints = useTaints(scope);
   React.useEffect(() => TaintedLvalues.set(view, taints), [view, taints]);
 
+  // Toggle search panel
+  const toggleSearchPanel = React.useCallback(() => {
+    if (view) Editor.toggleSearchPanel(view);
+  }, [view]);
+
   return (
     <>
       <TitleBar>
+        <IconButton
+          icon="SEARCH"
+          enabled={!!scope}
+          onClick={toggleSearchPanel}
+          title='Search in AST'
+        />
+        <Inset />
         <IconButton
           icon={icon}
           onClick={unFoldButtonClicked}

ivette/src/frama-c/kernel/SourceCode.tsx

@@ -167,6 +167,7 @@ function useSourceFileContents(file: string | undefined): string {
 // Necessary extensions.
 const extensions: Editor.Extension[] = [
   Source,
+  Editor.GotoLine,
   Editor.Search,
   Editor.ReadOnly,
   Editor.Selection,
@@ -201,6 +202,10 @@ export default function SourceCode(): JSX.Element {
   const markerAtCursor = States.useRequestResponse(Ast.getMarkerAt, cursor);
   const { sloc: slocAtCursor } = States.useMarker(markerAtCursor);
 
+  const toggleSearchPanel = React.useCallback(() => {
+    if (view) Editor.toggleSearchPanel(view);
+  }, [view]);
+
   const openFile = React.useCallback(() => {
     if (file) openSourceFile(command, file, getCursorPosition(view));
   }, [ command, file, view ]
@@ -242,12 +247,19 @@ export default function SourceCode(): JSX.Element {
       <Ivette.TitleBar>
         <Buttons.IconButton
           icon="DUPLICATE"
-          visible={!file}
+          visible={!!file}
           onClick={openFile}
-          title='externalEditorTitle'
+          title='Open file in external editor'
         />
         <Labels.Code title={file}>{filename}</Labels.Code>
         <Toolbars.Filler />
+        <Buttons.IconButton
+          icon="SEARCH"
+          enabled={!!file}
+          onClick={toggleSearchPanel}
+          title='Search in source code'
+        />
+        <Toolbars.Inset />
         <Buttons.IconButton
           icon="HELP"
           onClick={displayShortcuts}