The IDE you know, rebuilt in Rust. IntelliJ IDEA–style keymap, tool windows and search-everywhere in a fast native app: editor, code insight, debugger, Git, terminal, database and HTTP clients for 60+ languages.
TypeScript code-editorcross-platformdapdatabase-clientdebuggerdesktop-appdeveloper-toolsgithttp-clientideintellijlsprusttauriterminal
feat(project-view): show Maven and Gradle module folders in bold (#835)
kevinh2a6cc686eb89
diff --git a/src/features/project-tree/ProjectView.module.css b/src/features/project-tree/ProjectView.module.cssindex c23ebaf46..d499db233 100644--- a/src/features/project-tree/ProjectView.module.css+++ b/src/features/project-tree/ProjectView.module.css@@ -40,6 +40,9 @@color: var(--fg-strong);font-weight: 600;}+.moduleLabel {+ font-weight: 600;+}/* IDEA's "excluded" look: ignored / excluded entries are dimmed. */.excluded {color: var(--vcs-ignored);diff --git a/src/features/project-tree/ProjectView.tsx b/src/features/project-tree/ProjectView.tsxindex f4e140f8d..363912c43 100644--- a/src/features/project-tree/ProjectView.tsx+++ b/src/features/project-tree/ProjectView.tsx@@ -48,7 +48,12 @@ import { badgeKind } from "@/ui/symbolKind";import { contextMenuItems, menuGroupContext, newMenuItems } from "./contextMenu";import { openNewPopup } from "./newPopupModel";import { presentationIcon, useJvmPresentation } from "@/platform/filePresentation";-import { moduleFolderIcon, useProjectPresentation, type BuildPresentation } from "@/platform/projectPresentation";+import {+ isModuleFolder,+ moduleFolderIcon,+ useProjectPresentation,+ type BuildPresentation,+} from "@/platform/projectPresentation";import { relativePath } from "@/platform/project";import { folderKind } from "./folderKind";import { useHomeDir } from "./home";@@ -270,6 +275,8 @@ const Row = memo(function Row({node.dir || node.placeholder || node.icon? iconFor(node, roots, root, build, detected): presentationIcon(node.path, file, roots, root, build.spring);+ const moduleFolder =+ node.dir && !node.placeholder && !!root && isModuleFolder(relativePath(root, node.path), node.root, build.modules);const isEditing =!!editing && (node.placeholder ? editing.kind === "new" : editing.kind === "rename" && editing.key === node.key);const faded = node.ignored || deco.faded;@@ -310,6 +317,8 @@ const Row = memo(function Row({node.root && styles.rootName,// Only the project itself is bold (IDEA); contributed roots like Scratches are not.node.root && !node.icon && styles.rootLabel,+ // Maven / Gradle module folders are bold too, as in IDEA.+ moduleFolder && styles.moduleLabel,faded && !deco.color && styles.excluded,deco.error && styles.error,)}diff --git a/src/platform/projectPresentation.test.ts b/src/platform/projectPresentation.test.tsindex 54f6524d9..68a3d2643 100644--- a/src/platform/projectPresentation.test.ts+++ b/src/platform/projectPresentation.test.ts@@ -1,5 +1,5 @@import { describe, it, expect } from "vitest";-import { buildPresentation, moduleFolderIcon } from "./projectPresentation";+import { buildPresentation, isModuleFolder, moduleFolderIcon } from "./projectPresentation";import type { BuildModel } from "./ipc";const model = (partial: unknown) => ({ maven: null, gradle: null, ...(partial as object) }) as BuildModel;@@ -13,6 +13,18 @@ describe("build presentation context", () => {expect(moduleFolderIcon("app", false, modules)).toBe(`${tool}-module`);expect(moduleFolderIcon("plain", false, modules)).toBeNull();});+ it("marks nested module folders, not the project root or plain folders", () => {+ const modules = new Map<string, "maven" | "gradle">([+ ["", "maven"],+ ["core", "maven"],+ ["services/api", "gradle"],+ ]);+ expect(isModuleFolder("core", false, modules)).toBe(true);+ expect(isModuleFolder("services/api", false, modules)).toBe(true);+ expect(isModuleFolder("", true, modules)).toBe(false);+ expect(isModuleFolder("services", false, modules)).toBe(false);+ expect(isModuleFolder("core/src", false, modules)).toBe(false);+ });it("includes Maven aggregators and modules without source roots", () => {const context = buildPresentation(model({diff --git a/src/platform/projectPresentation.ts b/src/platform/projectPresentation.tsindex 9e0648159..cc6f4f103 100644--- a/src/platform/projectPresentation.ts+++ b/src/platform/projectPresentation.ts@@ -24,6 +24,11 @@ export function buildPresentation(model: BuildModel): BuildPresentation {return { modules, spring };}+/** A Maven / Gradle module folder below the project root: IDEA shows its name in bold. */+export function isModuleFolder(rel: string, root: boolean, modules: BuildPresentation["modules"]): boolean {+ return !root && rel !== "" && modules.has(rel);+}+export function moduleFolderIcon(rel: string, root: boolean, modules: BuildPresentation["modules"]): string | null {const tool = modules.get(rel);return tool ? `${tool}-${root ? "project" : "module"}` : null;