Merge branch 'mr/1622-misc-change-on-Show-Graph' into 'master'

Misc changes in Graph Visualizers

See merge request eng/ide/ada_language_server!2084

Author: AnthonyLeonardoGracio

integration/vscode/ada/src/alsVisualizerProvider/CPPVisualizerHandler.ts

@@ -1,5 +1,7 @@
 import * as vscode from 'vscode';
 import { VisualizerHandler } from '../alsVisualizerProvider';
+import { Hierarchy } from '../visualizerTypes';
+import * as fs from 'fs';
 
 /**
  * Specialization of the Generic Visualizer Handler for C/CPP language.
@@ -22,4 +24,18 @@ export class CPPVisualizerHandler extends VisualizerHandler {
         label = label.split('(')[0];
         return super.getParentSymbolWholeRange(symbol, label, location);
     }
+
+    async getBodyLocation(location: vscode.Location, hierarchy: Hierarchy) {
+        if (!fs.existsSync(location.uri.fsPath)) return null;
+        if (hierarchy === Hierarchy.TYPE) return [location];
+
+        // The Go To Implementation is not implemented in Clangd so we use the
+        // Go To Definition.
+        const implementations = await vscode.commands.executeCommand<
+            (vscode.Location | vscode.LocationLink)[]
+        >('vscode.executeDefinitionProvider', location.uri, location.range.start);
+
+        if (implementations.length > 0) return implementations;
+        return null;
+    }
 }

integration/vscode/ada/src/visualizing/App.tsx

@@ -294,7 +294,7 @@ function handleReveal(response: RevealReferencesResponse) {
     if (referencesPickerMenu)
         setReferencesPickerMenu({ ...referencesPickerMenu, locationsMap: locationsMap });
     else if (nodeContextMenu) {
-        setNodeContextMenu({ ...nodeContextMenu, locationsMap: locationsMap });
+        setNodeContextMenu({ ...nodeContextMenu, locationsMap: locationsMap, receivedData: true });
     }
 }
 
@@ -689,6 +689,7 @@ export default function App() {
                                 ? pane.height - event.clientY
                                 : undefined,
                         locationsMap: new Map(),
+                        receivedData: false,
                         pane: pane,
                         onContextClose: onNodeContextClose,
                         deleteNodes: deleteNodes,
@@ -859,6 +860,7 @@ export default function App() {
                     onFocus={onFocus}
                     maxZoom={maxZoom}
                     minZoom={minZoom}
+                    deleteKeyCode={[]}
                     nodeTypes={nodeTypes}
                     edgeTypes={edgeTypes}
                     onKeyDown={onKeyDown}
@@ -881,7 +883,7 @@ export default function App() {
                     onNodeDoubleClick={onNodeDoubleClick}
                     onNodeContextMenu={onNodeContextMenu}
                     selectionMode={SelectionMode.Partial}
-                    deleteKeyCode={[]}
+                    defaultViewport={{ x: 0, y: 0, zoom: 0.4 }}
                     connectionLineComponent={floatingConnectionLine}
                     className="visualizer__colors"
                 >

integration/vscode/ada/src/visualizing/customNodes.tsx

@@ -259,12 +259,7 @@ function BasicNode(node: NodeProps<DataNode>) {
     );
 
     return (
-        <div
-            tabIndex={0}
-            className={nodeClass}
-            data-node-id={data.id}
-            title={(data.inProject ? '' : '[out of project] ') + data.label}
-        >
+        <div tabIndex={0} className={nodeClass} data-node-id={data.id}>
             {/* Hide the handles in the node and make them invisible as the user does not need to
             connect edges. */}
             <Handle
@@ -287,15 +282,23 @@ function BasicNode(node: NodeProps<DataNode>) {
             />
             {/* The upper part of the node that contains the name of the symbol
             and its kind as an icon. */}
-            <div className="visualizer__node-title">
+            <div
+                className="visualizer__node-title"
+                title={(data.inProject ? '' : '[out of project] ') + data.label}
+            >
                 <span className={iconClass} style={{ color: color }}></span>
                 <div className={'visualizer__text visualizer__ellipsis-text'}>{data.label}</div>
             </div>
             {/* The lower part of the node that contains information about the symbol. */}
             <div className="visualizer__node-body">
-                <div className="visualizer__ellipsis-text">File : {fileName}</div>
-                <div className="visualizer__ellipsis-text">
-                    Position : {data.string_location.position}
+                <div className="visualizer__ellipsis-text" title={'File: ' + fileName}>
+                    <b>File</b>: {fileName}
+                </div>
+                <div
+                    className="visualizer__ellipsis-text"
+                    title={'Position: ' + data.string_location.position}
+                >
+                    <b>Position</b>: {data.string_location.position}
                 </div>
             </div>
             {/* The super class button allows requesting the parents of the node. */}

integration/vscode/ada/src/visualizing/nodeContextMenu.tsx

@@ -28,6 +28,7 @@ export type NodeContextMenuProps = {
     right: number | undefined;
     bottom: number | undefined;
     locationsMap: Map<string, StringLocation[]>;
+    receivedData: boolean;
     pane: DOMRect;
     onContextClose: () => void;
     deleteNodes: (toDeleteId: string[], recursive: boolean) => void;
@@ -207,6 +208,15 @@ export function NodeContextMenu(props: NodeContextMenuProps) {
     if (locations.length === 0 && props.locationsMap.size > 0) {
         referencePickerCreateList(props.locationsMap, locations, onClick, true);
     }
+    // Else if data was received but the locationsMap is still empty,
+    // add a single element to indicate to the user there are no references.
+    else if (props.receivedData) {
+        locations.push(
+            <li className='"visualizer__references-picker-item' key="No references">
+                <i>No references found</i>
+            </li>,
+        );
+    }
 
     let left: number | undefined = undefined;
     let right: number | undefined = undefined;

integration/vscode/ada/src/visualizing/referencesPickerMenu.tsx

@@ -316,7 +316,7 @@ export function ReferencesPickerMenu(props: ReferencesPickerMenuProps) {
     else {
         locations.push(
             <li className='"visualizer__references-picker-item' key="No references">
-                No references found
+                <i>No references found</i>
             </li>,
         );
     }

integration/vscode/ada/src/visualizing/visualizerStyleSheet.css

@@ -102,7 +102,7 @@ body {
     border-bottom: inherit;
 }
 
-/* Style the text in the body of the node. */
+/* Style the text in the title of the node. */
 .visualizer__text {
     margin-left: 3px;
     margin-bottom: 10px;
@@ -115,6 +115,11 @@ body {
     transform: translateY(15%);
 }
 
+.visualizer__node-body-elem {
+    padding-top: 5%;
+    padding-bottom: 5%;
+}
+
 /* Make sure the text doesn't overflow out of its container */
 .visualizer__ellipsis-text {
     white-space: nowrap;