Bump js-yaml from 4.2.0 to 5.0.0 in /extensions/ql-vscode

extensions/ql-vscode/package.json

@@ -2082,7 +2082,7 @@
     "d3": "^7.9.0",
     "d3-graphviz": "^5.6.0",
     "fs-extra": "^11.1.1",
-    "js-yaml": "^4.2.0",
+    "js-yaml": "^5.0.0",
     "koffi": "^2.15.5",
     "msw": "^2.14.6",
     "nanoid": "^5.0.7",

extensions/ql-vscode/src/packaging/qlpack-file-loader.ts

@@ -11,7 +11,10 @@ const qlpackFileValidate = ajv.compile(qlpackFileSchemaJson);
 export async function loadQlpackFile(path: string): Promise<QlPackFile> {
   const qlpackFileText = await readFile(path, "utf8");
 
-  let qlPack = load(qlpackFileText) as QlPackFile | undefined;
+  let qlPack: QlPackFile | undefined;
+  if (qlpackFileText.trim()) {
+    qlPack = load(qlpackFileText) as QlPackFile | undefined;
+  }
 
   if (qlPack === undefined || qlPack === null) {
     // An empty file is not valid according to the schema since it's not an object,

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -565,6 +565,13 @@ export class QueryHistoryManager extends DisposableObject {
   }
 
   async handleRemoveHistoryItem(items: QueryHistoryInfo[]) {
+    // Capture the current item before any async operations. VS Code may fire
+    // onDidChangeSelection asynchronously during awaits below (e.g. after the
+    // tree is refreshed by remove()), changing treeDataProvider.getCurrent() to
+    // an unexpected item. By saving it up front we can restore the correct
+    // selection afterwards.
+    const previousCurrent = this.treeDataProvider.getCurrent();
+
     await Promise.all(
       items.map(async (item) => {
         if (item.t === "local") {
@@ -602,8 +609,22 @@ export class QueryHistoryManager extends DisposableObject {
     );
 
     await this.writeQueryHistory();
-    const current = this.treeDataProvider.getCurrent();
+
+    // If the previously-current item is still in history (i.e. it was not one
+    // of the items being removed), keep it as the current item. Otherwise fall
+    // back to whatever getCurrent() returns, which was set by remove() when the
+    // current item itself was deleted.
+    const current =
+      previousCurrent !== undefined &&
+      this.treeDataProvider.allHistory.includes(previousCurrent)
+        ? previousCurrent
+        : this.treeDataProvider.getCurrent();
+
     if (current !== undefined) {
+      // Explicitly sync the internal current-item state before revealing, in
+      // case a deferred onDidChangeSelection event changed it during the awaits
+      // above.
+      this.treeDataProvider.setCurrentItem(current);
       await this.treeView.reveal(current, { select: true });
       await this.openQueryResults(current);
     }

extensions/ql-vscode/test/unit-tests/common/qlpack-language.test.ts

@@ -111,6 +111,13 @@ describe("getQlPackLanguage", () => {
     await expect(getQlPackLanguage(tmpDir.name)).rejects.toBeDefined();
   });
 
+  it("should find nothing when the qlpack file is empty", async () => {
+    await outputFile(qlpackPath, "");
+
+    const result = await getQlPackLanguage(qlpackPath);
+    expect(result).toEqual(undefined);
+  });
+
   it("should throw when the file is invalid YAML", async () => {
     await outputFile(qlpackPath, `name: test\n  foo: bar`);
 

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/query-history-manager.test.ts

@@ -331,10 +331,9 @@ describe("QueryHistoryManager", () => {
           .spyOn(dialog, "showBinaryChoiceDialog")
           .mockResolvedValue(true);
 
-        showInformationMessageWithActionSpy = jest.spyOn(
-          dialog,
-          "showInformationMessageWithAction",
-        );
+        showInformationMessageWithActionSpy = jest
+          .spyOn(dialog, "showInformationMessageWithAction")
+          .mockResolvedValue(false);
       });
 
       describe("when in progress", () => {