дзеркало
https://github.com/l0ng-ai/openidea.git
синхронізовано 2026-11-22 17:40:45 +02:00
Порівняти коміти
1
Коміти
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
3c659f3aed |
No files matched your search
@@ -25,6 +25,7 @@ import { pomCompletionExtension } from "./pomCompletion";
|
||||
import { pomNavigationExtension } from "./pomNavigation";
|
||||
import { buildToolsRunAnything } from "./runAnything";
|
||||
import { versionCatalogExtension } from "./versionCatalog";
|
||||
import { registerUnlinkedPom } from "./unlinkedPom";
|
||||
import {
|
||||
expandableKeys,
|
||||
gradleChildren,
|
||||
@@ -216,6 +217,7 @@ export function activate(): () => void {
|
||||
registerEditorContribution({ id: "build-tools.pomNavigation", extensions: pomNavigationExtension }),
|
||||
registerEditorContribution({ id: "build-tools.pomCompletion", extensions: pomCompletionExtension }),
|
||||
registerRunAnythingProvider(buildToolsRunAnything),
|
||||
registerUnlinkedPom(),
|
||||
registerEditorKind({
|
||||
kind: ANALYZER_KIND,
|
||||
component: lazyComponent(() => import("./DependencyAnalyzer").then((m) => m.DependencyAnalyzer)),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { afterEach, beforeEach, expect, it, vi } from "vitest";
|
||||
import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
|
||||
import { act, fireEvent, render, renderHook, screen, waitFor } from "@testing-library/react";
|
||||
import { executeAction, registerAction, allActions, isActionEnabled } from "@/platform/actions";
|
||||
import { setContext } from "@/platform/context";
|
||||
import type { BuildModel, GradleModel, ProjectInfo, RunConfig } from "@/platform/ipc";
|
||||
@@ -10,7 +10,8 @@ import { GradleView, MavenView } from "./BuildToolView";
|
||||
import { activate } from "./index";
|
||||
import { expandableKeys, gradleChildren, gradleRoots, gradleProjectKey } from "./model";
|
||||
import { executeBuildLine } from "./runAnything";
|
||||
import { classifyPickedPoms, mavenPomForImport, useBuild } from "./store";
|
||||
import { classifyPickedPoms, mavenPomForImport, suggestsLoadingPom, useBuild } from "./store";
|
||||
import { menuGroupItems, useEditorBanners } from "@/workbench/contributions";
|
||||
|
||||
const mocks = vi.hoisted(() => ({
|
||||
get: vi.fn(),
|
||||
@@ -570,3 +571,46 @@ it("does not link or start Gradle imports in an untrusted project", async () =>
|
||||
expect(mocks.link).not.toHaveBeenCalled();
|
||||
expect(mocks.sync).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("offers Add as Maven Project only for a pom.xml Maven doesn't load, and links it", async () => {
|
||||
const items = (path: string) =>
|
||||
menuGroupItems("projectView", { paths: [path], dirs: [false] }).filter(
|
||||
(i) => i.kind === "action" && i.action === "maven.addFileAsProject",
|
||||
);
|
||||
expect(items("/p/a/pom.xml")).toEqual([]);
|
||||
expect(items("/p/b/build.xml")).toEqual([]);
|
||||
expect(items("/p/b/pom.xml")).toEqual([expect.objectContaining({ action: "maven.addFileAsProject" })]);
|
||||
await act(async () => {
|
||||
await executeAction("maven.addFileAsProject", { path: "/p/b/pom.xml" });
|
||||
});
|
||||
expect(mocks.set).toHaveBeenCalledWith("project", "languages.java.maven.linkedProjects", '["b/pom.xml"]');
|
||||
});
|
||||
|
||||
it("shows a banner above an unlinked pom.xml that loads or skips it", async () => {
|
||||
const { useBanner } = useEditorBanners.getState().banners.get("maven.unlinkedPom")!;
|
||||
const banner = (path: string) => renderHook(() => useBanner(path)).result.current;
|
||||
expect(banner("/p/a/pom.xml")).toBeNull();
|
||||
expect(banner("/p/a/target/classes/META-INF/maven/x/y/pom.xml")).toBeNull();
|
||||
expect(banner("/p/a/src/test/resources/pom.xml")).toBeNull();
|
||||
const shown = banner("/p/b/pom.xml")!;
|
||||
expect(shown.text).toBe("This Maven project is not loaded");
|
||||
await act(async () => shown.actions![0]!.run());
|
||||
await waitFor(() =>
|
||||
expect(mocks.set).toHaveBeenCalledWith("project", "languages.java.maven.linkedProjects", '["b/pom.xml"]'),
|
||||
);
|
||||
await waitFor(() => expect(useBuild.getState().loading).toBe(false));
|
||||
|
||||
const skip = banner("/p/c/pom.xml")!.actions![1]!;
|
||||
act(() => skip.run());
|
||||
expect(banner("/p/c/pom.xml")).toBeNull();
|
||||
expect(banner("/p/c/sub/pom.xml")).toBeNull();
|
||||
expect(banner("/p/d/pom.xml")).not.toBeNull();
|
||||
});
|
||||
|
||||
it("stops suggesting a project the user unlinked", async () => {
|
||||
await act(async () => {
|
||||
await executeAction("maven.unlinkProjects", { pom: "a/pom.xml" });
|
||||
});
|
||||
expect(suggestsLoadingPom("a/pom.xml", useBuild.getState().settings.skippedPoms)).toBe(false);
|
||||
expect(suggestsLoadingPom("other/pom.xml", useBuild.getState().settings.skippedPoms)).toBe(true);
|
||||
});
|
||||
@@ -32,6 +32,7 @@ import { cancelTask, removeTask, upsertTask, useTasks } from "@/workbench/tasks"
|
||||
import {
|
||||
gradleRoots,
|
||||
mavenGoalConfig,
|
||||
mavenPomAtPath,
|
||||
profileKey,
|
||||
profilesList,
|
||||
type GradleRunOptions,
|
||||
@@ -41,11 +42,14 @@ import {
|
||||
export interface BuildSettings {
|
||||
maven: MavenRunOptions;
|
||||
gradle: GradleRunOptions;
|
||||
/** Unlinked `pom.xml` files (project-relative) whose "not loaded" banner was skipped, with their subfolders. */
|
||||
skippedPoms: string[];
|
||||
}
|
||||
|
||||
export const DEFAULT_SETTINGS: BuildSettings = {
|
||||
maven: { offline: false, skipTests: false, profiles: {} },
|
||||
gradle: { offline: false, skipTests: false },
|
||||
skippedPoms: [],
|
||||
};
|
||||
|
||||
interface SyncState {
|
||||
@@ -104,6 +108,7 @@ export function readSettings(root: string): BuildSettings {
|
||||
return {
|
||||
maven: { ...DEFAULT_SETTINGS.maven, ...raw?.maven, profiles: { ...raw?.maven?.profiles } },
|
||||
gradle: { ...DEFAULT_SETTINGS.gradle, ...raw?.gradle },
|
||||
skippedPoms: Array.isArray(raw?.skippedPoms) ? raw.skippedPoms.filter((p) => typeof p === "string") : [],
|
||||
};
|
||||
} catch {
|
||||
return DEFAULT_SETTINGS;
|
||||
@@ -272,6 +277,7 @@ async function setLinked(root: string, poms: string[], linked: boolean) {
|
||||
} else if (extra.includes(pom)) extra = extra.filter((p) => p !== pom);
|
||||
else if (!unlinked.includes(pom)) unlinked = [...unlinked, pom];
|
||||
}
|
||||
if (linked) setPomsSkipped(poms, false);
|
||||
if (unlinked === unlinkedBefore && extra === linkedBefore) return;
|
||||
if (unlinked !== unlinkedBefore)
|
||||
await call(commands.settingsSet("project", UNLINKED_PROJECTS, JSON.stringify(unlinked)));
|
||||
@@ -295,6 +301,51 @@ export async function unlinkProjects(pom: string | null) {
|
||||
return;
|
||||
cancelSync("maven");
|
||||
await setLinked(root, [pom], false);
|
||||
setPomsSkipped([pom], true);
|
||||
}
|
||||
|
||||
function setPomsSkipped(poms: readonly string[], skipped: boolean) {
|
||||
const before = useBuild.getState().settings.skippedPoms;
|
||||
const after = skipped ? [...new Set([...before, ...poms])] : before.filter((p) => !poms.includes(p));
|
||||
if (after.length !== before.length) updateSettings((s) => ({ ...s, skippedPoms: after }));
|
||||
}
|
||||
|
||||
/** Folders whose `pom.xml` files are build output, dependencies or test data, not projects to load. */
|
||||
const NOT_PROJECT_DIRS = new Set(["target", "build", "out", "node_modules", ".git", ".mvn", "src"]);
|
||||
|
||||
/**
|
||||
* The project-relative (or, outside the opened project, absolute) `pom.xml` at `path`
|
||||
* when Maven doesn't load it: neither a linked project nor a module of one.
|
||||
*/
|
||||
export function unlinkedPom(path: string): string | null {
|
||||
const { model, root } = useBuild.getState();
|
||||
const project = useProject.getState().project;
|
||||
if (!model || !root || project?.root !== root || project.workspace || !isPomFileName(path)) return null;
|
||||
if (mavenPomAtPath(model.maven?.projects ?? [], root, path)) return null;
|
||||
return classifyPickedPoms(root, [path]).link[0] ?? null;
|
||||
}
|
||||
|
||||
/** Whether to offer loading the unlinked `pom` above its editor: inside the project, not under build output or sources, not skipped. */
|
||||
export function suggestsLoadingPom(pom: string, skipped: readonly string[]): boolean {
|
||||
if (pom.startsWith("/") || /^[A-Za-z]:\//.test(pom)) return false;
|
||||
const dirs = pom.split("/").slice(0, -1);
|
||||
if (dirs.some((d) => NOT_PROJECT_DIRS.has(d))) return false;
|
||||
return !skipped.some((s) => {
|
||||
const dir = s.split("/").slice(0, -1).join("/");
|
||||
return s === pom || dir === "" || pom.startsWith(`${dir}/`);
|
||||
});
|
||||
}
|
||||
|
||||
/** Add as Maven Project: links an unlinked `pom.xml`. */
|
||||
export async function addPomAsProject(path: string) {
|
||||
const root = useBuild.getState().root;
|
||||
const pom = unlinkedPom(path);
|
||||
if (root && pom) await setLinked(root, [pom], true);
|
||||
}
|
||||
|
||||
/** Skip on the "not loaded" banner: stop offering this project and the ones under it. */
|
||||
export function skipPom(pom: string) {
|
||||
setPomsSkipped([pom], true);
|
||||
}
|
||||
|
||||
/** A picked path in one comparable form: slashes unified, `\\?\` prefixes stripped. */
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import { registerActions } from "@/platform/actions";
|
||||
import { registerEditorBanner, registerMenuGroup, type EditorBanner } from "@/workbench/contributions";
|
||||
import { addPomAsProject, skipPom, suggestsLoadingPom, unlinkedPom, useBuild } from "./store";
|
||||
|
||||
/** The model is only loaded for a trusted project, so an untrusted one never shows this. */
|
||||
function useUnlinkedPomBanner(path: string): EditorBanner | null {
|
||||
const pom = useBuild((s) => (s.model && !s.loading ? unlinkedPom(path) : null));
|
||||
const skipped = useBuild((s) => s.settings.skippedPoms);
|
||||
if (!pom || !suggestsLoadingPom(pom, skipped)) return null;
|
||||
return {
|
||||
text: "This Maven project is not loaded",
|
||||
actions: [
|
||||
{ label: "Load Maven Project", run: () => void addPomAsProject(path) },
|
||||
{ label: "Skip", run: () => skipPom(pom) },
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
/** Add as Maven Project (project view) and the banner above an unlinked `pom.xml`. */
|
||||
export function registerUnlinkedPom(): () => void {
|
||||
const disposers = [
|
||||
registerEditorBanner({ id: "maven.unlinkedPom", order: 20, useBanner: useUnlinkedPomBanner }),
|
||||
registerActions([
|
||||
{
|
||||
id: "maven.addFileAsProject",
|
||||
title: "Add as Maven Project",
|
||||
category: "Maven",
|
||||
icon: "plus",
|
||||
hidden: true,
|
||||
when: "projectOpen && !workspaceOpen",
|
||||
run: async ({ arg }) => {
|
||||
const path = (arg as { path?: unknown } | undefined)?.path;
|
||||
if (typeof path === "string") await addPomAsProject(path);
|
||||
},
|
||||
},
|
||||
]),
|
||||
registerMenuGroup({
|
||||
id: "maven.addFileAsProject",
|
||||
menus: ["projectView"],
|
||||
order: 30,
|
||||
items: (_menu, { paths, dirs }) => {
|
||||
const path = paths.length === 1 && !dirs?.[0] ? paths[0]! : null;
|
||||
if (!path || !unlinkedPom(path)) return [];
|
||||
return [{ kind: "action", action: "maven.addFileAsProject", arg: { path }, label: "Add as Maven Project" }];
|
||||
},
|
||||
}),
|
||||
];
|
||||
return () => disposers.forEach((d) => d());
|
||||
}
|
||||
@@ -2447,5 +2447,9 @@
|
||||
"{file} changed": "{file} changed",
|
||||
"Reload the environment so new terminals, runs and language servers get the project's direnv environment again.": "Reload the environment so new terminals, runs and language servers get the project's direnv environment again.",
|
||||
"Show files only on left": "Show files only on left",
|
||||
"Show files only on right": "Show files only on right"
|
||||
"Show files only on right": "Show files only on right",
|
||||
"Add as Maven Project": "Add as Maven Project",
|
||||
"This Maven project is not loaded": "This Maven project is not loaded",
|
||||
"Load Maven Project": "Load Maven Project",
|
||||
"Skip": "Skip"
|
||||
}
|
||||
@@ -8824,5 +8824,8 @@
|
||||
"{file} changed": "{file} 已更改",
|
||||
"Reload the environment so new terminals, runs and language servers get the project's direnv environment again.": "重新加载环境,让新的终端、运行和语言服务器再次获得项目的 direnv 环境。",
|
||||
"Show files only on left": "显示仅在左侧的文件",
|
||||
"Show files only on right": "显示仅在右侧的文件"
|
||||
"Show files only on right": "显示仅在右侧的文件",
|
||||
"Add as Maven Project": "添加为 Maven 项目",
|
||||
"This Maven project is not loaded": "此 Maven 项目尚未加载",
|
||||
"Load Maven Project": "加载 Maven 项目"
|
||||
}
|
||||
Reference in new issue
Заблокувати користувача