mirror of
https://github.com/l0ng-ai/openidea.git
synced 2026-11-13 18:37:39 -10:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b3519c7f8 |
No files matched your search
@@ -43,13 +43,23 @@ export function AddInterpreterDialog({
|
|||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const ids = { base: useId(), location: useId(), existing: useId() };
|
const ids = { base: useId(), location: useId(), existing: useId() };
|
||||||
|
|
||||||
const baseValue = base ?? bases[0]?.path ?? null;
|
|
||||||
const toOption = (s: { path: string; name: string }): SelectOption => ({
|
const toOption = (s: { path: string; name: string }): SelectOption => ({
|
||||||
value: s.path,
|
value: s.path,
|
||||||
label: s.name,
|
label: s.name,
|
||||||
detail: tildify(s.path),
|
detail: tildify(s.path),
|
||||||
});
|
});
|
||||||
const baseOptions = bases.map(toOption);
|
// conda installs a fresh Python of the base's version: offer versions, not environments to copy.
|
||||||
|
const versionOptions = (() => {
|
||||||
|
const seen = new Map<string, SelectOption>();
|
||||||
|
for (const s of bases) {
|
||||||
|
const short = s.version?.split(".").slice(0, 2).join(".");
|
||||||
|
if (short && !seen.has(short)) seen.set(short, { value: s.path, label: tx`Python ${short}` });
|
||||||
|
}
|
||||||
|
return [...seen.values()].sort((a, b) => b.label.localeCompare(a.label, undefined, { numeric: true }));
|
||||||
|
})();
|
||||||
|
const baseOptions = kind === "conda" ? versionOptions : bases.map(toOption);
|
||||||
|
const baseValue =
|
||||||
|
base ?? (kind === "conda" ? (versionOptions[0]?.value as string | undefined) : bases[0]?.path) ?? null;
|
||||||
const existingOptions = [...browsed, ...list.filter((s) => !browsed.some((b) => b.path === s.path))].map((s) => ({
|
const existingOptions = [...browsed, ...list.filter((s) => !browsed.some((b) => b.path === s.path))].map((s) => ({
|
||||||
value: s.path,
|
value: s.path,
|
||||||
label: `${s.name} — ${tildify(s.path)}`,
|
label: `${s.name} — ${tildify(s.path)}`,
|
||||||
@@ -108,7 +118,9 @@ export function AddInterpreterDialog({
|
|||||||
const canOk = !busy && (mode === "new" ? !!baseValue && !!location.trim() : !!existing?.trim());
|
const canOk = !busy && (mode === "new" ? !!baseValue && !!location.trim() : !!existing?.trim());
|
||||||
const note = {
|
const note = {
|
||||||
venv: tx("Runs “<base> -m venv <location>”; the new interpreter becomes the project interpreter."),
|
venv: tx("Runs “<base> -m venv <location>”; the new interpreter becomes the project interpreter."),
|
||||||
conda: tx("Runs “conda create -p <location>”; the new interpreter becomes the project interpreter."),
|
conda: tx(
|
||||||
|
"Runs “conda create -p <location> python=<version>”: a new environment with only Python in it; the new interpreter becomes the project interpreter.",
|
||||||
|
),
|
||||||
uv: tx("Runs “uv venv <location> --python <base>”; the new interpreter becomes the project interpreter."),
|
uv: tx("Runs “uv venv <location> --python <base>”; the new interpreter becomes the project interpreter."),
|
||||||
poetry: tx(
|
poetry: tx(
|
||||||
"Runs “poetry env use <base>” in the project; poetry keeps the environment under its own cache directory.",
|
"Runs “poetry env use <base>” in the project; poetry keeps the environment under its own cache directory.",
|
||||||
@@ -143,6 +155,7 @@ export function AddInterpreterDialog({
|
|||||||
aria-current={kind === k.tool || undefined}
|
aria-current={kind === k.tool || undefined}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setKind(k.tool);
|
setKind(k.tool);
|
||||||
|
setBase(null);
|
||||||
setError(null);
|
setError(null);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -199,9 +212,7 @@ export function AddInterpreterDialog({
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<label htmlFor={ids.base}>
|
<label htmlFor={ids.base}>{kind === "conda" ? <T>Python version:</T> : <T>Base interpreter:</T>}</label>
|
||||||
<T>Base interpreter:</T>
|
|
||||||
</label>
|
|
||||||
<div className={styles.pathRow}>
|
<div className={styles.pathRow}>
|
||||||
<Select
|
<Select
|
||||||
className={styles.pathInput}
|
className={styles.pathInput}
|
||||||
@@ -209,17 +220,19 @@ export function AddInterpreterDialog({
|
|||||||
options={baseOptions}
|
options={baseOptions}
|
||||||
onChange={setBase}
|
onChange={setBase}
|
||||||
placeholder={loading ? "Detecting…" : "No Python found"}
|
placeholder={loading ? "Detecting…" : "No Python found"}
|
||||||
aria-label="Base interpreter"
|
aria-label={kind === "conda" ? "Python version" : "Base interpreter"}
|
||||||
/>
|
|
||||||
<IconButton
|
|
||||||
icon="folder-open"
|
|
||||||
size="small"
|
|
||||||
title="Browse…"
|
|
||||||
onClick={async () => {
|
|
||||||
const p = await choosePath({ directory: false, title: "Select Base Interpreter" });
|
|
||||||
if (p) setBase(p);
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
|
{kind !== "conda" && (
|
||||||
|
<IconButton
|
||||||
|
icon="folder-open"
|
||||||
|
size="small"
|
||||||
|
title="Browse…"
|
||||||
|
onClick={async () => {
|
||||||
|
const p = await choosePath({ directory: false, title: "Select Base Interpreter" });
|
||||||
|
if (p) setBase(p);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.note}>{note}</div>
|
<div className={styles.note}>{note}</div>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ export function PythonInterpreterPage() {
|
|||||||
const [activate, setActivate] = useSetting<boolean>("languages.python.activateVirtualenv");
|
const [activate, setActivate] = useSetting<boolean>("languages.python.activateVirtualenv");
|
||||||
const root = useProject((s) => s.project?.root ?? null);
|
const root = useProject((s) => s.project?.root ?? null);
|
||||||
const [auto, setAuto] = useState<string | null>(null);
|
const [auto, setAuto] = useState<string | null>(null);
|
||||||
|
// Bumped when an environment is created: it may reuse the configured path, whose state changed.
|
||||||
|
const [created, setCreated] = useState(0);
|
||||||
// Detected interpreters plus the ones added to (or hidden from) the IDE-wide list.
|
// Detected interpreters plus the ones added to (or hidden from) the IDE-wide list.
|
||||||
const { detected, rows, hidden } = usePythonInterpreters({ withProjects: false });
|
const { detected, rows, hidden } = usePythonInterpreters({ withProjects: false });
|
||||||
const extras = useMemo(
|
const extras = useMemo(
|
||||||
@@ -91,7 +93,7 @@ export function PythonInterpreterPage() {
|
|||||||
return () => {
|
return () => {
|
||||||
live = false;
|
live = false;
|
||||||
};
|
};
|
||||||
}, [root]);
|
}, [root, created]);
|
||||||
|
|
||||||
// The interpreter runs resolve to: the configured one while it exists, else the fallback.
|
// The interpreter runs resolve to: the configured one while it exists, else the fallback.
|
||||||
const [resolved, setResolved] = useState<{ interpreter: string; path: string | null } | null>(null);
|
const [resolved, setResolved] = useState<{ interpreter: string; path: string | null } | null>(null);
|
||||||
@@ -104,7 +106,7 @@ export function PythonInterpreterPage() {
|
|||||||
return () => {
|
return () => {
|
||||||
live = false;
|
live = false;
|
||||||
};
|
};
|
||||||
}, [root, interpreter]);
|
}, [root, interpreter, created]);
|
||||||
// A configured interpreter whose executable is gone (PyCharm's "Invalid"): runs fall back.
|
// A configured interpreter whose executable is gone (PyCharm's "Invalid"): runs fall back.
|
||||||
const invalid =
|
const invalid =
|
||||||
!!interpreter && resolved?.interpreter === interpreter && !sameInterpreter(resolved.path, interpreter, root);
|
!!interpreter && resolved?.interpreter === interpreter && !sameInterpreter(resolved.path, interpreter, root);
|
||||||
@@ -362,6 +364,8 @@ export function PythonInterpreterPage() {
|
|||||||
onClose={() => setAdding(false)}
|
onClose={() => setAdding(false)}
|
||||||
onAdded={(path) => {
|
onAdded={(path) => {
|
||||||
setInterpreter(path);
|
setInterpreter(path);
|
||||||
|
setCreated((n) => n + 1);
|
||||||
|
reload();
|
||||||
setAdding(false);
|
setAdding(false);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -5217,7 +5217,9 @@
|
|||||||
"{count} modified action": "已修改 {count} 个操作",
|
"{count} modified action": "已修改 {count} 个操作",
|
||||||
"{count} modified actions": "已修改 {count} 个操作",
|
"{count} modified actions": "已修改 {count} 个操作",
|
||||||
"Runs “<base> -m venv <location>”; the new interpreter becomes the project interpreter.": "运行“<base> -m venv <location>”;新的解释器将成为项目解释器。",
|
"Runs “<base> -m venv <location>”; the new interpreter becomes the project interpreter.": "运行“<base> -m venv <location>”;新的解释器将成为项目解释器。",
|
||||||
"Runs “conda create -p <location>”; the new interpreter becomes the project interpreter.": "运行“conda create -p <location>”;新的解释器将成为项目解释器。",
|
"Runs “conda create -p <location> python=<version>”: a new environment with only Python in it; the new interpreter becomes the project interpreter.": "运行“conda create -p <location> python=<version>”:新建一个只包含 Python 的环境;新的解释器将成为项目解释器。",
|
||||||
|
"Python version": "Python 版本",
|
||||||
|
"Python {short}": "Python {short}",
|
||||||
"Runs “poetry env use <base>” in the project; poetry keeps the environment under its own cache directory.": "在项目中运行“poetry env use <base>”;Poetry 会将环境保存在其自己的缓存目录下。",
|
"Runs “poetry env use <base>” in the project; poetry keeps the environment under its own cache directory.": "在项目中运行“poetry env use <base>”;Poetry 会将环境保存在其自己的缓存目录下。",
|
||||||
"Runs “uv venv <location> --python <base>”; the new interpreter becomes the project interpreter.": "运行“uv venv <location> --python <base>”;新的解释器将成为项目解释器。",
|
"Runs “uv venv <location> --python <base>”; the new interpreter becomes the project interpreter.": "运行“uv venv <location> --python <base>”;新的解释器将成为项目解释器。",
|
||||||
"{vendor} {version} is unpacked into a folder of its own in {location}, where JDK detection finds it.": "{vendor} {version} 将解压到 {location} 下它自己的文件夹中,JDK 检测会在那里找到它。",
|
"{vendor} {version} is unpacked into a folder of its own in {location}, where JDK detection finds it.": "{vendor} {version} 将解压到 {location} 下它自己的文件夹中,JDK 检测会在那里找到它。",
|
||||||
|
|||||||
Reference in new issue
Block a user