Merge branch 'main' into vite

package.json

@@ -68,7 +68,7 @@
     "jsdom": "^24.0.0",
     "pptr-testing-library": "^0.7.0",
     "prettier": "2.3.2",
-    "puppeteer": "13.4.0",
+    "puppeteer": "13.7.0",
     "typescript": "^5.4.2",
     "vite-plugin-svgr": "^4.2.0",
     "vitest": "^1.3.1"

src/e2e/app.ts

@@ -196,10 +196,9 @@ export class App {
     await page.close({
       runBeforeUnload: true,
     });
-    // A delay is required to give us a chance to handle the dialog event.
-    // If this proves fragile we could wait for the success condition below
-    // and give up on testing the absence of a dialog.
-    await page.waitForTimeout(50);
+    await waitFor(() => {
+      expect(page.isClosed()).toEqual(true);
+    }, defaultWaitForOptions);
     return this.dialogs.length === 1 && this.dialogs[0] === "beforeunload";
   }
 

src/e2e/documentation.test.ts

@@ -20,6 +20,10 @@ describe("documentaion", () => {
   });
 
   it("Copy code and paste in editor", async () => {
+    if (process.platform === "darwin") {
+      // pasteToolkitCode doesn't work on Mac
+      return;
+    }
     const tab = "Reference";
     await app.selectAllInEditor();
     await app.typeInEditor("# Initial document");
@@ -33,6 +37,10 @@ describe("documentaion", () => {
   });
 
   it("Copy code after dropdown choice and paste in editor", async () => {
+    if (process.platform === "darwin") {
+      // pasteToolkitCode doesn't work on Mac
+      return;
+    }
     const tab = "Reference";
     await app.selectAllInEditor();
     await app.typeInEditor("# Initial document");

src/editor/codemirror/language-server/autocompletion.ts

@@ -19,10 +19,10 @@ import {
   CompletionItemKind,
   CompletionResolveRequest,
   CompletionTriggerKind,
-  ConnectionError,
 } from "vscode-languageserver-protocol";
 import { ApiReferenceMap } from "../../../documentation/mapping/content";
 import { LanguageServerClient } from "../../../language-server/client";
+import { isErrorDueToDispose } from "../../../language-server/error-util";
 import { Logging } from "../../../logging/logging";
 import { clientFacet, uriFacet } from "./common";
 import {
@@ -156,7 +156,7 @@ const createDocumentationResolver =
       );
       documentation = resolved.documentation;
     } catch (e) {
-      if (!(e instanceof ConnectionError)) {
+      if (!isErrorDueToDispose(e)) {
         throw e;
       }
     }

src/editor/codemirror/language-server/signatureHelp.ts

@@ -12,22 +12,22 @@ import {
   Command,
   EditorView,
   KeyBinding,
-  keymap,
-  logException,
   PluginValue,
-  showTooltip,
   ViewPlugin,
   ViewUpdate,
+  keymap,
+  logException,
+  showTooltip,
 } from "@codemirror/view";
 import { IntlShape } from "react-intl";
 import {
-  ConnectionError,
   MarkupContent,
   SignatureHelp,
   SignatureHelpParams,
   SignatureHelpRequest,
 } from "vscode-languageserver-protocol";
 import { ApiReferenceMap } from "../../../documentation/mapping/content";
+import { isErrorDueToDispose } from "../../../language-server/error-util";
 import { BaseLanguageServerView, clientFacet, uriFacet } from "./common";
 import {
   DocSections,
@@ -104,7 +104,7 @@ const triggerSignatureHelpRequest = async (
       effects: [setSignatureHelpResult.of(result)],
     });
   } catch (e) {
-    if (!(e instanceof ConnectionError)) {
+    if (!isErrorDueToDispose(e)) {
       logException(state, e, "signature-help");
     }
     view.dispatch({

src/language-server/apidocs.ts

@@ -3,12 +3,10 @@
  *
  * SPDX-License-Identifier: MIT
  */
-import {
-  ConnectionError,
-  ProtocolRequestType,
-} from "vscode-languageserver-protocol";
+import { ProtocolRequestType } from "vscode-languageserver-protocol";
 import { MarkupKind } from "vscode-languageserver-types";
 import { LanguageServerClient } from "./client";
+import { isErrorDueToDispose } from "./error-util";
 
 // This duplicates the types we added to Pyright.
 
@@ -88,10 +86,9 @@ export const apiDocs = async (
     });
     return result;
   } catch (e) {
-    if (!(e instanceof ConnectionError)) {
-      throw e;
+    if (isErrorDueToDispose(e)) {
+      return {};
     }
-    // We'll requery when the client is recreated.
-    return {};
+    throw e;
   }
 };

src/language-server/client-fs.ts

@@ -3,14 +3,11 @@
  *
  * SPDX-License-Identifier: MIT
  */
-import {
-  ConnectionError,
-  CreateFile,
-  DeleteFile,
-} from "vscode-languageserver-protocol";
-import { diff, EVENT_PROJECT_UPDATED, FileSystem, Project } from "../fs/fs";
+import { CreateFile, DeleteFile } from "vscode-languageserver-protocol";
+import { EVENT_PROJECT_UPDATED, FileSystem, Project, diff } from "../fs/fs";
 import { isPythonFile } from "../project/project-utils";
-import { createUri, LanguageServerClient } from "./client";
+import { LanguageServerClient, createUri } from "./client";
+import { isErrorDueToDispose } from "./error-util";
 
 export type FsChangesListener = (current: Project) => any;
 
@@ -84,8 +81,7 @@ export const trackFsChanges = (
         }
       }
     } catch (e) {
-      // A new listener will be initialized for a replacement connection.
-      if (!(e instanceof ConnectionError)) {
+      if (!isErrorDueToDispose(e)) {
         throw e;
       }
     }

src/language-server/client.ts

@@ -9,8 +9,6 @@ import {
   CompletionList,
   CompletionParams,
   CompletionRequest,
-  ConnectionError,
-  ConnectionErrors,
   Diagnostic,
   DiagnosticSeverity,
   DiagnosticTag,
@@ -32,6 +30,7 @@ import {
 } from "vscode-languageserver-protocol";
 import { retryAsyncLoad } from "../common/chunk-util";
 import { microPythonConfig } from "../micropython/micropython";
+import { isErrorDueToDispose } from "./error-util";
 
 /**
  * Create a URI for a source document under the default root of file:///src/.
@@ -174,10 +173,7 @@ export class LanguageServerClient extends EventEmitter {
         this.capabilities = capabilities;
         this.connection.sendNotification(InitializedNotification.type, {});
       } catch (e) {
-        if (
-          e instanceof ConnectionError &&
-          e.code === ConnectionErrors.Disposed
-        ) {
+        if (isErrorDueToDispose(e)) {
           // We've intentionally disposed the connection because we're recreating the client.
           // This mostly happens due to React 18 strict mode but could happen due to language changes.
           return false;
@@ -243,8 +239,7 @@ export class LanguageServerClient extends EventEmitter {
         params
       );
     } catch (e) {
-      // Client being recreated, give no results.
-      if (!(e instanceof ConnectionError)) {
+      if (!isErrorDueToDispose(e)) {
         throw e;
       }
     }

src/language-server/error-util.ts

@@ -0,0 +1,8 @@
+import { ConnectionError, ErrorCodes, ResponseError } from "vscode-jsonrpc";
+
+// The language server gets disposed/recreated which can cause errors for
+// initialization or in-flight requests. We ignore these when they occur.
+export const isErrorDueToDispose = (e: unknown): boolean =>
+  (e instanceof ResponseError &&
+    e.code === ErrorCodes.PendingResponseRejected) ||
+  e instanceof ConnectionError;

src/workbench/AboutDialog/AboutDialog.tsx

@@ -132,13 +132,13 @@ const AboutDialog = ({ isOpen, onClose, finalFocusRef }: AboutDialogProps) => {
                   }}
                 />
               </Text>
-              <SimpleGrid columns={[1, 1, 2, 2]} spacing={8}>
+              <SimpleGrid columns={[1, 1, 2, 2]} spacing={5}>
                 <Box>
                   <AspectRatio
                     ml="auto"
                     mr="auto"
                     ratio={690 / 562}
-                    maxWidth={[388, 388, null, null]}
+                    maxWidth={[303, 303, null, null]}
                   >
                     <Image
                       src={microbitHeartImage}