Merge remote-tracking branch 'origin' into kurt-circle

README.md

@@ -373,14 +373,3 @@ yarn wdio run wdio.conf.ts
 ## KCL
 
 For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/src/wasm-lib/kcl).
-
-
-- Theme removed as a project setting
-- Rename kcl Value to Expr, MemoryItem to KclValue
-- Remove ProgramReturn
-- Macro to make KCL snapshot tests easier
-- Add logical not operator using bang !
-- ensure we never execute over ourselves 
-- Unify KCL expression execution (2 + draw() didn't work)
-- Text-CAD-integration
-

src/lang/modifyAst/addFillet.ts

@@ -469,6 +469,9 @@ export const hasValidFilletSelection = ({
       if (segmentNode.node.type === 'CallExpression') {
         const segmentName = segmentNode.node.callee.name
         if (segmentName in sketchLineHelperMap) {
+          // Add check whether the tag exists at all:
+          if (!(segmentNode.node.arguments.length === 3)) return true
+          // If the tag exists, check if it is already filleted
           const edges = isTagUsedInFillet({
             ast,
             callExp: segmentNode.node,

src/lib/utils.ts

@@ -147,7 +147,7 @@ export function platform(): Platform {
       case 'sunos':
         return 'linux'
       default:
-        console.error('Unknown platform:', platform)
+        console.error('Unknown desktop platform:', platform)
         return ''
     }
   }
@@ -156,11 +156,14 @@ export function platform(): Platform {
   // it's more accurate than userAgent and userAgentData in Playwright.
   if (
     navigator.platform?.indexOf('Mac') === 0 ||
-    navigator.platform === 'iPhone'
+    navigator.platform?.indexOf('iPhone') === 0 ||
+    navigator.platform?.indexOf('iPad') === 0 ||
+    // Vite tests running in HappyDOM.
+    navigator.platform?.indexOf('Darwin') >= 0
   ) {
     return 'macos'
   }
-  if (navigator.platform === 'Win32') {
+  if (navigator.platform === 'Windows' || navigator.platform === 'Win32') {
     return 'windows'
   }
 
@@ -185,7 +188,7 @@ export function platform(): Platform {
     return 'linux'
   }
   console.error(
-    'Unknown platform userAgent:',
+    'Unknown web platform:',
     navigator.platform,
     userAgentDataPlatform,
     navigator.userAgent