Fix: make Toolbar components support CallExpressionKw

src/components/Toolbar/EqualAngle.tsx

@@ -57,7 +57,7 @@ export function equalAngleInfo({
   )
   const isAllTooltips = nodes.every(
     (node) =>
-      node?.type === 'CallExpression' &&
+      (node?.type === 'CallExpression' || node?.type === 'CallExpressionKw') &&
       toolTips.includes(node.callee.name as any)
   )
 

src/components/Toolbar/EqualLength.tsx

@@ -52,7 +52,7 @@ export function setEqualLengthInfo({
   )
   const isAllTooltips = nodes.every(
     (node) =>
-      node?.type === 'CallExpression' &&
+      (node?.type === 'CallExpression' || node?.type === 'CallExpressionKw') &&
       toolTips.includes(node.callee.name as any)
   )
 

src/components/Toolbar/HorzVert.tsx

@@ -32,7 +32,7 @@ export function horzVertInfo(
 
   const isAllTooltips = nodes.every(
     (node) =>
-      node?.type === 'CallExpression' &&
+      (node?.type === 'CallExpression' || node?.type === 'CallExpressionKw') &&
       toolTips.includes(node.callee.name as any)
   )
 

src/components/Toolbar/Intersect.tsx

@@ -98,7 +98,7 @@ export function intersectInfo({
   )
   const isAllTooltips = nodes.every(
     (node) =>
-      node?.type === 'CallExpression' &&
+      (node?.type === 'CallExpression' || node?.type === 'CallExpressionKw') &&
       [
         ...toolTips,
         'startSketchAt', // TODO probably a better place for this to live

src/components/Toolbar/RemoveConstrainingValues.tsx

@@ -50,7 +50,7 @@ export function removeConstrainingValuesInfo({
     : selectionRanges
   const isAllTooltips = nodes.every(
     (node) =>
-      node?.type === 'CallExpression' &&
+      (node?.type === 'CallExpression' || node?.type === 'CallExpressionKw') &&
       toolTips.includes(node.callee.name as any)
   )
 

src/components/Toolbar/SetAbsDistance.tsx

@@ -45,11 +45,10 @@ export function absDistanceInfo({
       ? 'xAbs'
       : 'yAbs'
   const _nodes = selectionRanges.graphSelections.map(({ codeRef }) => {
-    const tmp = getNodeFromPath<Expr>(
+    const tmp = getNodeFromPath<Expr>(kclManager.ast, codeRef.pathToNode, [
-      kclManager.ast,
+      'CallExpression',
-      codeRef.pathToNode,
+      'CallExpressionKw',
-      'CallExpression'
+    ])
-    )
     if (err(tmp)) return tmp
     return tmp.node
   })
@@ -59,7 +58,7 @@ export function absDistanceInfo({
 
   const isAllTooltips = nodes.every(
     (node) =>
-      node?.type === 'CallExpression' &&
+      (node?.type === 'CallExpression' || node?.type === 'CallExpressionKw') &&
       toolTips.includes(node.callee.name as any)
   )
 

src/components/Toolbar/SetAngleBetween.tsx

@@ -57,7 +57,7 @@ export function angleBetweenInfo({
   )
   const isAllTooltips = nodes.every(
     (node) =>
-      node?.type === 'CallExpression' &&
+      (node?.type === 'CallExpression' || node?.type === 'CallExpressionKw') &&
       toolTips.includes(node.callee.name as any)
   )
 

src/components/Toolbar/SetHorzVertDistance.tsx

@@ -61,7 +61,7 @@ export function horzVertDistanceInfo({
   )
   const isAllTooltips = nodes.every(
     (node) =>
-      node?.type === 'CallExpression' &&
+      (node?.type === 'CallExpression' || node?.type === 'CallExpressionKw') &&
       [
         ...toolTips,
         'startSketchAt', // TODO probably a better place for this to live