fix: update

Author: wenytang-ms

AGENTS.md

@@ -0,0 +1,38 @@
+# vscode-java-dependency (Project Manager for Java)
+
+VS Code Java 项目管理器，提供项目结构浏览和依赖管理。
+
+## 项目定位
+
+- **仓库**: https://github.com/microsoft/vscode-java-dependency
+- **Extension ID**: vscjava.vscode-java-dependency
+- **构建工具**: npm + Webpack
+- **入口**: `main.js`
+
+## 目录结构
+
+```
+src/
+├── controllers/  # 命令和上下文管理
+├── views/        # 项目浏览器树视图
+├── tasks/        # 项目任务
+├── java/         # JDT LS 集成
+└── utility/      # 工具函数
+
+server/
+└── com.microsoft.jdtls.ext.core-*.jar  # JDT LS 扩展插件
+```
+
+## 关键功能
+
+- Java Projects 树视图 (层级结构浏览)
+- 创建/脚手架 Java 项目
+- 管理引用库 (JAR 文件)
+- 导出 JAR 功能
+- 包和类成员浏览
+- Copilot/AI 辅助探索支持
+
+## 依赖关系
+
+**依赖**: vscode-java (redhat.java)
+**被依赖**: vscode-java-pack

test/e2e/tests/fileOperations.test.ts

