[DYN-8997] CBN output port to show the name of the variable (#16300)

ivaylo-matov · web-flow · commit 1fc55b56c51f · 2025-07-08T20:47:36.000-04:00
diff --git a/src/DynamoCore/Graph/Nodes/CodeBlockNode.cs b/src/DynamoCore/Graph/Nodes/CodeBlockNode.cs
@@ -41,6 +41,8 @@ public class CodeBlockNodeModel : NodeModel
         private string code = string.Empty;
         private List<string> inputIdentifiers = new List<string>();
         private List<string> inputPortNames = new List<string>();
+        private List<string> outputPortNames = new List<string>();
+        private List<string> outputPortTooltips = new List<string>();
         private string previewVariable;
         private readonly LibraryServices libraryServices;
 
@@ -783,6 +785,9 @@ private void ProcessCode(out string errorMessage, out string warningMessage,
             ParseParam = new ParseParam(GUID, code, resolver);
 
             codeStatements.Clear();
+            outputPortNames.Clear();
+            outputPortTooltips.Clear();
+
             try
             {
                 var priorNames = libraryServices.GetPriorNames();
@@ -797,7 +802,20 @@ private void ProcessCode(out string errorMessage, out string warningMessage,
                         {
                             // Create a statement variable from the generated nodes
                             codeStatements.Add(Statement.CreateInstance(parsedNode));
-                        }                        
+
+                            if (parsedNode is BinaryExpressionNode binExp)
+                            {
+                                var right = binExp.RightNode;
+                                var left = binExp.LeftNode;
+
+                                var portLabel = IsTempIdentifier(left.Name)
+                                    ? CodeBlockUtils.InferStaticTypeFromNode(right)
+                                    : left.Name;
+
+                                outputPortNames.Add(portLabel);
+                            }
+                        }
+                        outputPortTooltips = CodeBlockUtils.GetCleanedCodeExpressionsForTooltips(code);
                     }
                     else
                     {
@@ -1007,15 +1025,26 @@ private void SetOutputPorts()
             // Clear out all the output port models
             OutPorts.RemoveAll((p) => true);
 
+            int i = 0;
+
             foreach (var def in allDefs)
             {
+                if (i >= outputPortNames.Count) break;
+
+                var label = outputPortNames[i];
                 var tooltip = IsTempIdentifier(def.Key) ? string.Format(Resources.CodeBlockTempIdentifierOutputLabel, def.Value) : def.Key;
 
-                OutPorts.Add(new PortModel(PortType.Output, this, new PortData(string.Empty, tooltip)
+                // Trim long labels
+                int maxLength = Configurations.CBNMaxPortNameLength;
+                if (label.Length > maxLength) label = label.Remove(maxLength - 3) + "...";
+
+                OutPorts.Add(new PortModel(PortType.Output, this, new PortData(label, tooltip)
                 {
                     LineIndex = def.Value - 1, // Logical line index.
                     Height = Configurations.CodeBlockOutputPortHeightInPixels,
                 }));
+
+                i++;
             }
         }
 
@@ -1269,7 +1298,7 @@ private string LocalizeIdentifier(string identifierName)
             return string.Format("{0}_{1}", identifierName, AstIdentifierGuid);
         }
 
-        
+
 
         private class IdentifierInPlaceMapper : AstReplacer
         {
@@ -1496,7 +1525,7 @@ public static void GetReferencedVariables(Node astNode, List<Variable> refVariab
                 //Or node not completely implemented YET
             }
         }
-        
+
         /// <summary>
         /// Returns the names of the variables that have been declared in the statement
         /// </summary>
@@ -1708,7 +1737,7 @@ public Variable(IdentifierNode identNode)
             Row = identNode.line;
             StartColumn = identNode.col;
         }
-        
+
         /// <summary>
         /// Moves column index back only if variable is not an expression.
         /// </summary>
diff --git a/src/DynamoCore/Graph/Nodes/CodeBlockUtils.cs b/src/DynamoCore/Graph/Nodes/CodeBlockUtils.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Dynamo.Configuration;
+using ProtoCore.AST.AssociativeAST;
 
 namespace Dynamo.Graph.Nodes
 {
@@ -265,6 +266,72 @@ internal static IOrderedEnumerable<KeyValuePair<string, int>> GetDefinitionLineI
 
             return locationMap.OrderBy(p => p.Value);
         }
+
+        /// <summary>
+        /// Extracts cleaned individual code expressions as tooltip strings from a full code block.
+        /// </summary>
+        internal static List<string> GetCleanedCodeExpressionsForTooltips(string code)
+        {
+            if (string.IsNullOrWhiteSpace(code))
+                return new List<string>();
+
+            // Filter out full-line comments and remove inline comments
+            var cleanedCode = string.Join(" ",
+                code.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+                    .Where(line => !line.TrimStart().StartsWith("//"))
+                    .Select(line =>
+                    {
+                        var idx = line.IndexOf("//");
+                        return idx >= 0 ? line.Substring(0, idx) : line;
+                    }));
+
+            // Split by semicolon and return trimmed expressions
+            return cleanedCode
+                .Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(expr => expr.Trim())
+                .Where(expr => !string.IsNullOrEmpty(expr))
+                .Select(expr => expr + ";")
+                .ToList();
+        }
+
+        /// <summary>
+        /// Infers a human-readable static type label (e.g., [int], [string]) from an associative AST node.
+        /// </summary>
+        internal static string InferStaticTypeFromNode(AssociativeNode node)
+        {
+            if (node == null) return null;
+
+            switch (node)
+            {
+                case IntNode:
+                    return "[int]";
+                case DoubleNode:
+                    return "[double]";
+                case BooleanNode:
+                    return "[bool]";
+                case StringNode:
+                    return "[string]";
+                case NullNode:
+                    return "[null]";
+                case CharNode:
+                    return "[char]";
+                case ExprListNode:
+                case ArrayNode:
+                    return "[list]";
+                case RangeExprNode:
+                    return "[range]";
+                case IdentifierNode idNode:
+                    return idNode.Value;
+                case IdentifierListNode:
+                    return "[identifier list]";
+                case FunctionCallNode:
+                    return "[function]";
+                case InlineConditionalNode:
+                    return "[conditional]";
+                default:
+                    return "[unknown]";
+            }
+        }
     }
 
     /// <summary>
diff --git a/src/DynamoCore/Properties/Resources.en-US.resx b/src/DynamoCore/Properties/Resources.en-US.resx
@@ -926,4 +926,4 @@ This package likely contains an assembly that is blocked. You will need to load
   <data name="ToastFileNodeAutoCompleteDoubleClick" xml:space="preserve">
     <value>Click on the sparkle icon next to the port to activate Node Autocomplete.</value>
   </data>
-</root>
+</root>
diff --git a/src/DynamoCore/Properties/Resources.resx b/src/DynamoCore/Properties/Resources.resx
@@ -929,4 +929,4 @@ This package likely contains an assembly that is blocked. You will need to load
   <data name="ToastFileNodeAutoCompleteDoubleClick" xml:space="preserve">
     <value>Click on the sparkle icon next to the port to activate Node Autocomplete.</value>
   </data>
-</root>
+</root>
diff --git a/src/DynamoCoreWpf/Controls/OutPorts.xaml.cs b/src/DynamoCoreWpf/Controls/OutPorts.xaml.cs
@@ -304,18 +304,17 @@ private void OnDataContextChanged(object sender, DependencyPropertyChangedEventA
             if (viewModel.IsPortCondensed)
             {
                 MainGrid.Height = 14;
-                MainGrid.Margin = new Thickness(0,3,0,0);
-
-                PortBackgroundBorder.CornerRadius = new CornerRadius(0);
-                PortBackgroundBorder.BorderThickness = new Thickness(0);
-                PortBackgroundBorder.Height = 14;
-                PortBackgroundBorder.Width = 20;
-                PortBackgroundBorder.Background = _midGrey;
-                portBackGroundColor = _midGrey;
-                PortBackgroundBorder.BorderBrush = Brushes.Transparent;
-                PortNameTextBox.Margin = new Thickness(12,1,0,0);
+                MainGrid.Margin = new Thickness(0, 3, 0, 0);
+
+                PortBackgroundBorder.CornerRadius = new CornerRadius(4, 0, 0, 4);
+                PortBackgroundBorder.Height = 13;
+
                 PortNameGrid.Height = 14;
-                PortNameGrid.Margin = new Thickness(0, 1, 2, 0);
+                PortNameGrid.Margin = new Thickness(0, 2, 2, 0);
+                PortNameTextBox.Margin = new Thickness(9, 0, 0, 1);
+                PortNameTextBox.FontSize = 9;
+                PortNameTextBox.MaxWidth = 100;
+                PortNameTextBox.TextTrimming = TextTrimming.CharacterEllipsis;
             }
         }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs
@@ -33,6 +33,13 @@ public class AnnotationViewModel : ViewModelBase
         private IEnumerable<Configuration.StyleItem> preferencesStyleItemsList;
         private PreferenceSettings preferenceSettings;
 
+        // Collapsed proxy ports for Code Block Nodes appear visually misaligned - 0.655px
+        // taller compared to their actual ports. This is due to the fixed height - 16.345px
+        // used inside CBNs for code lines, while proxy ports use 14px height + 3px top margin.
+        // To compensate for this visual mismatch and keep connector alignment consistent,
+        // we apply this adjusted proxy height.
+        private const double CodeBlockCollapsedPortVisualHeight = 17;
+
         public readonly WorkspaceViewModel WorkspaceViewModel;
 
         #region Properties
@@ -809,7 +816,7 @@ private Point2D CalculatePortPosition(PortModel portModel, double verticalPositi
                     if (portModel.Owner is CodeBlockNodeModel)
                     {
                         // Special case because code block outputs are smaller than regular outputs.
-                        return new Point2D(Left + Width, y - 8);
+                        return new Point2D(Left + Width, y - 7);
                     }
                     return new Point2D(Left + Width, y);
             }
diff --git a/test/core/dummy_node/2080_JSONTESTCRASH undo_redo.dyn b/test/core/dummy_node/2080_JSONTESTCRASH undo_redo.dyn
@@ -37,7 +37,7 @@
       "Outputs": [
         {
           "Id": "8234ec6cc018433da0605ddfb17cdc2b",
-          "Name": "",
+          "Name": "[int]",
           "Description": "Value of expression at line 1",
           "UsingDefaultValue": false,
           "Level": 2,

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`"Outputs": [`
`38`	`38`	`{`
`39`	`39`	`"Id": "8234ec6cc018433da0605ddfb17cdc2b",`
`40`		`- "Name": "",`
	`40`	`+ "Name": "[int]",`
`41`	`41`	`"Description": "Value of expression at line 1",`
`42`	`42`	`"UsingDefaultValue": false,`
`43`	`43`	`"Level": 2,`