⅄ trunk → 25-11-05-difftool

Author: mitchellwrosen

parser-typechecker/src/Unison/Builtin/Decls.hs

@@ -84,12 +84,13 @@ tlsSignedCertRef = lookupDeclRef "io2.Tls.SignedCert"
 
 tlsPrivateKeyRef = lookupDeclRef "io2.Tls.PrivateKey"
 
-runtimeFailureRef, arithmeticFailureRef, miscFailureRef, stmFailureRef, threadKilledFailureRef :: Reference
+runtimeFailureRef, arithmeticFailureRef, miscFailureRef, stmFailureRef, threadKilledFailureRef, asyncCancelledFailureRef :: Reference
 runtimeFailureRef = lookupDeclRef "io2.RuntimeFailure"
 arithmeticFailureRef = lookupDeclRef "io2.ArithmeticFailure"
 miscFailureRef = lookupDeclRef "io2.MiscFailure"
 stmFailureRef = lookupDeclRef "io2.STMFailure"
 threadKilledFailureRef = lookupDeclRef "io2.ThreadKilledFailure"
+asyncCancelledFailureRef = lookupDeclRef "io2.AsyncCancelledFailure"
 
 fileModeRef, filePathRef, bufferModeRef, seekModeRef, seqViewRef :: Reference
 fileModeRef = lookupDeclRef "io2.FileMode"
@@ -530,6 +531,7 @@ builtinDataDecls = rs1 ++ rs
           (v "io2.MiscFailure", miscFailure),
           (v "io2.STMFailure", stmFailure),
           (v "io2.ThreadKilledFailure", threadKilledFailure),
+          (v "io2.AsyncCancelledFailure", asyncCancelledFailure),
           (v "crypto.CryptoFailure", cryptoFailure),
           (v "RewriteTerm", rewriteTerm),
           (v "RewriteSignature", rewriteType),
@@ -799,6 +801,13 @@ builtinDataDecls = rs1 ++ rs
         []
         []
 
+    asyncCancelledFailure =
+      DataDeclaration
+        (Unique "f9fdcae7d12e37728dc7336097d4255c1277f1c7a46c6200e9d3d57b8d8d7273")
+        ()
+        []
+        []
+
     cryptoFailure =
       DataDeclaration
         (Unique "09132bf0cc3f07db75be127d141da91fdd545adcff88866268dfd428e9879742")

unison-cli/src/Unison/Codebase/Editor/HandleInput/Merge2.hs

@@ -381,7 +381,7 @@ doMerge info = do
             --                Yes                    Yes                                              Run that cool tool
 
             maybeMergetool <-
-              if not (defnsAreEmpty mergeblob.conflicts.alice)
+              if not env.isTranscriptTest && not (defnsAreEmpty mergeblob.conflicts.alice)
                 then liftIO (lookupEnv "UCM_MERGETOOL")
                 else pure Nothing
 

unison-runtime/src/Unison/Runtime/Machine.hs

@@ -518,6 +518,8 @@ encodeExn stk exc = do
               (Rf.ioFailureRef, disp be, unitValue)
           | Just (ie :: AsyncException) <- fromException exn =
               (Rf.threadKilledFailureRef, disp ie, unitValue)
+          | Just (ie :: UnliftIO.AsyncCancelled) <- fromException exn =
+              (Rf.asyncCancelledFailureRef, disp ie, unitValue)
           | Just (Panic msg v) <- fromException exn,
             msg <- Util.Text.pack $ "panic: " ++ msg =
               (Rf.miscFailureRef, msg, fromMaybe unitValue v)