@@ -69,19 +69,27 @@ test.describe("File Operations", () => {
         // Expand to AppToRename
         await JavaOperator.expandTreePath(page, "my-app", "src/main/java", "com.mycompany.app");
 
-        // Click AppToRename and open context menu
+        // Select AppToRename and trigger rename via F2
         const appToRename = page.getByRole(VSCode.TREE_ITEM_ROLE, { name: "AppToRename" }).first();
         await appToRename.click();
-        await appToRename.click({ button: "right" });
         await page.waitForTimeout(Timeout.CLICK);
-
-        // Click Rename in context menu
-        const renameItem = page.locator(".context-view .action-item a.action-label", { hasText: "Rename" });
-        await renameItem.click();
+        await page.keyboard.press("F2");
         await page.waitForTimeout(Timeout.CLICK);
 
-        // Fill in new name
-        await VscodeOperator.fillQuickInput(page, "AppRenamed");
+        // VS Code may show either a quick-input dialog or an inline rename editor.
+        // Try the inline rename input first (common in modern VS Code).
+        const inlineInput = page.locator(".monaco-inputbox input.rename-input");
+        const quickInput = page.locator(".quick-input-widget input.input");
+
+        if (await inlineInput.isVisible({ timeout: 3_000 }).catch(() => false)) {
+            await inlineInput.fill("AppRenamed");
+            await inlineInput.press(VSCode.ENTER);
+        } else if (await quickInput.isVisible({ timeout: 3_000 }).catch(() => false)) {
+            await quickInput.fill("AppRenamed");
+            await quickInput.press(VSCode.ENTER);
+        }
+
+        await page.waitForTimeout(Timeout.CLICK);
 
         // Handle confirmation dialog if it appears
         try {
@@ -93,33 +101,25 @@ test.describe("File Operations", () => {
         // Editor should open with renamed file
         const tabFound = await VscodeOperator.waitForEditorTab(page, "AppRenamed.java");
         expect(tabFound).toBeTruthy();
-
-        // Save via command to avoid focus issues
-        await VscodeOperator.saveActiveEditor(page);
     });
 
     test("delete Java file", async ({ page }) => {
         await JavaOperator.collapseFileExplorer(page);
         await JavaOperator.expandTreePath(page, "my-app", "src/main/java", "com.mycompany.app");
 
+        // Select AppToDelete and press Delete key
         const appToDelete = page.getByRole(VSCode.TREE_ITEM_ROLE, { name: "AppToDelete" }).first();
         await appToDelete.click();
-        await appToDelete.click({ button: "right" });
         await page.waitForTimeout(Timeout.CLICK);
-
-        // Click Delete or "Delete Permanently"
-        const deleteItem = page.locator(".context-view .action-item a.action-label")
-            .filter({ hasText: /^Delete/ });
-        await deleteItem.first().click();
+        await page.keyboard.press("Delete");
         await page.waitForTimeout(Timeout.CLICK);
 
         // Confirm deletion in dialog
         try {
-            // Try common button labels
             const dialog = page.locator(".monaco-dialog-box");
             await dialog.waitFor({ state: "visible", timeout: 5_000 });
             const confirmBtn = dialog.getByRole(VSCode.BUTTON_ROLE)
-                .filter({ hasText: /Move to Recycle Bin|Delete|OK/ });
+                .filter({ hasText: /Move to Trash|Move to Recycle Bin|Delete|OK/ });
             await confirmBtn.first().click();
         } catch {
             // Dialog may not appear

test/e2e/tests/libraries.test.ts

@@ -32,26 +32,21 @@ test.describe("Libraries & Project Creation", () => {
         });
 
         test("add and remove JAR library", async ({ page }) => {
-            // Expand to Referenced Libraries
-            await JavaOperator.expandTreePath(page, "invisible", "Referenced Libraries");
-
-            // Click the add button on Referenced Libraries
-            await VscodeOperator.clickTreeItemAction(
-                page,
-                "Referenced Libraries",
-                "Add Jar Libraries to Project Classpath"
-            );
-
-            // Type the jar path in the input
+            // Use command palette to add a JAR — the "Referenced Libraries" node
+            // only appears in the tree after a library has been added.
             const testRoot = path.join(__dirname, "..", "..", "..");
             const jarPath = path.join(testRoot, "test", "invisible", "libSource", "simple.jar");
+
+            await VscodeOperator.executeCommand(page, "Java: Add Jar Libraries to Project Classpath");
+            await page.waitForTimeout(Timeout.CLICK);
             await VscodeOperator.fillQuickInput(page, jarPath);
 
             // Wait for tree to update and verify the jar appears
+            await JavaOperator.focusJavaProjects(page);
             const added = await VscodeOperator.waitForTreeItem(page, "simple.jar", 15_000);
             expect(added).toBeTruthy();
 
-            // Now remove it
+            // Now remove it via tree action
             await VscodeOperator.clickTreeItem(page, "simple.jar");
             await VscodeOperator.clickTreeItemAction(page, "simple.jar", "Remove from Project Classpath");
 
@@ -73,15 +68,14 @@ test.describe("Libraries & Project Creation", () => {
             const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "java-new-project-"));
 
             await VscodeOperator.executeCommand(page, "Java: Create Java Project");
-            await page.waitForTimeout(Timeout.CLICK);
+            // The build-tool quick pick may take a moment to appear
+            await page.waitForTimeout(Timeout.TREE_EXPAND);
 
             // Select "No build tools"
             await VscodeOperator.selectQuickPickItem(page, "No build tools");
 
-            // Enter the project location
-            await VscodeOperator.fillQuickInput(page, tmpDir);
-
-            // Enter the project name
+            // The project location dialog uses a native file picker on some platforms.
+            // Enter the project name when prompted.
             await VscodeOperator.fillQuickInput(page, "helloworld");
 
             // Wait for project files to be created

test/e2e/tests/projectExplorer.test.ts

@@ -41,7 +41,9 @@ test.describe("Project Explorer", () => {
         const packageVisible = await VscodeOperator.waitForTreeItem(page, "com.mycompany.app", 15_000);
         expect(packageVisible).toBeTruthy();
 
-        const classVisible = await VscodeOperator.isTreeItemVisible(page, "App");
+        // Use exact match to avoid matching "app", "App.java", "AppToDelete" etc.
+        const classVisible = await page.getByRole(VSCode.TREE_ITEM_ROLE, { name: "App", exact: true })
+            .isVisible().catch(() => false);
         expect(classVisible).toBeTruthy();
     });
 

test/e2e/utils/javaOperator.ts

@@ -70,18 +70,28 @@ export default class JavaOperator {
     /**
      * Expands tree items along a path (e.g. "my-app" → "src/main/java" → "com.mycompany.app").
      *
-     * Checks `aria-expanded` before clicking so that an already-expanded node
-     * is not accidentally collapsed (VS Code auto-expands single-child trees).
+     * Waits for each item's `aria-expanded` attribute to appear before clicking,
+     * because VS Code only sets it after the tree data provider's `getChildren()`
+     * has returned — until then the node is treated as a leaf.
      */
     static async expandTreePath(page: Page, ...labels: string[]): Promise<void> {
         for (const label of labels) {
             const item = page.getByRole(VSCode.TREE_ITEM_ROLE, { name: label }).first();
             await item.waitFor({ state: "visible", timeout: 15_000 });
+
+            // Wait for the node to become expandable (aria-expanded present).
+            await expect.poll(async () => {
+                return await item.getAttribute("aria-expanded");
+            }, {
+                message: `Tree item "${label}" did not become expandable`,
+                timeout: 15_000,
+            }).toBeTruthy();
+
             const expanded = await item.getAttribute("aria-expanded");
             if (expanded !== "true") {
                 await item.click();
+                await page.waitForTimeout(Timeout.TREE_EXPAND);
             }
-            await page.waitForTimeout(Timeout.TREE_EXPAND);
         }
     }