diff --git a/src/features/settings/languages/AddInterpreterDialog.tsx b/src/features/settings/languages/AddInterpreterDialog.tsx index 772079240..cfee5da91 100644 --- a/src/features/settings/languages/AddInterpreterDialog.tsx +++ b/src/features/settings/languages/AddInterpreterDialog.tsx @@ -6,7 +6,8 @@ import { isCancelled } from "@/platform/ipc"; import { useId, useMemo, useState } from "react"; import { Dialog, IconButton, Input, Select, Spinner, type SelectOption, T } from "@/ui"; import { Icon, type IconName } from "@/ui/icons"; -import { choosePath, createVenv, pythonInterpreter, rememberSdk, type Sdk, type VenvTool } from "./api"; +import { createVenv, pythonInterpreter, rememberSdk, type Sdk, type VenvTool } from "./api"; +import { choosePath } from "@/platform/choosePath"; import { tildify, useDetected } from "./components"; import styles from "./Sdk.module.css"; import { tx } from "@/platform/i18n"; diff --git a/src/features/settings/languages/DownloadJdkDialog.tsx b/src/features/settings/languages/DownloadJdkDialog.tsx index 4155fcc26..0ba7d692b 100644 --- a/src/features/settings/languages/DownloadJdkDialog.tsx +++ b/src/features/settings/languages/DownloadJdkDialog.tsx @@ -6,7 +6,8 @@ import { useEffect, useId, useMemo, useState } from "react"; import { call, commands, isCancelled, isTauri, nextRequestId, type JdkReleases, type Sdk } from "@/platform/ipc"; import { downloadJdk, TEMURIN, type JdkDownload } from "@/platform/jdk"; import { Dialog, IconButton, Input, ProgressBar, Select, type SelectOption, T } from "@/ui"; -import { choosePath, rememberSdk } from "./api"; +import { rememberSdk } from "./api"; +import { choosePath } from "@/platform/choosePath"; import styles from "./Sdk.module.css"; import { tx } from "@/platform/i18n"; diff --git a/src/features/settings/languages/FormatterPage.tsx b/src/features/settings/languages/FormatterPage.tsx index 69f7d1f18..bc60f350c 100644 --- a/src/features/settings/languages/FormatterPage.tsx +++ b/src/features/settings/languages/FormatterPage.tsx @@ -4,7 +4,7 @@ import { IconButton, Input } from "@/ui"; import { Row, Section, Select, Toggle } from "../components/Form"; import { useSetting } from "../components/context"; import { DEFAULT_LANGUAGES } from "@/platform/languageSettings"; -import { choosePath } from "./api"; +import { choosePath } from "@/platform/choosePath"; import styles from "./Sdk.module.css"; const names: Record = { diff --git a/src/features/settings/languages/LanguagePages.tsx b/src/features/settings/languages/LanguagePages.tsx index de11eeaf8..d3e670283 100644 --- a/src/features/settings/languages/LanguagePages.tsx +++ b/src/features/settings/languages/LanguagePages.tsx @@ -11,7 +11,7 @@ import { call, commands, type Sdk } from "@/platform/ipc"; import { IconButton, Input, type SelectOption, T } from "@/ui"; import { JAVA_LANGUAGE_LEVELS, PHP_LANGUAGE_LEVELS } from "@/platform/languageSettings"; import { GlobListEditor, Row, Section, Select, Toggle } from "../components/Form"; -import { choosePath } from "./api"; +import { choosePath } from "@/platform/choosePath"; import { usePageContext, useSetting } from "../components/context"; import { SdkField, tildify, useDetected, useJdtlsJdk } from "./components"; import styles from "./Sdk.module.css"; diff --git a/src/features/settings/languages/ProjectStructurePage.tsx b/src/features/settings/languages/ProjectStructurePage.tsx index e87483bf5..3e3b0b1b1 100644 --- a/src/features/settings/languages/ProjectStructurePage.tsx +++ b/src/features/settings/languages/ProjectStructurePage.tsx @@ -61,7 +61,8 @@ import { } from "@/platform/languageSettings"; import { initProjectRoots, useDetectedRoots } from "@/platform/projectRoots"; import { Row, Section } from "../components/Form"; -import { choosePath, detectSdks, useSdks, type SdkKind } from "./api"; +import { detectSdks, useSdks, type SdkKind } from "./api"; +import { choosePath } from "@/platform/choosePath"; import { DownloadJdkDialog } from "./DownloadJdkDialog"; import { SdkField, tildify, useDetected, useJdtlsJdk, useProjectSetting } from "./components"; import styles from "./Sdk.module.css"; diff --git a/src/features/settings/languages/api.ts b/src/features/settings/languages/api.ts index 40b0e0699..1844bdc24 100644 --- a/src/features/settings/languages/api.ts +++ b/src/features/settings/languages/api.ts @@ -169,20 +169,3 @@ export function refreshContainerPython(): Promise { export function phpLanguageLevel(path: string): Promise { return isTauri() ? call(commands.sdkPhpLanguageLevel(path)) : Promise.resolve(null); } - -/** File / folder chooser (Tauri dialog); null when cancelled or outside Tauri. */ -export async function choosePath(opts: { - directory: boolean; - title: string; - defaultPath?: string; -}): Promise { - if (!isTauri()) return null; - const { open } = await import("@/platform/dialog"); - const picked = await open({ - directory: opts.directory, - multiple: false, - title: opts.title, - defaultPath: opts.defaultPath || undefined, - }); - return (Array.isArray(picked) ? picked[0] : picked) ?? null; -} diff --git a/src/features/settings/languages/components.tsx b/src/features/settings/languages/components.tsx index f7f12321b..698ad57c4 100644 --- a/src/features/settings/languages/components.tsx +++ b/src/features/settings/languages/components.tsx @@ -6,7 +6,8 @@ import { useProject } from "@/platform/project"; import { call, commands, isTauri } from "@/platform/ipc"; import { tx } from "@/platform/i18n"; import { useSetting } from "../components/context"; -import { choosePath, detectSdks, useSdks, type Sdk, type SdkKind } from "./api"; +import { detectSdks, useSdks, type Sdk, type SdkKind } from "./api"; +import { choosePath } from "@/platform/choosePath"; import { DownloadJdkDialog } from "./DownloadJdkDialog"; import styles from "./Sdk.module.css"; diff --git a/src/features/settings/pages/deployment.tsx b/src/features/settings/pages/deployment.tsx index db248ba00..44dc4d66e 100644 --- a/src/features/settings/pages/deployment.tsx +++ b/src/features/settings/pages/deployment.tsx @@ -48,7 +48,7 @@ import { toggleGroupServer, updateMapping, } from "./deploymentModel"; -import { choosePath } from "../languages/api"; +import { choosePath } from "@/platform/choosePath"; import { BUILD_GROUP } from "./execution"; import type { PageSpec } from "./spec"; import { parseSshPort, sshTestRemedy } from "./sshConnection"; diff --git a/src/features/vcs/RevisionBrowser.tsx b/src/features/vcs/RevisionBrowser.tsx index 2df54191b..4e812e40c 100644 --- a/src/features/vcs/RevisionBrowser.tsx +++ b/src/features/vcs/RevisionBrowser.tsx @@ -26,7 +26,7 @@ import { currentRepoRoot, useVcs } from "./store"; import { repositoryPath } from "./repositoryPaths"; import { languageFor, viewerBase } from "./cm"; import styles from "./GitLog.module.css"; -import { choosePath } from "@/features/settings/languages/api"; +import { choosePath } from "@/platform/choosePath"; import { openLogTab } from "./logStore"; interface RevisionData { diff --git a/src/platform/choosePath.ts b/src/platform/choosePath.ts new file mode 100644 index 000000000..923f82990 --- /dev/null +++ b/src/platform/choosePath.ts @@ -0,0 +1,19 @@ +import { isTauri } from "@/platform/ipc"; + +/** File / folder chooser (Tauri dialog); null when cancelled or outside Tauri. */ +export async function choosePath(opts: { + directory: boolean; + title: string; + defaultPath?: string; +}): Promise { + if (!isTauri()) return null; + // Lazy on purpose: loading platform/dialog starts its GTK capability probe at module load. + const { open } = await import("@/platform/dialog"); + const picked = await open({ + directory: opts.directory, + multiple: false, + title: opts.title, + defaultPath: opts.defaultPath || undefined, + }); + return (Array.isArray(picked) ? picked[0] : picked) ?? null; +}