Порівняти коміти

..
Автор SHA1 Повідомлення Дата
l0ng-ai 2aa46f21bf test(settings): include agentButton in the commit settings defaults shape 2026-11-20 13:29:14 +08:00
l0ng-ai 7310d0ab01 feat(vcs): setting to hide the Generate Commit Message with Agent button
Version Control › Commit › Commit Message Generation gets "Show the Generate Commit Message
with Agent button" (on by default). Off, the button above the commit message is hidden in
the Commit tool window and dialog; the action stays available from Find Action and its
shortcut.
2026-11-20 13:21:55 +08:00
276 змінених файлів з 1750 додано та 11707 видалено

No files matched your search

Створено
-1
Переглянути файл
@@ -4511,7 +4511,6 @@ dependencies = [
name = "ide-http"
version = "0.1.49"
dependencies = [
"hyper-util",
"ide-core",
"ide-vfs",
"parking_lot",
+7 -32
Переглянути файл
@@ -141,7 +141,7 @@ struct Shared {
paths: AgentPaths,
runtime: tokio::runtime::Handle,
connector: Connector,
sinks: RwLock<HashMap<String, AgentSink>>,
sink: RwLock<Option<AgentSink>>,
security: RwLock<Option<SecurityHook>>,
new_task_approvals: RwLock<Option<NewTaskApprovalsHook>>,
known: Arc<Mutex<HashMap<String, Known>>>,
@@ -213,12 +213,10 @@ impl Shared {
}
fn emit(&self, event: AgentEvent) {
let mut sinks: Vec<_> = self.sinks.read().values().cloned().collect();
let Some(last) = sinks.pop() else { return };
for sink in sinks {
sink(event.clone());
let sink = self.sink.read().clone();
if let Some(sink) = sink {
sink(event);
}
last(event);
}
/// The MCP servers passed to a session, and the names of the ones off for it.
@@ -563,7 +561,7 @@ impl AgentManager {
paths,
runtime,
connector,
sinks: RwLock::new(HashMap::new()),
sink: RwLock::new(None),
security: RwLock::new(None),
new_task_approvals: RwLock::new(None),
known,
@@ -606,22 +604,12 @@ impl AgentManager {
/// Routes events to `sink` (replacing the previous subscriber); returns every task.
pub fn subscribe(&self, sink: AgentSink) -> Vec<AgentTask> {
self.subscribe_as("", sink)
}
/// Routes events to `sink` too, replacing only the sink `subscriber` (a view of the project) had.
pub fn subscribe_as(&self, subscriber: &str, sink: AgentSink) -> Vec<AgentTask> {
self.shared.sinks.write().insert(subscriber.to_owned(), sink);
*self.shared.sink.write() = Some(sink);
let mut tasks: Vec<AgentTask> = self.tasks.read().values().map(|t| t.state.lock().snapshot()).collect();
tasks.sort_by(|a, b| b.updated_ms.total_cmp(&a.updated_ms));
tasks
}
/// A closed view releases its sink, never the task or its agent process.
pub fn unsubscribe(&self, subscriber: &str) {
self.shared.sinks.write().remove(subscriber);
}
/// Sets the callback used to read the active command execution security policy.
pub fn set_security_hook(&self, hook: SecurityHook) {
*self.shared.security.write() = Some(hook);
@@ -1569,18 +1557,6 @@ impl AgentManager {
Ok(())
}
pub async fn context_usage(&self, id: &str) -> IdeResult<AgentContextUsage> {
let task = self.task(id)?;
let live = task.live.lock().clone().ok_or_else(|| IdeError::unavailable("the agent session is offline"))?;
if !live.capabilities.context_usage {
return Err(IdeError::unavailable("this agent does not report context details"));
}
live.peer
.request("_openidea/context_usage", json!({ "sessionId": live.session }), None)
.await
.map_err(|error| IdeError::internal(task.describe(error)))
}
/// Stops background task `background` of task `id`.
pub async fn stop_background(&self, id: &str, background: &str) -> IdeResult<()> {
let task = self.task(id)?;
@@ -2012,7 +1988,7 @@ impl AgentManager {
// What arrived after the last save (a subagent's late updates).
task.persist();
}
self.shared.sinks.write().clear();
*self.shared.sink.write() = None;
}
}
@@ -3891,7 +3867,6 @@ fn capabilities_of(init: &acp::Negotiated) -> (AgentCapabilities, bool) {
rollback: meta("/openidea/rollback"),
steer: steer_method(init).is_some(),
background_tasks: meta("/openidea/backgroundTasks"),
context_usage: meta("/openidea/contextUsage"),
};
(capabilities, init.prompt("embeddedContext"))
}
-20
Переглянути файл
@@ -45,8 +45,6 @@ pub struct AgentCapabilities {
pub steer: bool,
/// It reports its background tasks and stops them one by one.
pub background_tasks: bool,
/// The connected agent can report a breakdown of its context window.
pub context_usage: bool,
}
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
@@ -277,24 +275,6 @@ pub struct AgentUsage {
pub cost: Option<Box<AgentCost>>,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
#[serde(rename_all = "camelCase")]
pub struct AgentContextUsage {
pub categories: Vec<AgentContextCategory>,
pub total_tokens: u32,
pub max_tokens: u32,
pub model: String,
pub is_auto_compact_enabled: Option<bool>,
pub auto_compact_threshold: Option<u32>,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
pub struct AgentContextCategory {
pub name: String,
pub tokens: u32,
pub kind: Option<String>,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
#[serde(rename_all = "camelCase")]
pub struct AgentCost {
+1 -6
Переглянути файл
@@ -407,7 +407,7 @@ impl Shim {
"promptCapabilities": { "image": true, "embeddedContext": true },
"sessionCapabilities": { "fork": {} },
"mcpCapabilities": { "stdio": true, "http": true, "sse": true },
"_meta": { "openidea": { "rollback": true, "steer": true, "backgroundTasks": true, "contextUsage": true } },
"_meta": { "openidea": { "rollback": true, "steer": true, "backgroundTasks": true } },
},
"agentInfo": { "name": "claude", "title": "Claude Code", "version": self.version() },
"authMethods": [],
@@ -492,11 +492,6 @@ impl Shim {
session.steer(params.get("prompt").cloned().unwrap_or_default()).map_err(invalid)?;
Ok(json!({}))
}
"_openidea/context_usage" => {
let session = self.session(&params)?;
let proc = session.st.lock().proc.clone().ok_or_else(|| internal("Claude Code is not running"))?;
rt.block_on(proc.control(json!({ "subtype": "get_context_usage" }))).map_err(internal)
}
"_openidea/stop_task" => {
let session = self.session(&params)?;
let task = params.get("taskId").and_then(Value::as_str).ok_or_else(|| invalid("no taskId"))?;
-29
Переглянути файл
@@ -452,35 +452,6 @@ fn manager(dir: &Path, agent: Arc<FakeAgent>) -> AgentManager {
manager_at(dir, &dir.join("models.json"), agent)
}
#[tokio::test]
async fn subscribers_do_not_replace_or_close_each_other() {
let tmp = tempfile::tempdir().unwrap();
let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
let main = Arc::new(Mutex::new(Vec::new()));
let child = Arc::new(Mutex::new(Vec::new()));
let subscribe = |window: &str, events: &Arc<Mutex<Vec<AgentEvent>>>| {
let events = events.clone();
mgr.subscribe_as(window, Arc::new(move |event| events.lock().push(event)));
};
subscribe("main", &main);
subscribe("editor-main-1", &child);
mgr.shared.emit(AgentEvent::Providers);
assert_eq!(main.lock().len(), 1);
assert_eq!(child.lock().len(), 1);
// A reloaded webview replaces only its own old channel.
let reloaded = Arc::new(Mutex::new(Vec::new()));
subscribe("editor-main-1", &reloaded);
mgr.shared.emit(AgentEvent::Providers);
assert_eq!(main.lock().len(), 2);
assert_eq!(child.lock().len(), 1);
assert_eq!(reloaded.lock().len(), 1);
mgr.unsubscribe("editor-main-1");
mgr.shared.emit(AgentEvent::Providers);
assert_eq!(main.lock().len(), 3);
assert_eq!(reloaded.lock().len(), 1);
mgr.shutdown();
}
fn manager_at(dir: &Path, models_file: &Path, agent: Arc<FakeAgent>) -> AgentManager {
// These tests speak to FakeAgent, never an installed CLI, including after a provider reload.
let agents = dir.join("agents");
+1 -13
Переглянути файл
@@ -82,23 +82,11 @@ pub fn load_linked(
maven_repo: Option<PathBuf>,
settings: &ide_core::settings::MavenSettings,
gradle_settings: &ide_core::settings::GradleSettings,
) -> BuildModel {
load_linked_with_jdk(root, cache_dir, maven_repo, settings, gradle_settings, None)
}
/// [`load_linked`] with the JDK Maven runs on, for JDK-activated Maven profiles.
pub fn load_linked_with_jdk(
root: &Path,
cache_dir: &Path,
maven_repo: Option<PathBuf>,
settings: &ide_core::settings::MavenSettings,
gradle_settings: &ide_core::settings::GradleSettings,
maven_jdk_version: Option<u32>,
) -> BuildModel {
let maven = maven::has_projects(root, settings).then(|| {
let profiles = settings.profiles(&sync::maven_profiles(cache_dir));
let repo = maven_repo.or_else(maven::default_local_repo);
let mut m = maven::load_with_linked_jdk(root, repo, &profiles, maven_jdk_version, &settings.linked_projects);
let mut m = maven::load_with_linked(root, repo, &profiles, &settings.linked_projects);
maven::UnlinkedProjects::from_model(&m, settings).filter(&mut m);
// The user settings' profiles can be chosen too (`-P` applies to them as well).
for p in maven::user_settings_file(root, settings).map(|f| maven::settings_profiles(&f)).unwrap_or_default() {
File diff suppressed because it is too large. Load diff
-6
Переглянути файл
@@ -92,12 +92,6 @@ pub enum IdeEvent {
/// Text version when this transition occurred, including when it was saved.
version: u32,
},
/// An open document's file changed on disk while the buffer had unsaved changes. The buffer
/// keeps them (autosave leaves the file alone); the UI offers to load the disk version.
DocDiskConflict {
doc: DocId,
path: String,
},
/// A complete workspace edit can be undone as one operation.
WorkspaceEditApplied {
id: u32,
-16
Переглянути файл
@@ -76,8 +76,6 @@ pub struct GitSettings {
/// label is plain text and a click on it places the caret as past the line end.
pub inline_blame_clickable: bool,
pub show_branch_in_project_view: bool,
/// Branch operations from the branches popup act on every repository of the project.
pub sync_branch_operations: bool,
/// Path to the git executable; empty = auto-detect.
pub executable: String,
/// Default of Update Project: `merge` | `rebase`.
@@ -119,7 +117,6 @@ impl Default for GitSettings {
inline_blame: false,
inline_blame_clickable: true,
show_branch_in_project_view: false,
sync_branch_operations: true,
executable: String::new(),
update_method: "merge".into(),
auto_update_on_push_rejected: false,
@@ -612,16 +609,3 @@ impl Default for AgentSecuritySettings {
}
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn git_settings_without_sync_key_execute_on_all_repositories() {
let missing: GitSettings = serde_json::from_str("{}").unwrap();
assert!(missing.sync_branch_operations);
let off: GitSettings = serde_json::from_str(r#"{"syncBranchOperations":false}"#).unwrap();
assert!(!off.sync_branch_operations);
}
}
+1 -7
Переглянути файл
@@ -602,13 +602,7 @@ impl DbManager {
pub(crate) async fn jdbc_completion(&self, id: &str, pool: &JdbcPool) -> IdeResult<crate::CompletionModel> {
let mut tables = vec![];
let mut column_count = 0;
// Read the schemas the source's Schemas tab picks, like the database tree does. It also
// keeps large instances usable: an Oracle server exposes dozens of system schemas, and
// dumping the columns of all of them takes minutes, during which the bridge (a single
// Java process that runs one command at a time) executes none of the user's statements.
let introspection = self.source(id)?.introspection;
let schemas: Vec<String> =
self.schemas(id).await?.into_iter().filter(|s| introspection.shows_schema(s)).collect();
let schemas = self.schemas(id).await?;
for schema in &schemas {
// Columns of the whole namespace in one call; a driver that refuses it still completes tables.
let mut columns = if column_count < crate::MAX_META_ROWS {
-59
Переглянути файл
@@ -124,45 +124,6 @@ impl Default for DbIntrospection {
}
}
impl DbIntrospection {
/// Whether the tree shows this schema: every one with `all_schemas`, otherwise it has to
/// match one of the `schemas` patterns. The completion model uses the same test, so it
/// offers exactly the tables the tree lists (and does not read the ones it never shows).
pub fn shows_schema(&self, name: &str) -> bool {
self.all_schemas
|| self.schemas.iter().map(|p| p.trim()).filter(|p| !p.is_empty()).any(|p| schema_matches(p, name))
}
}
/// `*` matches any run of characters, `?` a single one; a pattern without wildcards matches the
/// name as typed (the dialog fills names from the list the server returned, so case is settled).
fn schema_matches(pattern: &str, name: &str) -> bool {
if !pattern.contains('*') && !pattern.contains('?') {
return pattern == name;
}
let p: Vec<char> = pattern.chars().collect();
let n: Vec<char> = name.chars().collect();
let (mut pi, mut ni) = (0, 0);
// Position of the last `*` and how much of the name it has already swallowed.
let mut star: Option<(usize, usize)> = None;
while ni < n.len() {
if pi < p.len() && (p[pi] == '?' || p[pi] == n[ni]) {
pi += 1;
ni += 1;
} else if pi < p.len() && p[pi] == '*' {
star = Some((pi, ni));
pi += 1;
} else if let Some((at, taken)) = star {
pi = at + 1;
ni = taken + 1;
star = Some((at, taken + 1));
} else {
return false;
}
}
p[pi..].iter().all(|&c| c == '*')
}
/// Advanced tab: a driver property. PostgreSQL: run-time parameters (and
/// `application_name`); MySQL: session variables (and `charset`, `collation`);
/// SQLite: pragmas. See [`crate::conn`].
@@ -804,24 +765,4 @@ mod tests {
assert_eq!(r.snowflake().auth, DbSnowflakeAuth::Browser);
assert_eq!(scheme_driver("snowflake"), Some(DbDriver::Snowflake));
}
#[test]
fn introspection_shows_only_the_picked_schemas() {
let mut i = DbIntrospection::default();
assert!(i.shows_schema("SYS"), "the default reads every schema");
i.all_schemas = false;
assert!(!i.shows_schema("SYS"), "nothing picked: the tree lists nothing either");
i.schemas = vec!["XMCB".into(), " APP_* ".into()];
assert!(i.shows_schema("XMCB"));
assert!(i.shows_schema("APP_INFO"));
assert!(!i.shows_schema("APP"), "`*` needs the text that follows it");
assert!(!i.shows_schema("SYS"));
assert!(!i.shows_schema("xmcb"), "patterns match the names the server returned");
i.schemas = vec!["?".into()];
assert!(i.shows_schema("A"));
assert!(!i.shows_schema("AB"));
}
}
+9 -34
Переглянути файл
@@ -5,10 +5,10 @@ use crate::Host;
use crate::agent_secrets::{AgentSecrets, Kept};
use ide_agent::registry::{AgentRegistry, RegistryPaths};
use ide_agent::{
AcpImportOutcome, AgentAcceptOutcome, AgentChange, AgentChanges, AgentChangesView, AgentCommand, AgentContextUsage,
AgentEntry, AgentEvent, AgentModelCatalog, AgentProbe, AgentPrompt, AgentProvider, AgentQueued, AgentTask,
CustomAgentInput, ExternalSession, McpExternalSource, McpImportSelection, McpProbeResult, McpScope, McpServer,
McpServerInput, McpTransport, NewAgentTask,
AcpImportOutcome, AgentAcceptOutcome, AgentChange, AgentChanges, AgentChangesView, AgentCommand, AgentEntry,
AgentEvent, AgentModelCatalog, AgentProbe, AgentPrompt, AgentProvider, AgentQueued, AgentTask, CustomAgentInput,
ExternalSession, McpExternalSource, McpImportSelection, McpProbeResult, McpScope, McpServer, McpServerInput,
McpTransport, NewAgentTask,
};
use ide_command::command;
use ide_core::error::ErrorKind;
@@ -17,28 +17,12 @@ use ide_tools::InstallEvent;
use std::collections::HashSet;
use std::sync::{LazyLock, Mutex};
/// Streams the project's agent events to `subscriber`, one of the project's windows (a remote
/// host sees them all as one `window`); returns every task.
/// Streams the project's agent events to this window; returns every task.
#[command(trust = always)]
pub fn agent_subscribe(
host: &Host,
window: &str,
on_event: Channel<AgentEvent>,
subscriber: String,
) -> IdeResult<Vec<AgentTask>> {
Ok(host.project(window)?.agents.subscribe_as(
&subscriber,
std::sync::Arc::new(move |e| {
let _ = on_event.send(e);
}),
))
}
/// Stops the events of a window that closed.
#[command(trust = always)]
pub fn agent_unsubscribe(host: &Host, window: &str, subscriber: String) -> IdeResult<()> {
host.project(window)?.agents.unsubscribe(&subscriber);
Ok(())
pub fn agent_subscribe(host: &Host, window: &str, on_event: Channel<AgentEvent>) -> IdeResult<Vec<AgentTask>> {
Ok(host.project(window)?.agents.subscribe(std::sync::Arc::new(move |e| {
let _ = on_event.send(e);
})))
}
#[command(trust = trusted)]
@@ -367,13 +351,6 @@ pub async fn agent_probe(host: &Host, window: &str, provider: String, refresh: b
host.project(window)?.agents.probe(&provider, refresh).await
}
/// Reads the running session's context categories without sending a prompt.
#[command(trust = trusted)]
pub async fn agent_context_usage(host: &Host, window: &str, task: String) -> IdeResult<AgentContextUsage> {
host.require_trust(window)?;
host.project(window)?.agents.context_usage(&task).await
}
/// Stops the task's current turn, or with `subagent` only that subagent's work.
#[command(trust = always)]
pub fn agent_cancel(host: &Host, window: &str, task: String, subagent: Option<String>) -> IdeResult<()> {
@@ -1100,7 +1077,6 @@ ide_command::domain!(
agent_archive,
agent_base_text,
agent_cancel,
agent_context_usage,
agent_changes,
agent_commands,
agent_create,
@@ -1141,5 +1117,4 @@ ide_command::domain!(
agent_subscribe,
agent_unarchive,
agent_unqueue,
agent_unsubscribe,
);
+21 -118
Переглянути файл
@@ -8,79 +8,30 @@ use crate::{Host, Project};
use ide_command::command;
use ide_build::compile::{self, BuildEvent, BuildKind, BuildResult};
use ide_build::maven::PomGoto;
use ide_build::maven::completion::{PomCompletion, PomCompletionOption};
use ide_build::maven::{PomGoto, PomManagedDeclaration, PomNavigationOptions};
use ide_build::pom_edit::{ArtifactKey, Exclusion};
use ide_build::{BuildModel, BuildTool, SyncOptions, SyncProgress};
use ide_core::settings::Settings;
use ide_core::{DocId, FileEdit, IdeError, IdeEvent, IdeResult, Location, Pos, Range, RequestId, WorkspaceEdit};
use std::collections::HashMap;
use std::path::Path;
use std::sync::{Arc, Mutex, OnceLock};
use std::time::{Duration, Instant};
use std::sync::Arc;
fn join_err(e: tokio::task::JoinError) -> IdeError {
IdeError::internal(e.to_string())
}
/// POM gutters in several editors refresh together. A very short cache lets those
/// requests share one reactor scan without serving a stale module list after edits settle.
const MAVEN_MODULE_CACHE_TTL: Duration = Duration::from_millis(250);
type MavenModuleCache = HashMap<String, (Instant, Vec<ide_build::maven::ModulePom>)>;
static MAVEN_MODULES: OnceLock<Mutex<MavenModuleCache>> = OnceLock::new();
fn maven_modules(
project: &Project,
settings: &Settings,
options: &PomNavigationOptions,
) -> Vec<ide_build::maven::ModulePom> {
let key = format!(
"{}\0{:?}\0{:?}\0{:?}\0{:?}",
project.root.display(),
project.build_cache_dir(),
settings.languages.java.maven.linked_projects,
options.profiles,
options.jdk_version
);
let cache = MAVEN_MODULES.get_or_init(|| Mutex::new(HashMap::new()));
if let Some((_at, modules)) = cache.lock().ok().and_then(|mut cache| {
let fresh = cache.get(&key).filter(|(at, _)| at.elapsed() < MAVEN_MODULE_CACHE_TTL).cloned();
if fresh.is_none() {
cache.remove(&key);
}
fresh
}) {
return modules;
}
let model = load(&project.root, &project.build_cache_dir(), settings).maven.unwrap_or_default();
let modules = model
.projects
.into_iter()
.map(|p| ide_build::maven::ModulePom {
group_id: p.group_id,
artifact_id: p.artifact_id,
version: p.version,
pom: project.root.join(&p.pom),
})
.collect::<Vec<_>>();
if let Ok(mut cache) = cache.lock() {
cache.insert(key, (Instant::now(), modules.clone()));
}
modules
}
/// The build model with the launch settings applied: the JDK (`JAVA_HOME`), and
/// the Maven home and options from Settings › Maven.
pub fn load(root: &Path, cache: &Path, settings: &Settings) -> BuildModel {
let jdk = ide_sdk::apply::project_jdk(root, settings);
let mut model = ide_build::load_linked_with_jdk(
let mut model = ide_build::load_linked(
root,
cache,
ide_sdk::apply::maven_local_repository(root, settings),
&settings.languages.java.maven,
&settings.languages.java.gradle,
ide_sdk::apply::maven_jdk(root, settings, None).map(|jdk| jdk.major),
);
let jdk = ide_sdk::apply::project_jdk(root, settings);
if let Some(m) = &mut model.maven {
let mvn = ide_sdk::apply::maven_command(root, settings);
let options = ide_sdk::apply::maven_options(root, settings);
@@ -126,23 +77,6 @@ pub fn load(root: &Path, cache: &Path, settings: &Settings) -> BuildModel {
model
}
/// POM navigation follows the same profile choices as the last Maven sync and
/// resolves JDK-activated profiles with the project's selected Maven runtime.
fn pom_navigation_options(project: &Project, settings: &Settings) -> PomNavigationOptions {
let mut profiles = settings.languages.java.maven.profiles(&[]);
for profile in ide_build::maven_profiles(&project.build_cache_dir()) {
if !profiles.contains(&profile) {
profiles.push(profile);
}
}
PomNavigationOptions {
local_repo: ide_sdk::apply::maven_local_repository(&project.root, settings)
.or_else(ide_build::maven::default_local_repo),
profiles,
jdk_version: ide_sdk::apply::maven_jdk(&project.root, settings, None).map(|jdk| jdk.major),
}
}
/// Build and Run use the same selected toolchain and module-local runtime discovery.
fn prepare_plan(mut plan: compile::BuildPlan, root: &Path, settings: &Settings) -> compile::BuildPlan {
let kind = match plan.system {
@@ -613,9 +547,8 @@ pub async fn maven_dependency_declaration(
}
/// The go-to-declaration target at `pos` of a Maven POM: the definition of the
/// `${property}` at the caret, the parent POM, or the dependency / plugin's own POM
/// (a project module first, then the local repository). A dependency without a
/// resolvable artifact POM falls back to its management entry.
/// `${property}` at the caret, or the `<dependencyManagement>` / `<pluginManagement>`
/// entry providing the dependency's / plugin's version, along the parent chain.
#[command(trust = trusted)]
pub async fn maven_goto_declaration(host: &Host, window: &str, pom: String, pos: Pos) -> IdeResult<Option<PomGoto>> {
// `pom` is project-relative, or absolute for a parent POM opened from the local repository.
@@ -628,55 +561,26 @@ pub async fn maven_goto_declaration(host: &Host, window: &str, pom: String, pos:
let path = if given.is_absolute() { given.to_path_buf() } else { project.root.join(given) };
let text = project.text_of(&path)?;
let settings = project.settings.effective();
let options = pom_navigation_options(&project, &settings);
let module_options = options.clone();
let modules = || maven_modules(&project, &settings, &module_options);
Ok(ide_build::maven::goto_declaration_with(&text, &path, pos, options, modules))
let repo = ide_sdk::apply::maven_local_repository(&project.root, &settings)
.or_else(ide_build::maven::default_local_repo);
let modules = || {
let model = load(&project.root, &project.build_cache_dir(), &settings).maven.unwrap_or_default();
model
.projects
.into_iter()
.map(|p| ide_build::maven::ModulePom {
group_id: p.group_id,
artifact_id: p.artifact_id,
pom: project.root.join(&p.pom),
})
.collect()
};
Ok(ide_build::maven::goto_declaration_in(&text, &path, pos, repo, modules))
})
.await
.map_err(join_err)?
}
/// Gutter targets of the unversioned dependencies and plugins in a Maven POM:
/// the management declarations that actually supply their versions, including
/// parent POMs and imported BOMs. Cancel with `cancel_request(request)`.
#[command(trust = trusted)]
pub async fn maven_managed_declarations(
host: &Host,
window: &str,
pom: String,
request: RequestId,
) -> IdeResult<Vec<PomManagedDeclaration>> {
let project = host.project(window)?;
let cancel = host.begin_project_read_request(window, request);
let result = tokio::task::spawn_blocking(move || {
if cancel.is_cancelled() {
return Err(IdeError::cancelled());
}
let given = Path::new(&pom);
let path = if given.is_absolute() { given.to_path_buf() } else { project.root.join(given) };
let text = project.text_of(&path)?;
let settings = project.settings.effective();
let options = pom_navigation_options(&project, &settings);
let cancelled = cancel.clone();
let module_options = options.clone();
let modules = || {
if cancelled.is_cancelled() {
return Vec::new();
}
maven_modules(&project, &settings, &module_options)
};
let declarations = ide_build::maven::managed_declarations_with(&text, &path, options, modules);
if cancel.is_cancelled() { Err(IdeError::cancelled()) } else { Ok(declarations) }
})
.await;
host.end_request(request);
match result {
Ok(result) => result,
Err(error) => Err(join_err(error)),
}
}
/// How long completion waits for Maven Central before answering from the local repository.
const CENTRAL_WAIT: std::time::Duration = std::time::Duration::from_secs(1);
@@ -1429,5 +1333,4 @@ ide_command::domain!(
maven_dependency_declaration,
maven_exclude_dependency,
maven_goto_declaration,
maven_managed_declarations,
);
-8
Переглянути файл
@@ -70,13 +70,6 @@ pub async fn doc_save(host: &Host, window: &str, doc: DocId) -> IdeResult<()> {
host.debugger.refresh_source_mirrors(host.owner_window(window)).await
}
/// Load Changes from Disk: discards the buffer's unsaved changes and reads its file again.
#[command(trust = always)]
pub async fn doc_reload_from_disk(host: &Host, window: &str, doc: DocId) -> IdeResult<()> {
let project = host.project(window)?;
host.blocking(move || project.documents.discard_and_reload(doc)).await
}
/// An automatic save: `false` (nothing written) when the file changed on disk after the
/// buffer was edited, which only an explicit save overwrites.
#[command(trust = always)]
@@ -127,7 +120,6 @@ ide_command::domain!(
doc_edit,
doc_open,
doc_open_untitled,
doc_reload_from_disk,
doc_save,
doc_autosave,
doc_save_all,
+3 -5
Переглянути файл
@@ -1,6 +1,6 @@
use super::*;
use crate::{HostConfig, Project};
use ide_core::{IdeEvent, TextChange};
use ide_core::{IdeEvent, TextChange, event::NotifyLevel};
use parking_lot::Mutex;
use std::{path::Path, sync::Arc};
@@ -57,9 +57,7 @@ impl Fixture {
self.events
.lock()
.iter()
.filter(|e| {
matches!(e, IdeEvent::DocPatched { .. } | IdeEvent::DocDirty { .. } | IdeEvent::DocDiskConflict { .. })
})
.filter(|e| matches!(e, IdeEvent::DocPatched { .. } | IdeEvent::DocDirty { .. } | IdeEvent::Notify { .. }))
.cloned()
.collect()
}
@@ -112,7 +110,7 @@ async fn dirty_document_keeps_edits_and_warns_once() {
let loaded = f.project.documents.snapshot(original.id).unwrap();
assert_eq!(loaded.text, "local original\n");
assert!(loaded.dirty);
assert!(matches!(f.document_events().as_slice(), [IdeEvent::DocDiskConflict { .. }]));
assert!(matches!(f.document_events().as_slice(), [IdeEvent::Notify { level: NotifyLevel::Warning, .. }]));
f.events.lock().clear();
f.sync().await;
assert!(f.document_events().is_empty());
+21 -31
Переглянути файл
@@ -122,38 +122,28 @@ pub async fn sdk_python_interpreter(host: &Host, window: &str, path: PathBuf) ->
/// The interpreter the project uses: the configured one, else its virtualenv.
#[command(trust = trusted)]
pub async fn sdk_python_effective(
host: &Host,
window: &str,
near: Option<PathBuf>,
) -> IdeResult<Option<ide_core::IpcPath>> {
pub fn sdk_python_effective(host: &Host, window: &str, near: Option<PathBuf>) -> IdeResult<Option<ide_core::IpcPath>> {
host.require_trust(window)?;
let project = host.project(window)?;
let (config_dir, project_root) = (host.config_dir.clone(), project.root.clone());
// Loading a member's settings needs more stack than a sync command's main thread has left.
tokio::task::spawn_blocking(move || {
let member = ide_workspace::workspace::Workspace::load(&project_root).ok().flatten().and_then(|w| {
let near = near.as_deref()?;
w.projects.into_iter().filter(|root| near.starts_with(root)).max_by_key(|root| root.components().count())
});
let (root, settings) = match member {
Some(root) => {
let settings = ide_workspace::SettingsStore::load(&config_dir, Some(&root)).effective();
(root, settings)
}
None => (project_root.clone(), project.settings.effective()),
};
// A member with no Python of its own falls back to the primary project's
// (the same chain run configurations use), so every answer names one interpreter.
let interpreter = ide_sdk::apply::python_interpreter_near(&root, near.as_deref(), &settings).or_else(|| {
(root != project_root)
.then(|| ide_sdk::apply::python_interpreter(&project_root, &project.settings.effective()))
.flatten()
});
Ok(interpreter.map(Into::into))
})
.await
.map_err(join_err)?
let member = ide_workspace::workspace::Workspace::load(&project.root)?.and_then(|w| {
let near = near.as_deref()?;
w.projects.into_iter().filter(|root| near.starts_with(root)).max_by_key(|root| root.components().count())
});
let (root, settings) = match member {
Some(root) => {
let settings = ide_workspace::SettingsStore::load(&host.config_dir, Some(&root)).effective();
(root, settings)
}
None => (project.root.clone(), project.settings.effective()),
};
// A member with no Python of its own falls back to the primary project's
// (the same chain run configurations use), so every answer names one interpreter.
let interpreter = ide_sdk::apply::python_interpreter_near(&root, near.as_deref(), &settings).or_else(|| {
(root != project.root)
.then(|| ide_sdk::apply::python_interpreter(&project.root, &project.settings.effective()))
.flatten()
});
Ok(interpreter.map(Into::into))
}
/// The PHP interpreter chosen in Settings › Languages & Frameworks › PHP; `None`: the `php` on `PATH`.
@@ -471,7 +461,7 @@ mod tests {
host.open_project("main", &root).unwrap();
let detected = sdk_detect(&host, "main", SdkKind::Python).await.unwrap();
assert!(detected.iter().any(|s| s.path == sdk.path && s.name == sdk.name));
assert_eq!(sdk_python_effective(&host, "main", None).await.unwrap(), Some(sdk.path));
assert_eq!(sdk_python_effective(&host, "main", None).unwrap(), Some(sdk.path));
assert!(sdk_python_interpreter(&host, "main", root.join("README.md")).await.unwrap().is_none());
host.close_project("main");
}
+1 -7
Переглянути файл
@@ -633,14 +633,8 @@ pub async fn vcs_add_to_ignore(
host.require_trust(window)?;
let project = host.project(window)?;
blocking(move || {
// The Changes view lists every repository of the window (the project's and the
// attached ones'): a path inside the project folder, or in any of those repositories.
// The folder check stays so a request right after opening, before the repositories
// are discovered, still works.
let repos = project.repos();
for path in &paths {
let in_project = path != &project.root && path.starts_with(&project.root);
if !in_project && repos.for_path(path).is_none() {
if path == &project.root || !path.starts_with(&project.root) {
return Err(ide_core::IdeError::invalid("Ignore selection is outside the project"));
}
}
-1
Переглянути файл
@@ -191,7 +191,6 @@ pub fn client_accepts(event: &IdeEvent, trusted: bool) -> bool {
| IdeEvent::ExcludedDirsChanged { .. }
| IdeEvent::DocPatched { .. }
| IdeEvent::DocDirty { .. }
| IdeEvent::DocDiskConflict { .. }
| IdeEvent::WorkspaceEditApplied { .. }
| IdeEvent::DocLanguage { .. }
| IdeEvent::Diagnostics { .. }
+1 -1
Переглянути файл
@@ -161,7 +161,7 @@ async fn light_notebooks_open_without_interpreter_detection_or_execution() {
assert!(ops::notebook::notebook_save(&host, "main", notebook.id.clone()).await.is_ok());
let error = ops::sdk::sdk_detect(&host, "main", ide_sdk::SdkKind::Python).await.unwrap_err();
assert!(error.message.contains("Restricted Mode"));
assert!(ops::sdk::sdk_python_effective(&host, "main", None).await.is_err());
assert!(ops::sdk::sdk_python_effective(&host, "main", None).is_err());
assert!(ops::sdk::sdk_locate_tools(&host, "main", vec!["prettier".into()], Some(root)).await.is_err());
let error = ops::notebook::notebook_restart(&host, "main", notebook.id.clone()).await.unwrap_err();
assert!(error.message.contains("Restricted Mode"));
+1 -1
Переглянути файл
@@ -351,7 +351,7 @@ async fn python_venv() {
// The project's virtualenv: listed first, and the interpreter the project uses.
let found = ops::sdk::sdk_detect(&p.host, WINDOW, ide_sdk::SdkKind::Python).await.unwrap();
assert_eq!(found.first().map(|s| s.source.as_str()), Some("venv"), "{found:?}");
let effective = ops::sdk::sdk_python_effective(&p.host, WINDOW, None).await.unwrap().expect("an interpreter");
let effective = ops::sdk::sdk_python_effective(&p.host, WINDOW, None).unwrap().expect("an interpreter");
assert!(effective.starts_with(p.root.join(".venv")), "{effective:?}");
}
-73
Переглянути файл
@@ -21,7 +21,6 @@ async fn patches_read_and_write_the_requested_repository() {
git(root, &["init", "-b", "main"]);
git(root, &["config", "user.name", "Test"]);
git(root, &["config", "user.email", "[email protected]"]);
git(root, &["config", "core.autocrlf", "false"]);
std::fs::write(root.join("same.txt"), format!("root {i}\n")).unwrap();
git(root, &["add", "."]);
git(root, &["commit", "-m", "initial"]);
@@ -66,75 +65,3 @@ async fn patches_read_and_write_the_requested_repository() {
assert!(vcs::vcs_apply_patch(&host, "main", Some(base.join("outside")), String::new()).await.is_err());
host.close_project("main");
}
/// The Changes view also lists attached projects' repositories, and their untracked files
/// offer Add to .gitignore / .git/info/exclude: the guard must follow the window's
/// repository set, not the project folder alone.
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn add_to_ignore_accepts_the_repositories_of_attached_projects() {
let temp = tempfile::tempdir().unwrap();
let base = dunce::canonicalize(temp.path()).unwrap();
let project_root = base.join("project");
let attached_root = base.join("attached");
for root in [&project_root, &attached_root] {
std::fs::create_dir_all(root).unwrap();
git(root, &["init", "-b", "main"]);
git(root, &["config", "user.name", "Test"]);
git(root, &["config", "user.email", "[email protected]"]);
git(root, &["config", "core.autocrlf", "false"]);
std::fs::write(root.join("tracked.txt"), "x\n").unwrap();
git(root, &["add", "."]);
git(root, &["commit", "-m", "initial"]);
}
// Untracked files, one per repository; the attached one is what failed.
let own = project_root.join("own.ignore-me");
let attached = attached_root.join("attached.ignore-me");
std::fs::write(&own, "x").unwrap();
std::fs::write(&attached, "x").unwrap();
let host = Host::new(HostConfig {
config_dir: base.join("config"),
data_dir: base.join("data"),
local_data_dir: base.join("data"),
languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
syntax: Arc::default(),
sink_for: Box::new(|_| Arc::new(NullSink)),
owner: |w| w,
runtime: tokio::runtime::Handle::current(),
project_environment: false,
});
host.trust.decide(&project_root, true, false).unwrap();
host.trust.decide(&attached_root, true, false).unwrap();
let project = host.open_project("main", &project_root).unwrap();
ide_host::ops::project::attach_workspace(&host, "main", &attached_root).unwrap();
for _ in 0..500 {
if project.repos().all().len() == 2 {
break;
}
tokio::time::sleep(Duration::from_millis(10)).await;
}
assert_eq!(project.repos().all().len(), 2);
vcs::vcs_add_to_ignore(&host, "main", vec![attached.clone()], ide_vcs::IgnoreDestination::Gitignore).await.unwrap();
assert!(
std::fs::read_to_string(attached_root.join(".gitignore")).unwrap().contains("/attached.ignore-me"),
"the attached repository's .gitignore did not receive the rule"
);
vcs::vcs_add_to_ignore(&host, "main", vec![own.clone()], ide_vcs::IgnoreDestination::LocalExclude).await.unwrap();
assert!(
std::fs::read_to_string(project_root.join(".git/info/exclude")).unwrap().contains("/own.ignore-me"),
"the project repository's exclude did not receive the rule"
);
// A repository of an unattached sibling folder stays outside.
let sibling_root = base.join("sibling");
std::fs::create_dir_all(&sibling_root).unwrap();
git(&sibling_root, &["init", "-b", "main"]);
let sibling = sibling_root.join("sibling.ignore-me");
std::fs::write(&sibling, "x").unwrap();
let error =
vcs::vcs_add_to_ignore(&host, "main", vec![sibling], ide_vcs::IgnoreDestination::Gitignore).await.unwrap_err();
assert!(error.message.contains("outside the project"), "{error:?}");
assert!(!sibling_root.join(".gitignore").exists());
host.close_project("main");
}
+1 -10
Переглянути файл
@@ -199,9 +199,7 @@ async fn python_effective_interpreter_falls_back_to_the_primary_project() {
host.trust.decide(&member, true, false).unwrap();
host.open_project("main", &primary).unwrap();
let python = |near: Option<&std::path::Path>| {
futures::executor::block_on(ops::sdk::sdk_python_effective(&host, "main", near.map(|p| p.to_path_buf())))
.unwrap()
.map(|p| p.into_path_buf())
ops::sdk::sdk_python_effective(&host, "main", near.map(|p| p.to_path_buf())).unwrap().map(|p| p.into_path_buf())
};
// The primary project's own virtualenv, and the bare member inheriting it.
assert_eq!(python(Some(&primary)), Some(venv_python.clone()));
@@ -219,13 +217,6 @@ async fn python_effective_interpreter_falls_back_to_the_primary_project() {
)
.unwrap();
assert_eq!(python(Some(&member.join("src"))), Some(configured));
// A workspace file that fails to load (a corrupt one, say) falls back to the
// primary project's interpreter instead of failing the whole command.
let workspace_file = primary.join(ide_workspace::workspace::FILE);
let valid = std::fs::read(&workspace_file).unwrap();
std::fs::write(&workspace_file, b"{not json").unwrap();
assert_eq!(python(Some(&member.join("src"))), Some(venv_python.clone()));
std::fs::write(&workspace_file, valid).unwrap();
host.close_project("main");
}
-2
Переглянути файл
@@ -15,8 +15,6 @@ tokio.workspace = true
tracing.workspace = true
parking_lot.workspace = true
reqwest.workspace = true
# The system proxy reqwest reads, to notice when it changes (see `client::shared`).
hyper-util = { version = "0.1", default-features = false, features = ["client-proxy", "client-proxy-system"] }
rustls.workspace = true
rustls-platform-verifier.workspace = true
uuid.workspace = true
+11 -69
Переглянути файл
@@ -5,7 +5,7 @@ use ide_core::proxy_settings::{ProxyMode, ProxyRoute, ProxySettings};
use ide_core::{CancellationToken, IdeError, IdeResult};
use parking_lot::Mutex;
use std::sync::Arc;
use std::time::{Duration, Instant};
use std::time::Duration;
/// `builder` routed as `proxy` says: direct, the environment's proxy (reqwest's
/// default), or the manual proxy except for the "No proxy for" hosts.
@@ -62,61 +62,33 @@ pub fn build_with_redirect(proxy: &ProxySettings, redirect: reqwest::redirect::P
with_proxy(builder, proxy).build().map_err(|e| fail(e.to_string()))
}
/// A client built for these proxy settings and, in Auto mode, this system proxy.
struct Cached {
settings: Arc<ProxySettings>,
system: Option<String>,
client: reqwest::Client,
}
/// The client for the current proxy settings, rebuilt when they change.
pub fn shared() -> IdeResult<reqwest::Client> {
static CLIENT: Mutex<Option<Cached>> = Mutex::new(None);
cached_client(&CLIENT, build, system_proxy)
static CLIENT: Mutex<Option<(Arc<ProxySettings>, reqwest::Client)>> = Mutex::new(None);
cached_client(&CLIENT, build)
}
/// The client the HTTP Client executes requests with: redirects off, `exec`
/// follows them by hand — that is what lets a `POST` stay a `POST` on a
/// 301/302 and puts the redirect chain into the response.
pub fn shared_without_redirects() -> IdeResult<reqwest::Client> {
static CLIENT: Mutex<Option<Cached>> = Mutex::new(None);
cached_client(&CLIENT, |proxy| build_with_redirect(proxy, reqwest::redirect::Policy::none()), system_proxy)
}
/// The system proxy (the environment's, then macOS / Windows settings) as reqwest reads
/// it when a client is built, re-read at most every few seconds. A client in Auto mode
/// keeps the proxy it was built with, so a proxy app that switches the system proxy on
/// after launch would otherwise leave downloads going direct until a restart.
fn system_proxy() -> String {
static LAST: Mutex<Option<(Instant, String)>> = Mutex::new(None);
let mut last = LAST.lock();
if let Some((at, seen)) = last.as_ref()
&& at.elapsed() < Duration::from_secs(3)
{
return seen.clone();
}
// Credentials are left out of the matcher's `Debug`.
let seen = format!("{:?}", hyper_util::client::proxy::matcher::Matcher::from_system());
*last = Some((Instant::now(), seen.clone()));
seen
static CLIENT: Mutex<Option<(Arc<ProxySettings>, reqwest::Client)>> = Mutex::new(None);
cached_client(&CLIENT, |proxy| build_with_redirect(proxy, reqwest::redirect::Policy::none()))
}
fn cached_client(
slot: &Mutex<Option<Cached>>,
build: impl Fn(&ProxySettings) -> IdeResult<reqwest::Client>,
system: fn() -> String,
slot: &Mutex<Option<(Arc<ProxySettings>, reqwest::Client)>>,
build: fn(&ProxySettings) -> IdeResult<reqwest::Client>,
) -> IdeResult<reqwest::Client> {
let proxy = ide_core::proxy_settings::proxy();
let system = (proxy.mode == ProxyMode::Auto).then(system);
let mut cached = slot.lock();
if let Some(c) = cached.as_ref()
&& *c.settings == *proxy
&& c.system == system
if let Some((settings, client)) = cached.as_ref()
&& **settings == *proxy
{
return Ok(c.client.clone());
return Ok(client.clone());
}
let client = build(&proxy)?;
*cached = Some(Cached { settings: proxy, system, client: client.clone() });
*cached = Some((proxy, client.clone()));
Ok(client)
}
@@ -170,36 +142,6 @@ pub fn describe(e: &reqwest::Error) -> String {
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn auto_mode_rebuilds_the_shared_client_when_the_system_proxy_changes() {
static SYSTEM: Mutex<String> = Mutex::new(String::new());
static BUILDS: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);
fn system() -> String {
SYSTEM.lock().clone()
}
let slot = Mutex::new(None);
let get = || {
cached_client(
&slot,
|proxy| {
BUILDS.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
build(proxy)
},
system,
)
.unwrap()
};
assert_eq!(ide_core::proxy_settings::proxy().mode, ProxyMode::Auto);
get();
get();
assert_eq!(BUILDS.load(std::sync::atomic::Ordering::SeqCst), 1);
// A proxy app switches the system proxy on after launch.
*SYSTEM.lock() = "Matcher { https: 127.0.0.1:7890 }".into();
get();
get();
assert_eq!(BUILDS.load(std::sync::atomic::Ordering::SeqCst), 2);
}
use ide_core::proxy_settings::ProxyKind;
use std::io::{BufRead, BufReader, Write};
use std::net::TcpListener;
+4 -4
Переглянути файл
@@ -265,7 +265,7 @@ impl ProjectIndex {
pub fn find_files(&self, query: &str, limit: usize) -> Vec<FileMatch> {
let recent = self.shared.recent.lock().clone();
let d = self.shared.data.read();
matching::find_files(&d, &matching::Recents::new(&recent), query, Some(&self.root), limit)
matching::find_files(&d, &matching::Recents::new(&recent), query, limit)
}
/// All indexed files with this exact basename, for resolving printed source locations.
@@ -301,7 +301,7 @@ impl ProjectIndex {
/// Fuzzy search for folders that hold indexed files; `rel_path` ends in `/`.
pub fn find_dirs(&self, query: &str, limit: usize) -> Vec<FileMatch> {
matching::find_dirs(&self.shared.data.read(), query, Some(&self.root), limit)
matching::find_dirs(&self.shared.data.read(), query, limit)
}
/// Fuzzy symbol search; CamelHump aware (`OCo` → `OrderController`).
@@ -574,11 +574,11 @@ pub mod bench_support {
}
pub fn find_files(&self, query: &str, limit: usize) -> Vec<FileMatch> {
matching::find_files(&self.data, &matching::Recents::new(&self.recent), query, None, limit)
matching::find_files(&self.data, &matching::Recents::new(&self.recent), query, limit)
}
pub fn find_dirs(&self, query: &str, limit: usize) -> Vec<FileMatch> {
matching::find_dirs(&self.data, query, None, limit)
matching::find_dirs(&self.data, query, limit)
}
pub fn find_symbols(&self, query: &str, filter: SymbolFilter, limit: usize) -> Vec<SymbolMatch> {
+8 -56
Переглянути файл
@@ -205,67 +205,29 @@ impl<'a> Recents<'a> {
}
}
/// `Foo.kt:12:3` -> `Foo.kt`; `\` -> `/`; a pasted absolute path under `root` -> its project-relative
/// form; strips leading `./` and `/`.
fn normalize_file_query(q: &str, root: Option<&Path>) -> String {
/// `Foo.kt:12:3` -> `Foo.kt`; `\` -> `/`; strips leading `./` and `/`.
fn normalize_file_query(q: &str) -> String {
let mut q = q.trim().replace('\\', "/");
// `\\?\C:\a` (verbatim) and `\\.\C:\a` name `C:/a`.
if let Some(rest) = verbatim_target(&q) {
q = rest.to_owned();
}
while let Some((head, tail)) = q.rsplit_once(':')
&& !tail.is_empty()
&& tail.bytes().all(|b| b.is_ascii_digit())
{
q = head.to_owned();
}
if let Some(root) = root
&& let Some(rel) = strip_root(&q, root)
{
q = rel;
}
let q = q.trim_start_matches("./").trim_start_matches('/');
q.chars().filter(|c| !c.is_whitespace()).collect()
}
/// Path a `\\?\` / `\\.\` verbatim prefix points at, for a `/`-separated path.
fn verbatim_target(q: &str) -> Option<&str> {
q.strip_prefix("//?/").or_else(|| q.strip_prefix("//./"))
}
/// `q` (already `/`-separated) below `root`, without the separating slash. A drive-letter root
/// compares like Windows, where case does not matter.
fn strip_root(q: &str, root: &Path) -> Option<String> {
let root = root.to_string_lossy().replace('\\', "/");
let root = verbatim_target(&root).unwrap_or(&root);
let root = root.trim_end_matches('/');
let windows = root.as_bytes().get(1) == Some(&b':');
let head = q.get(..root.len())?;
if head != root && !(windows && head.eq_ignore_ascii_case(root)) {
return None;
}
match q.get(root.len()..)? {
"" => Some(String::new()),
tail => tail.strip_prefix('/').map(str::to_owned),
}
}
enum FileQuery {
Name(Needle),
Path { dir: Needle, name: Needle },
}
pub(crate) fn find_files(
data: &IndexData,
recents: &Recents,
query: &str,
root: Option<&Path>,
limit: usize,
) -> Vec<FileMatch> {
pub(crate) fn find_files(data: &IndexData, recents: &Recents, query: &str, limit: usize) -> Vec<FileMatch> {
if limit == 0 {
return Vec::new();
}
let q = normalize_file_query(query, root);
let q = normalize_file_query(query);
if q.is_empty() {
return recents
.paths
@@ -344,8 +306,8 @@ pub(crate) fn find_files(
/// Fuzzy folder search over the folders holding indexed files: folder-name matches beat
/// path matches; `/` in the query matches the whole path. `rel_path` ends in `/`.
pub(crate) fn find_dirs(data: &IndexData, query: &str, root: Option<&Path>, limit: usize) -> Vec<FileMatch> {
let q = normalize_file_query(query, root);
pub(crate) fn find_dirs(data: &IndexData, query: &str, limit: usize) -> Vec<FileMatch> {
let q = normalize_file_query(query);
if limit == 0 || q.is_empty() {
return Vec::new();
}
@@ -711,18 +673,8 @@ mod tests {
#[test]
fn normalizes_queries() {
let root = Path::new("E:/work/sample");
assert_eq!(normalize_file_query(" ./src\\main.rs:12:4 ", None), "src/main.rs");
assert_eq!(normalize_file_query("/a b", None), "ab");
// A pasted absolute path names an indexed file (#4079 follow-up).
assert_eq!(normalize_file_query(r"E:\work\sample\pkg\Config.go", Some(root)), "pkg/Config.go");
assert_eq!(normalize_file_query(r"e:/WORK/sample\pkg/Config.go", Some(root)), "pkg/Config.go");
assert_eq!(normalize_file_query(r"\\?\E:\work\sample\src\App.kt", Some(root)), "src/App.kt");
assert_eq!(normalize_file_query(r"E:\work\sample\pkg\Config.go:12:4", Some(root)), "pkg/Config.go");
// Outside the project, and a POSIX root, keep the path as given.
assert_eq!(normalize_file_query(r"E:\elsewhere\x.go", Some(root)), "E:/elsewhere/x.go");
assert_eq!(normalize_file_query("/home/me/Src/a.rs", Some(Path::new("/home/me/src"))), "home/me/Src/a.rs");
assert_eq!(normalize_file_query("/home/me/src/a.rs", Some(Path::new("/home/me/src"))), "a.rs");
assert_eq!(normalize_file_query(" ./src\\main.rs:12:4 "), "src/main.rs");
assert_eq!(normalize_file_query("/a b"), "ab");
assert_eq!(split_symbol_query("Order.save"), (Some("Order"), "save"));
assert_eq!(split_symbol_query("a::b::C::new"), (Some("C"), "new"));
assert_eq!(split_symbol_query("save"), (None, "save"));
-13
Переглянути файл
@@ -190,19 +190,6 @@ fn file_ranking_is_idea_like() {
assert_eq!(shown.to_lowercase(), "uibtn");
}
#[test]
fn a_pasted_absolute_path_finds_the_indexed_file() {
let fx = sample();
let idx = fx.open();
let abs = fx.root.join("src/ui/Button.tsx");
let abs = abs.to_string_lossy().into_owned();
assert_eq!(files(&idx, &abs)[0], "src/ui/Button.tsx");
// A trailing `:line:col`, and a path outside the project that names no file.
assert_eq!(files(&idx, &format!("{abs}:12:4"))[0], "src/ui/Button.tsx");
let outside = fx.root.parent().unwrap().join("elsewhere/Button.tsx");
assert!(files(&idx, &outside.to_string_lossy()).is_empty());
}
#[test]
fn find_dirs_ranks_folder_names() {
let f = sample();
+1 -22
Переглянути файл
@@ -25,7 +25,7 @@ impl LspManager {
/// Whether jdtls serves the Java files of `path`. Without it, launches build with the
/// build tool and take the classpath from [`Self::java_server_classpath`] or the build model.
pub fn java_served_by_jdtls(&self, path: &Path) -> bool {
self.servers_for(&LanguageId::new("java"), path).iter().any(|s| s.name == JDTLS && !s.gave_up())
self.servers_for(&LanguageId::new("java"), path).iter().any(|s| s.name == JDTLS)
}
/// The java-analyzer executable among the Java servers of `path`, whatever the server is
@@ -107,27 +107,6 @@ fn is_java_analyzer(binary: &Path) -> bool {
#[cfg(test)]
mod tests {
use super::*;
use crate::server::Conn;
use ide_core::event::ServerStatus;
use ide_language::LanguageRegistry;
use std::sync::Arc;
#[test]
fn missing_jdtls_leaves_java_analyzer_to_serve_the_module() {
let project = tempfile::tempdir().unwrap();
let root = project.path();
let manager =
LspManager::new(root.to_path_buf(), Arc::new(LanguageRegistry::load(None).unwrap()), Arc::new(|_| {}));
assert!(manager.java_served_by_jdtls(root));
assert!(manager.java_analyzer_binary(root).is_none());
let jdtls = manager.servers_for(&LanguageId::new("java"), root).into_iter().find(|s| s.name == JDTLS).unwrap();
let generation = jdtls.begin_start().unwrap();
assert!(jdtls.fail_start(generation, Conn::Missing, manager.sink(), ServerStatus::Missing, None));
assert!(!manager.java_served_by_jdtls(root));
assert_eq!(manager.java_analyzer_binary(root).as_deref(), Some(Path::new("java-analyzer")));
}
#[test]
fn recognises_java_analyzer_by_its_executable() {
+57 -71
Переглянути файл
@@ -349,9 +349,64 @@ impl RemoteService {
progress: &mut (dyn FnMut(&str, usize, usize) + Send),
) -> IdeResult<TransferReport> {
let fs = self.fs(connection).await?;
let r = download_into(&fs, remotes, dir, cancel, progress).await;
let mut report = TransferReport::default();
let mut folders = Vec::new();
let mut jobs = Vec::new();
for remote in remotes {
let Some(top) = download_target(dir, remote, remote) else {
report.skipped += 1;
continue;
};
match fs.stat(remote).await {
Ok(Some(e)) if e.is_dir => {
folders.push(top);
let mut entries = Vec::new();
if let Err(e) = remote_tree(&fs, remote, cancel, &mut entries).await {
report.fail(remote.clone(), e);
}
for entry in entries {
match download_target(dir, remote, &entry.path) {
Some(local) if entry.is_dir => folders.push(local),
Some(local) => jobs.push((entry.path, local)),
None => report.skipped += 1,
}
}
}
Ok(Some(_)) => jobs.push((remote.clone(), top)),
Ok(None) => report.fail(remote.clone(), IdeError::not_found(format!("{remote} does not exist"))),
Err(e) => report.fail(remote.clone(), e),
}
}
let root = tokio::fs::canonicalize(dir).await?;
for folder in &folders {
if !stays_inside(&root, folder).await {
report.fail(folder.display().to_string(), outside(folder));
} else if let Err(e) = tokio::fs::create_dir_all(folder).await {
report.fail(folder.display().to_string(), e.into());
}
}
for (i, (remote, local)) in jobs.iter().enumerate() {
if cancel.is_cancelled() {
break;
}
progress(remote, i, jobs.len());
if !stays_inside(&root, local).await {
report.fail(remote.clone(), outside(local));
continue;
}
if let Some(parent) = local.parent()
&& let Err(e) = tokio::fs::create_dir_all(parent).await
{
report.fail(remote.clone(), e.into());
continue;
}
match fs.download(remote, local).await {
Ok(()) => report.files += 1,
Err(e) => report.fail(remote.clone(), e),
}
}
fs.close().await;
r
Ok(report)
}
// --- save hook -----------------------------------------------------------------
@@ -601,75 +656,6 @@ fn cache_key(connection: &FsConnection) -> String {
}
/// Files and folders under remote folder `dir` (symlinked folders are not followed).
/// `remotes` (folders recursively) into the local folder `dir`, each under its own name, without
/// the remote path above it; existing files are replaced. Remote Host › Download to…, and the
/// project view's Download to… in a remote project.
pub async fn download_into(
fs: &RemoteFs,
remotes: &[String],
dir: &Path,
cancel: &CancellationToken,
progress: &mut (dyn FnMut(&str, usize, usize) + Send),
) -> IdeResult<TransferReport> {
let mut report = TransferReport::default();
let mut folders = Vec::new();
let mut jobs = Vec::new();
for remote in remotes {
let Some(top) = download_target(dir, remote, remote) else {
report.skipped += 1;
continue;
};
match fs.stat(remote).await {
Ok(Some(e)) if e.is_dir => {
folders.push(top);
let mut entries = Vec::new();
if let Err(e) = remote_tree(fs, remote, cancel, &mut entries).await {
report.fail(remote.clone(), e);
}
for entry in entries {
match download_target(dir, remote, &entry.path) {
Some(local) if entry.is_dir => folders.push(local),
Some(local) => jobs.push((entry.path, local)),
None => report.skipped += 1,
}
}
}
Ok(Some(_)) => jobs.push((remote.clone(), top)),
Ok(None) => report.fail(remote.clone(), IdeError::not_found(format!("{remote} does not exist"))),
Err(e) => report.fail(remote.clone(), e),
}
}
let root = tokio::fs::canonicalize(dir).await?;
for folder in &folders {
if !stays_inside(&root, folder).await {
report.fail(folder.display().to_string(), outside(folder));
} else if let Err(e) = tokio::fs::create_dir_all(folder).await {
report.fail(folder.display().to_string(), e.into());
}
}
for (i, (remote, local)) in jobs.iter().enumerate() {
if cancel.is_cancelled() {
break;
}
progress(remote, i, jobs.len());
if !stays_inside(&root, local).await {
report.fail(remote.clone(), outside(local));
continue;
}
if let Some(parent) = local.parent()
&& let Err(e) = tokio::fs::create_dir_all(parent).await
{
report.fail(remote.clone(), e.into());
continue;
}
match fs.download(remote, local).await {
Ok(()) => report.files += 1,
Err(e) => report.fail(remote.clone(), e),
}
}
Ok(report)
}
async fn remote_tree(
fs: &RemoteFs,
dir: &str,
+6 -20
Переглянути файл
@@ -631,11 +631,9 @@ fn spring_boot_apps(root: &Path, build: &Path, out: &mut Vec<RunConfig>) {
}
}
/// The module has main sources and Spring Boot on its classpath, as far as its build files
/// tell: its own build, or a build above it in `build` that hands Spring Boot to its modules,
/// references it (a dependency, the starter parent, the BOM or the plugin). A Maven module that
/// depends on Spring Boot through a parent or another module is a Spring Boot application even
/// without the packaging plugin; only `<pluginManagement>` alone doesn't count.
/// The module has main sources, and its build applies the Spring Boot plugin: its own build
/// file, or a build above it in `build` that applies it to its modules (a parent POM's
/// `<build><plugins>`, Gradle's `subprojects` / `allprojects`).
fn applies_spring_boot(build: &Path, module: &Path) -> bool {
if !["java", "kotlin"].iter().any(|l| module.join("src/main").join(l).is_dir()) {
return false;
@@ -644,19 +642,15 @@ fn applies_spring_boot(build: &Path, module: &Path) -> bool {
if pom.contains("<packaging>pom</packaging>") {
return false;
}
if references_spring_boot(&without_plugin_management(&pom)) {
if pom.contains("spring-boot-maven-plugin") {
return true;
}
} else if GRADLE_BUILDS
.iter()
.filter_map(|n| read(&module.join(n)))
.any(|text| applies_boot_gradle_plugin(&text) || text.contains("org.springframework.boot:"))
{
} else if GRADLE_BUILDS.iter().filter_map(|n| read(&module.join(n))).any(|text| applies_boot_gradle_plugin(&text)) {
return true;
}
module.ancestors().skip(1).take_while(|dir| dir.starts_with(build)).any(|dir| {
if let Some(pom) = read(&dir.join("pom.xml")) {
return references_spring_boot(&without_plugin_management(&pom));
return without_plugin_management(&pom).contains("spring-boot-maven-plugin");
}
GRADLE_BUILDS.iter().filter_map(|n| read(&dir.join(n))).any(|text| {
(text.contains("subprojects") || text.contains("allprojects")) && applies_boot_gradle_plugin(&text)
@@ -664,14 +658,6 @@ fn applies_spring_boot(build: &Path, module: &Path) -> bool {
})
}
/// A POM (without its `<pluginManagement>`) referencing Spring Boot: a dependency or the parent
/// (`org.springframework.boot`), a starter, the BOM import or the plugin.
fn references_spring_boot(pom: &str) -> bool {
["org.springframework.boot", "spring-boot-starter", "spring-boot-dependencies", "spring-boot-maven-plugin"]
.iter()
.any(|m| pom.contains(m))
}
/// A Gradle build applying the plugin (`id("org.springframework.boot")`, `apply plugin: '…'`),
/// not only depending on Spring Boot (`org.springframework.boot:…`).
fn applies_boot_gradle_plugin(text: &str) -> bool {
+2 -6
Переглянути файл
@@ -1112,12 +1112,8 @@ fn module_count(root: &Path) -> usize {
/// named after its `artifactId` (usually its folder), a Gradle one `<project>.<path>.<source set>`.
fn module_dir(root: &Path, name: &str) -> Option<String> {
let folder = |dir: &Path| dir.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
// A Maven module is named after its artifactId, so that match wins over a folder of the same
// name anywhere above it (a checkout folder named like a child module's artifactId).
if let Some(dir) = find_module(root, &|dir: &Path| pom_artifact(dir).is_some_and(|a| a == name)) {
return Some(dir);
}
if let Some(dir) = find_module(root, &|dir: &Path| folder(dir) == name) {
let exact = |dir: &Path| folder(dir) == name || pom_artifact(dir).is_some_and(|a| a == name);
if let Some(dir) = find_module(root, &exact) {
return Some(dir);
}
let gradle = name.strip_suffix(".main").or_else(|| name.strip_suffix(".test")).unwrap_or(name);
+1 -48
Переглянути файл
@@ -938,18 +938,7 @@ fn launch_env(root: &Path, config: &RunConfig) -> IdeResult<LaunchEnv> {
vars.insert("PYTHONUNBUFFERED".into(), "1".into());
}
vars.extend(config.env.iter().map(|(k, v)| (k.clone(), v.clone())));
let mut env = LaunchEnv { clear: !extras.include_system_env, vars };
// `npm.cmd` is found on the login-shell and Windows user PATH, then started by its
// full path. The script it runs (`node …`) only sees this process's PATH, which
// does not include that directory, so `node` is not recognized.
let cwd = resolve_cwd(root, config.cwd.as_deref());
if !env.clear && !env.vars.keys().any(|k| k.eq_ignore_ascii_case("PATH")) {
let path = crate::wrap::search_path_in(config, &cwd);
if let Some(text) = path.to_str().filter(|s| !s.is_empty()) {
env.vars.insert("PATH".into(), text.to_owned());
}
}
Ok(env)
Ok(LaunchEnv { clear: !extras.include_system_env, vars })
}
/// What a run in the project at `root` inherits with "Include system environment variables"
@@ -1457,42 +1446,6 @@ mod tests {
assert_eq!(binary.program, script);
}
fn bare_config(env: BTreeMap<String, String>) -> RunConfig {
RunConfig {
id: "c".into(),
name: "c".into(),
kind: "npm".into(),
command: "npm".into(),
args: vec!["run".into(), "start".into()],
cwd: None,
env,
detected: true,
is_test: false,
debug_adapter: None,
allow_parallel: false,
extras: Default::default(),
}
}
#[test]
fn a_run_inherits_the_path_used_to_resolve_its_program() {
let dir = tempfile::tempdir().unwrap();
let config = bare_config(BTreeMap::new());
let env = launch_env(dir.path(), &config).unwrap();
let path = env.vars.get("PATH").expect("child PATH");
let search = crate::wrap::search_path_in(&config, dir.path());
assert_eq!(path, search.to_str().unwrap());
}
#[test]
fn an_explicit_path_override_is_kept() {
let dir = tempfile::tempdir().unwrap();
let config = bare_config(BTreeMap::from([("Path".into(), r"C:\tools".into())]));
let env = launch_env(dir.path(), &config).unwrap();
assert_eq!(env.vars.get("Path").map(String::as_str), Some(r"C:\tools"));
assert_eq!(env.vars.keys().filter(|k| k.eq_ignore_ascii_case("PATH")).count(), 1);
}
#[test]
fn shell_lines_use_cmd_verbatim_on_windows() {
let line = r#"(if not exist "C:\T\openidea-run" mkdir "C:\T\openidea-run") && "C:\Program Files\rustc.exe" -o "C:\T\openidea-run\hi.exe" hi.rs"#;
+6 -38
Переглянути файл
@@ -380,57 +380,25 @@ fn a_root_build_disables_the_nested_scan() {
}
#[test]
fn spring_boot_applications_need_spring_boot_and_a_main() {
fn spring_boot_applications_need_the_plugin_and_a_main() {
let main =
"package demo;\n@SpringBootApplication\npublic class App {\n public static void main(String[] args) {}\n}\n";
// A module without Spring Boot in its build, a configuration class without `main`, the
// annotation in a comment, a parent POM.
// A library using Spring Boot without the plugin, a configuration class without `main`,
// the annotation in a comment, a parent POM.
let dir = project(&[
("plain/pom.xml", "<project><dependencies>commons-lang3</dependencies></project>"),
("plain/src/main/java/demo/App.java", main),
("lib/pom.xml", "<project><dependencies>spring-boot-starter</dependencies></project>"),
("lib/src/main/java/demo/App.java", main),
("svc/pom.xml", BOOT_POM),
("svc/src/main/java/demo/Config.java", "package demo;\n@SpringBootApplication\npublic class Config {}\n"),
(
"svc/src/main/java/demo/Old.java",
"package demo;\n// @SpringBootApplication\nclass Old { public static void main(String[] a) {} }\n",
),
("gr/build.gradle", "dependencies { implementation 'com.google.guava:guava:33.0.0-jre' }\n"),
("gr/src/main/java/demo/App.java", main),
]);
let c = detect(dir.path());
assert!(!c.iter().any(|c| c.kind == "spring-boot"), "{:?}", ids(&c));
}
/// Spring Boot on the classpath is enough, as for IntelliJ IDEA: a module depending on a
/// starter (directly or through its parent POM) without the packaging plugin, and Gradle's
/// dependency on `org.springframework.boot:…`.
#[test]
fn spring_boot_applications_without_the_plugin() {
let main =
"package demo;\n@SpringBootApplication\npublic class App {\n public static void main(String[] args) {}\n}\n";
let dir = project(&[
(
"lib/pom.xml",
"<project><dependencies><dependency><groupId>org.springframework.boot</groupId>\
<artifactId>spring-boot-starter-web</artifactId></dependency></dependencies></project>",
),
("lib/src/main/java/demo/App.java", main),
("gr/build.gradle", "dependencies { implementation 'org.springframework.boot:spring-boot-starter' }\n"),
("gr/src/main/java/demo/App.java", main),
]);
let c = detect(dir.path());
assert_eq!(find(&c, "application:lib:demo.App").kind, "spring-boot");
assert_eq!(find(&c, "application:gr:demo.App").kind, "spring-boot");
let parent = "<project><packaging>pom</packaging><modules><module>job</module></modules>\
<parent><groupId>org.springframework.boot</groupId>\
<artifactId>spring-boot-starter-parent</artifactId></parent></project>";
let dir = project(&[
("pom.xml", parent),
("job/pom.xml", "<project><artifactId>job</artifactId></project>"),
("job/src/main/java/demo/App.java", main),
]);
assert_eq!(find(&detect(dir.path()), "application:job:demo.App").kind, "spring-boot");
assert!(!c.iter().any(|c| c.kind == "spring-boot"), "{:?}", ids(&c));
}
#[test]
-32
Переглянути файл
@@ -860,38 +860,6 @@ fn java_applications_and_spring_boot_keep_their_module() {
assert_eq!(reason(&r, "NoMain"), &SkipReason::NothingToRun);
}
/// A checkout folder named like a child module's artifactId: IDEA's module is the child.
#[test]
fn maven_module_artifact_wins_over_a_folder_of_the_same_name() {
let dir = tempfile::tempdir().unwrap();
let root = dunce::canonicalize(dir.path()).unwrap().join("demo-service");
write(
&root,
"pom.xml",
"<project><artifactId>demo-service-parent</artifactId><packaging>pom</packaging></project>",
);
write(
&root,
"app-web/pom.xml",
"<project><parent><artifactId>demo-service-parent</artifactId></parent><artifactId>demo-service</artifactId></project>",
);
write(
&root,
".run/Demo.run.xml",
&run_file(
"Demo",
r#"<configuration name="Demo" type="Application" factoryName="Application">
<module name="demo-service" />
<option name="MAIN_CLASS_NAME" value="com.example.Demo" />
</configuration>"#,
),
);
let r = import_from(&root, &[]);
assert_eq!(get(&r, "Demo").extras.module.as_deref(), Some("app-web"));
}
/// IDEA writes the working directory as a URL. On Windows `file://$PROJECT_DIR$`
/// expands to `file://C:/project`, where the drive letter sits where the authority
/// belongs; read as a path that is `C:project`, which resolves against the project
+12 -20
Переглянути файл
@@ -1,6 +1,7 @@
use crate::editorconfig::{EditorConfig, EditorConfigProps};
use crate::file_defaults::FileDefaults;
use ide_core::error::ErrorKind;
use ide_core::event::NotifyLevel;
use ide_core::{ChangeSet, DocId, IdeError, IdeEvent, IdeResult, LanguageId, SharedSink, TextEdit};
use ide_text::{AppliedChange, ByteEdit, Document, LineEnding};
use parking_lot::{Mutex, ReentrantMutex, RwLock};
@@ -1137,24 +1138,6 @@ impl Documents {
})
}
/// Load Changes from Disk: drops the buffer's unsaved changes and reads its file again in
/// the buffer's encoding, after the file changed on disk (`IdeEvent::DocDiskConflict`).
pub fn discard_and_reload(&self, doc: DocId) -> IdeResult<()> {
self.with_doc(doc, |st| {
if st.uri.is_some() || st.binary {
return Err(IdeError::invalid("only a file's text can be reloaded from disk"));
}
let loaded = Self::load_as(&st.path, &st.encoding, st.native_to_ascii)?;
st.has_bom = loaded.has_bom;
st.disk_mtime = loaded.mtime_ms;
st.disk_len = disk_len(&st.path);
st.disk_conflict = false;
self.replace_locked(doc, st, &loaded.text)?;
self.set_dirty(doc, st, false);
Ok(())
})
}
/// The URI of a virtual document, or `None` for a file-backed one.
pub fn virtual_uri(&self, doc: DocId) -> IdeResult<Option<String>> {
self.with_doc(doc, |st| Ok(st.uri.clone()))
@@ -1267,7 +1250,7 @@ impl Documents {
}
/// Re-reads from disk after an external change. Clean documents reload
/// silently; dirty ones are left alone and reported via `IdeEvent::DocDiskConflict`.
/// silently; dirty ones are left alone and reported via `IdeEvent::Notify`.
/// Changes matching our own last save are ignored.
pub fn on_disk_changed(&self, paths: &[PathBuf]) {
self.reload_from_disk(paths, false, false);
@@ -1306,7 +1289,16 @@ impl Documents {
st.disk_mtime = mtime;
st.disk_len = meta.len();
st.disk_conflict = true;
self.sink.emit(IdeEvent::DocDiskConflict { doc: id, path: st.path.to_string_lossy().into_owned() });
let name = st.path.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
self.sink.emit(IdeEvent::Notify {
level: NotifyLevel::Warning,
title: format!("{name} changed on disk"),
body: Some(format!(
"{} was modified externally but has unsaved changes in the editor. \
Saving explicitly will overwrite the external changes; autosave leaves the file alone.",
st.path.display()
)),
});
return Ok(());
}
let loaded = if force_clean {
+5 -20
Переглянути файл
@@ -1,4 +1,5 @@
use ide_core::error::ErrorKind;
use ide_core::event::NotifyLevel;
use ide_core::{ChangeSet, DocId, IdeEvent, LanguageId, Pos, Range, SharedSink, TextChange, TextEdit};
use ide_text::{AppliedChange, LineEnding};
use ide_workspace::documents::DocumentObserver;
@@ -564,31 +565,15 @@ fn external_changes() {
fs::write(&path, "something else\n").unwrap();
f.docs.on_disk_changed(std::slice::from_ref(&path));
assert_eq!(f.docs.snapshot(id).unwrap().text, "// alpha\nBETA\ngamma\n");
let warnings = f
.events
.lock()
.iter()
.filter(|e| matches!(e, IdeEvent::DocDiskConflict { path: p, .. } if *p == path.to_string_lossy()))
.count();
let warnings =
f.events.lock().iter().filter(|e| matches!(e, IdeEvent::Notify { level: NotifyLevel::Warning, .. })).count();
assert_eq!(warnings, 1);
// The same disk state is reported only once.
f.docs.on_disk_changed(std::slice::from_ref(&path));
let warnings = f
.events
.lock()
.iter()
.filter(|e| matches!(e, IdeEvent::DocDiskConflict { path: p, .. } if *p == path.to_string_lossy()))
.count();
let warnings =
f.events.lock().iter().filter(|e| matches!(e, IdeEvent::Notify { level: NotifyLevel::Warning, .. })).count();
assert_eq!(warnings, 1);
// Load Changes from Disk drops the buffer's changes; autosave writes again afterwards.
f.docs.discard_and_reload(id).unwrap();
let reloaded = f.docs.snapshot(id).unwrap();
assert_eq!((reloaded.text.as_str(), reloaded.dirty), ("something else\n", false));
f.docs.edit(id, reloaded.version, change(0, 0, "# ")).unwrap();
assert!(f.docs.autosave(id).unwrap());
assert_eq!(fs::read_to_string(&path).unwrap(), "# something else\n");
// Unknown paths are ignored.
f.docs.on_disk_changed(&[f.root.join("other.txt")]);
}
-1
Переглянути файл
@@ -57,7 +57,6 @@ Language servers that support LSP inline completion show a grey suggestion at th
| **Next Method** / **Previous Method** | `⌃⇧↓` / `⌃⇧↑` | `Alt+Down` / `Alt+Up` |
- **Go to Declaration or Usages** on a declaration shows its usages instead.
- **Go to Implementation(s)** navigates to the symbol's own declaration when it has no implementations, as in IntelliJ IDEA.
- Hold `⌘` / `Ctrl` and hover over a name to see it underlined as a link, with brief information about it.
- Gutter icons mark types and methods that are implemented or overridden (↓) and methods that implement or override another (↑). Click one to go there.
- **Navigate › Test** jumps between a class and its tests by naming convention and offers **Create New Test…** when there is none.
+1 -1
Переглянути файл
@@ -23,7 +23,7 @@ Only types you add appear here: choose **Add Service › Run Configuration Type*
- Configuration actions: **Run** (or **Rerun**), **Debug**, **Stop**, **Open in Browser**, **Update Application** (for configurations that support it).
- Context menu: **Show in Run Tool Window**, **Show in Debug Tool Window**, **Edit Configuration…**, **Remove from Services**.
A configuration that ran shows its console in the detail pane; one debugged from here shows the whole debugger there (Threads & Variables, Console, Memory), and a breakpoint keeps the Services tool window in front. Reorder configurations within a group by dragging them or with **Move Up** / **Move Down**; the order is saved per project.
A configuration that ran shows its console in the detail pane. Reorder configurations within a group by dragging them or with **Move Up** / **Move Down**; the order is saved per project.
## Docker
+12 -13
Переглянути файл
@@ -43,7 +43,7 @@ It reads repository state (status, diffs, blame, log) in-process, and runs the `
- When creating a project, check **Create Git repository** in the New Project dialog.
- **Git › Create Git Repository…** runs `git init` in a folder you pick (the project root by default) and registers the new repository right away; a repository created in the terminal is picked up the same way.
OpenIDEA finds the repository that contains the project and nested repositories up to four levels deep (skipping folders such as `node_modules`, `target` and `build`). Status, commit, fetch and update cover all of them; branch operations from the branches popup cover all of them too (see [Branches](#branches)); log actions work on the selected repository. Submodules show as nested repositories, without submodule commands.
OpenIDEA finds the repository that contains the project and nested repositories up to four levels deep (skipping folders such as `node_modules`, `target` and `build`). Status, commit, fetch and update cover all of them; branch and log actions work on the selected repository. Submodules show as nested repositories, without submodule commands.
## Commit changes
@@ -143,7 +143,7 @@ Select a branch (`→` or `Enter`) for its actions:
If local changes block a checkout, you can choose **Smart Checkout** (stash, check out, unstash), **Force Checkout** or **Don't Checkout**. A deleted branch can be brought back with **Restore** in the notification.
With several repositories, the popup shows branches common to all of them, plus a submenu per repository; an operation on a common branch (Checkout, Checkout and Rebase, Rebase, Merge, Update, Rename, Delete…) runs in every repository, and if it fails in one of them, OpenIDEA offers to roll back the others. When the repositories are on different branches, the popup says **Branches have diverged** and still lists the common branches, so checking one out brings them back in step. Turn off **Execute branch operations on all repositories** in the Git settings to list and act on the selected repository only.
With several repositories, the popup shows branches common to all of them, plus a submenu per repository.
## Sync with remotes
@@ -178,7 +178,6 @@ The **Log** tab of the Git tool window shows the commit graph.
- **Graph Options**: sort by date, topologically or incoming first; first parent only; no merges.
- **View Options**: reference display, details pane, and columns (**Author**, **Date**, **Hash**, **Signature**, **GitHub Commit Checks**).
- The branches pane on the left filters the log by branch and has branch actions. Select several local branches and choose **Update Selected** to fast-forward each to its tracked branch, fetching each remote once; one notification lists the branches that were updated and those that could not be fast-forwarded or have no tracked branch.
- With several repositories, the branches pane lists each branch once; a branch that only some repositories have shows their names after it in grey, and its actions run in those repositories. **Group by Repository** in the pane's toolbar shows one subtree per repository instead.
- The details pane shows the changed files, the commit message, who committed it, which branches contain it and its signature.
Right-click a commit for **Copy Revision Number** (`⌥⇧⌘C` / `Ctrl+Alt+Shift+C`), **Create Patch…**, **Cherry-Pick**, **Checkout Revision**, **Browse Repository at Revision**, **Compare with Local**, **Reset Current Branch to Here…**, **Revert Commit**, **Undo Commit…**, **New Branch…**, **New Tag…**, **View in Browser** and more. With two commits selected, **Compare Versions** diffs them.
@@ -239,16 +238,16 @@ Retention is set in the **Local History** section of **Settings › Appearance &
**Settings › Version Control** has these pages:
| Page | Main options |
| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **Commit** | Non-modal commit interface, clearing the message after commit, message inspections (blank line after subject, subject and body length, right margin), default commit checks. |
| **Confirmation** | What to do when files are created or deleted, **Show options before Update**, confirm before dropping commits, highlight modified folders in the Project view, history row limit. |
| **Directory Mappings** | The detected repositories (read-only). |
| **Issue Navigation** | Regex patterns that turn issue IDs in commit messages into links (presets for JIRA, YouTrack and GitHub). |
| **Log** | Reference and time display, visible columns. |
| **Shelf** | Remove applied files from the shelf. |
| **Git** | Git executable, inline blame, commit warnings, sign-off default, push options and protected branches, update method (merge or rebase), incoming-commit checks, saved passwords, combining stash and shelf, branch operations on all repositories. |
| **GitHub** | See [GitHub](/en/guide/github). |
| Page | Main options |
| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **Commit** | Non-modal commit interface, clearing the message after commit, message inspections (blank line after subject, subject and body length, right margin), default commit checks. |
| **Confirmation** | What to do when files are created or deleted, **Show options before Update**, confirm before dropping commits, highlight modified folders in the Project view, history row limit. |
| **Directory Mappings** | The detected repositories (read-only). |
| **Issue Navigation** | Regex patterns that turn issue IDs in commit messages into links (presets for JIRA, YouTrack and GitHub). |
| **Log** | Reference and time display, visible columns. |
| **Shelf** | Remove applied files from the shelf. |
| **Git** | Git executable, inline blame, commit warnings, sign-off default, push options and protected branches, update method (merge or rebase), incoming-commit checks, saved passwords, combining stash and shelf. |
| **GitHub** | See [GitHub](/en/guide/github). |
## Not supported
-1
Переглянути файл
@@ -57,7 +57,6 @@ description: "代码补全、导航、查找用法、文档、层次结构与文
| **下一个方法** / **上一个方法** | `⌃⇧↓` / `⌃⇧↑` | `Alt+Down` / `Alt+Up` |
- 在声明本身上执行 **转到声明或用法**,会改为显示它的用法。
- 没有任何实现时,**转到实现** 会跳转到符号自身的声明,与 IntelliJ IDEA 一致。
- 按住 `⌘` / `Ctrl` 把鼠标悬停在名称上,名称会显示为链接,并附带简要信息。
- 装订区域的图标标出被实现或被重写的类型和方法(↓),以及实现或重写了其他方法的方法(↑),单击即可跳转。
- **导航 › 测试** 按命名约定在类和它的测试之间跳转;还没有测试时会提供 **创建新测试…**。
+1 -1
Переглянути файл
@@ -23,7 +23,7 @@ description: "在服务工具窗口中管理运行配置、Docker 容器、镜
- 配置操作:**运行**(或 **重新运行**)、**调试**、**停止**、**在浏览器中打开**、**更新应用**(仅支持的配置)。
- 右键菜单:**在运行工具窗口中显示**、**在调试工具窗口中显示**、**编辑配置…**、**从服务中移除**。
运行过的配置会在详情区显示其控制台;从这里调试的配置在详情区显示完整的调试器(线程和变量、控制台、内存),命中断点时停留在服务工具窗口。在同一分组内可以拖动或用 **上移** / **下移** 调整顺序,顺序按项目保存。
运行过的配置会在详情区显示其控制台。在同一分组内可以拖动或用 **上移** / **下移** 调整顺序,顺序按项目保存。
## Docker
+12 -13
Переглянути файл
@@ -43,7 +43,7 @@ OpenIDEA 内置 Git 支持,Git 也是它唯一支持的版本控制系统。
- 新建项目时,在新建项目对话框中勾选 **创建 Git 仓库**。
- **Git › 创建 Git 仓库…** 会在你选择的目录(默认是项目根目录)里执行 `git init`,并立即注册这个新仓库;在终端里创建的仓库同样会被识别。
OpenIDEA 会找到包含项目的仓库,以及向下最多四层的嵌套仓库(跳过 `node_modules`、`target`、`build` 等目录)。状态、提交、获取和更新覆盖所有仓库;分支弹窗中的分支操作同样覆盖所有仓库(见[分支](#分支));日志操作针对所选仓库。子模块显示为嵌套仓库,但没有子模块相关命令。
OpenIDEA 会找到包含项目的仓库,以及向下最多四层的嵌套仓库(跳过 `node_modules`、`target`、`build` 等目录)。状态、提交、获取和更新覆盖所有仓库;分支和日志操作针对所选仓库。子模块显示为嵌套仓库,但没有子模块相关命令。
## 提交更改
@@ -141,7 +141,7 @@ OpenIDEA 会找到包含项目的仓库,以及向下最多四层的嵌套仓
如果本地更改阻止签出,可以选择 **智能签出**(贮藏、签出、再恢复)、**强制签出** 或 **不签出**。删除的分支可以通过通知中的 **恢复** 找回。
有多个仓库时,弹窗会显示所有仓库共有的分支,以及每个仓库各自的子菜单;对公共分支的操作(签出、签出并变基、变基、合并、更新、重命名、删除等)会在每个仓库中执行,如果在某个仓库失败,OpenIDEA 会提议回滚其他仓库。各仓库处于不同分支时,弹窗会提示**分支已分叉**,但仍列出公共分支,检出其中一个即可让各仓库回到同一分支。在 Git 设置中关闭**在所有仓库执行分支操作**后,弹窗只列出并操作所选仓库。
有多个仓库时,弹窗会显示所有仓库共有的分支,以及每个仓库各自的子菜单。
## 与远程同步
@@ -176,7 +176,6 @@ Git 工具窗口的 **日志** 标签页显示提交图。
- **图形选项**:按日期、拓扑或传入优先排序;仅第一父提交;不显示合并提交。
- **视图选项**:引用显示方式、详情面板,以及列(**作者**、**日期**、**哈希**、**签名**、**GitHub 提交检查**)。
- 左侧的分支面板可以按分支过滤日志,并提供分支操作。选中多个本地分支后选择 **Update Selected**,会把每个分支快进到它的跟踪分支,每个远程只 fetch 一次;结果汇总在一条通知里,列出已更新的分支,以及因不能快进或没有跟踪分支而未更新的分支。
- 有多个仓库时,分支面板中每个分支只列一次;只存在于部分仓库的分支,后面会以灰字列出这些仓库,对它的操作会在这些仓库中执行。点击面板工具栏中的**按仓库分组**,可改为每个仓库一棵子树。
- 详情面板显示变更文件、提交消息、提交者、包含该提交的分支以及签名。
右键提交可以选择 **复制修订号**(`⌥⇧⌘C` / `Ctrl+Alt+Shift+C`)、**创建补丁…**、**拣选**、**签出修订**、**浏览此修订版本的仓库**、**与本地比较**、**将当前分支重置到此处…**、**还原提交**、**撤消提交…**、**新建分支…**、**新建标签…**、**在浏览器中查看** 等。选中两个提交时,**比较版本** 会比较它们。
@@ -237,16 +236,16 @@ Git 工具窗口的 **日志** 标签页显示提交图。
**设置 › 版本控制** 包含以下页面:
| 页面 | 主要选项 |
| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **提交** | 非模态提交界面、提交后清空消息、提交消息检查(主题与正文之间空行、主题和正文长度、右边距)、默认提交检查。 |
| **确认** | 新建或删除文件时的处理方式、**更新前显示选项**、丢弃提交前确认、在项目视图中高亮包含修改的目录、历史记录行数上限。 |
| **目录映射** | 检测到的仓库(只读)。 |
| **问题导航** | 把提交消息中的问题编号变成链接的正则规则(内置 JIRA、YouTrack 和 GitHub 预设)。 |
| **日志** | 引用和时间的显示方式、显示哪些列。 |
| **搁置** | 应用后从搁置中移除文件。 |
| **Git** | Git 可执行文件、内联 Blame、提交警告、默认签署、推送选项和受保护分支、更新方式(合并或变基)、传入提交检查、已保存的密码、合并显示贮藏和搁置、在所有仓库执行分支操作。 |
| **GitHub** | 见 [GitHub](/zh/guide/github)。 |
| 页面 | 主要选项 |
| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------- |
| **提交** | 非模态提交界面、提交后清空消息、提交消息检查(主题与正文之间空行、主题和正文长度、右边距)、默认提交检查。 |
| **确认** | 新建或删除文件时的处理方式、**更新前显示选项**、丢弃提交前确认、在项目视图中高亮包含修改的目录、历史记录行数上限。 |
| **目录映射** | 检测到的仓库(只读)。 |
| **问题导航** | 把提交消息中的问题编号变成链接的正则规则(内置 JIRA、YouTrack 和 GitHub 预设)。 |
| **日志** | 引用和时间的显示方式、显示哪些列。 |
| **搁置** | 应用后从搁置中移除文件。 |
| **Git** | Git 可执行文件、内联 Blame、提交警告、默认签署、推送选项和受保护分支、更新方式(合并或变基)、传入提交检查、已保存的密码、合并显示贮藏和搁置。 |
| **GitHub** | 见 [GitHub](/zh/guide/github)。 |
## 暂不支持
-68
Переглянути файл
@@ -1,68 +0,0 @@
import type { AttachableProcess } from "../src/bindings";
import { expect, stubDesktop, test } from "./fixtures";
test("keeps the process columns and selection visible in a short window", async ({ workbench: page }) => {
await page.setViewportSize({ width: 460, height: 440 });
await stubDesktop(page);
const processes: AttachableProcess[] = [
{
pid: 4100,
name: "java",
commandLine: "java -jar /sample/invoice-service.jar",
kind: "java",
adapter: "java",
host: "localhost",
port: 5005,
},
...Array.from({ length: 24 }, (_, i): AttachableProcess => ({
pid: 4201 + i,
name: `invoice-worker-${i + 1}`,
commandLine: `node /sample/services/long-package-name/invoice-worker.js --stage settlement-runner-${i + 1}`,
kind: "node",
adapter: "js-debug",
host: "localhost",
port: 9230 + i,
})),
];
await page.evaluate(async (processes) => {
window.__ipc.handlers.debug_attachable_processes = () => processes;
const actions = "/src/platform/actions.ts";
const { executeAction } = await import(/* @vite-ignore */ actions);
await executeAction("debug.attachToProcess");
}, processes);
const dialog = page.getByRole("dialog", { name: "Attach to process", exact: true });
const filter = dialog.getByRole("textbox", { name: "Filter processes" });
await expect(filter).toBeFocused();
const table = dialog.getByRole("grid", { name: "Processes" });
const pid = table.getByRole("columnheader", { name: "PID", exact: true });
await expect(pid).toBeInViewport({ ratio: 1 });
await expect(table.getByRole("columnheader", { name: "Command line" })).toBeInViewport({ ratio: 1 });
await filter.fill("settlement-runner");
for (let i = 1; i < 24; i++) await page.keyboard.press("ArrowDown");
const last = table.getByRole("row", { name: /^invoice-worker-24 / });
await expect(last).toHaveAttribute("aria-selected", "true");
await expect(last).toBeInViewport({ ratio: 1 });
await expect(pid).toBeInViewport({ ratio: 1 });
await expect(last.getByText(":9253", { exact: true })).toBeVisible();
await expect(last.getByTitle("localhost:9253", { exact: true })).toBeVisible();
const lastPid = last.getByRole("gridcell", { name: "4224", exact: true });
expect((await lastPid.boundingBox())!.x).toBeCloseTo((await pid.boundingBox())!.x, 0);
const scrollArea = table.getByRole("rowgroup").last();
expect(await scrollArea.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
expect(await scrollArea.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await expect(filter).toBeFocused();
await expect(filter).toBeInViewport({ ratio: 1 });
for (const name of ["Refresh", "Attach", "Cancel"]) {
await expect(dialog.getByRole("button", { name, exact: true })).toBeInViewport({ ratio: 1 });
}
await page.setViewportSize({ width: 1040, height: 680 });
await expect(last.getByText("localhost:9253", { exact: true })).toBeVisible();
await filter.fill("unmatched-process");
await expect(dialog.getByText("No attachable processes match the filter.")).toBeVisible();
await expect(dialog.getByRole("button", { name: "Attach", exact: true })).toBeDisabled();
await dialog.getByRole("button", { name: "Cancel", exact: true }).click();
await expect(dialog).toBeHidden();
});
+1 -1
Переглянути файл
@@ -4,7 +4,7 @@ for (const [id, selector] of [
["general", "[class*='radios'] label"],
["notifications", "table tbody td:first-child"],
["keymap", "[class*='presetLabel']"],
["editor.inspections", "[class*='profileControls'] > span:first-child"],
["editor.inspections", "[class*='profileRow'] > span:first-child"],
["vcs.issueNavigation", "[class*='pageBody'] button:not([aria-label])"],
] as const) {
test(`${id} keeps compact labels inside their controls`, async ({ workbench: page }) => {
-51
Переглянути файл
@@ -1,51 +0,0 @@
import { expect, test } from "./fixtures";
test("the conflict actions stay visible beside or below the file list as the dialog resizes", async ({
workbench: page,
}) => {
await page.evaluate(async () => {
const storeModule = "/src/features/vcs/store.ts";
const dialogModule = "/src/features/vcs/conflictsUi.tsx";
const { useVcs } = await import(/* @vite-ignore */ storeModule);
const { showConflictsDialog } = await import(/* @vite-ignore */ dialogModule);
const root = "/dev/acme-api";
useVcs.setState({
root,
status: Array.from({ length: 24 }, (_, index) => {
const relPath = `services/payment-configuration/environments/env-${index + 1}.txt`;
return { path: `${root}/${relPath}`, relPath, staged: null, unstaged: "conflicted", renamedFrom: null };
}),
});
showConflictsDialog();
});
const dialog = page.getByRole("dialog", { name: "Conflicts", exact: true });
const list = dialog.getByRole("listbox", { name: "Conflicted files" });
const yours = dialog.getByRole("button", { name: "Accept Yours", exact: true });
await expect(list).toBeFocused();
const listBox = (await list.boundingBox())!;
const first = (await yours.boundingBox())!;
expect(first.x).toBeGreaterThan(listBox.x + listBox.width);
expect(first.y).toBeLessThan(listBox.y + listBox.height / 2);
const grip = (await dialog.getByRole("separator", { name: "Resize", exact: true }).boundingBox())!;
await page.mouse.move(grip.x + grip.width / 2, grip.y + grip.height / 2);
await page.mouse.down();
await page.mouse.move(grip.x + 36, grip.y + 68, { steps: 5 });
await page.mouse.up();
await expect.poll(async () => (await list.boundingBox())!.height).toBeGreaterThan(listBox.height + 40);
await page.setViewportSize({ width: 430, height: 530 });
await expect(yours).toBeInViewport({ ratio: 1 });
expect((await yours.boundingBox())!.y).toBeGreaterThan(
(await list.boundingBox())!.y + (await list.boundingBox())!.height,
);
for (const name of ["Accept Theirs", "Merge…"])
await expect(dialog.getByRole("button", { name, exact: true })).toBeInViewport({ ratio: 1 });
await expect(dialog.locator("[data-dialog-footer]").getByRole("button", { name: "Close" })).toBeInViewport({
ratio: 1,
});
await list.press("End");
await expect(list.getByRole("option", { selected: true })).toContainText("env-24.txt");
await page.keyboard.press("Escape");
await expect(dialog).toBeHidden();
});
-72
Переглянути файл
@@ -1,72 +0,0 @@
import { expect, stubDesktop, test } from "./fixtures";
test("Coverage keeps sortable statistics aligned next to the file tree at sidebar widths", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 1050, height: 550 });
await stubDesktop(page);
await page.evaluate(async () => {
const projectModule = "/src/platform/project.ts";
const actionsModule = "/src/platform/actions.ts";
const layoutModule = "/src/workbench/toolwindows/store.ts";
const { useProject } = await import(/* @vite-ignore */ projectModule);
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
const { setToolWindowSize } = await import(/* @vite-ignore */ layoutModule);
const root = useProject.getState().project.root;
const files = Array.from({ length: 36 }, (_, i) => ({
path: root + (i === 0 ? "/src/Ready.ts" : i === 1 ? "/src/Uncovered.ts" : "/src/settlement/Report" + i + ".ts"),
lines: [],
linesCovered: i === 0 ? 20 : i,
linesTotal: i === 0 ? 20 : 60,
branchesCovered: i === 0 ? 4 : 1,
branchesTotal: 4,
}));
window.__ipc.handlers.coverage_import = ({ path }) => ({
runner: "lcov",
hasBranches: path === "/tmp/coverage.lcov",
files,
});
setToolWindowSize("right", 280);
await executeAction("coverage.importReport", "/tmp/coverage.lcov");
});
const coverage = page.getByRole("region", { name: "Coverage", exact: true });
const tree = coverage.getByRole("tree", { name: "Coverage" });
const line = coverage.getByRole("columnheader", { name: "Line, %" });
const branch = coverage.getByRole("columnheader", { name: "Branch, %" });
const folder = tree.getByRole("treeitem", { name: /^settlement/ });
const ready = tree.getByRole("treeitem", { name: /^Ready\.ts/ });
await expect(ready).toBeVisible();
await expect(branch).toBeInViewport({ ratio: 1 });
await expect.poll(() => tree.evaluate((element) => element.scrollWidth - element.clientWidth)).toBe(0);
const lineLeft = (await line.boundingBox())!.x;
const branchLeft = (await branch.boundingBox())!.x;
for (const row of [ready, folder]) {
const cells = await row.getByTitle(/% \(/).all();
expect(cells).toHaveLength(2);
expect((await cells[0]!.boundingBox())!.x).toBeCloseTo(lineLeft, 0);
expect((await cells[1]!.boundingBox())!.x).toBeCloseTo(branchLeft, 0);
}
await branch.click();
await expect(branch).toHaveAttribute("aria-sort", "descending");
await expect(tree.getByRole("treeitem").nth(1)).toHaveAccessibleName(/^Ready\.ts/);
await folder.locator("[data-tree-toggle]").click();
const nested = tree.getByRole("treeitem", { name: /^Report/ }).first();
await expect(nested).toBeVisible();
expect(await tree.evaluate((element) => element.scrollHeight)).toBeGreaterThan(
await tree.evaluate((element) => element.clientHeight),
);
expect((await nested.getByTitle("25% (1/4)").boundingBox())!.x).toBeCloseTo((await branch.boundingBox())!.x, 0);
expect((await nested.getByTitle(/^Report/).boundingBox())!.width).toBeGreaterThan(30);
await page.evaluate(async () => {
const actionsModule = "/src/platform/actions.ts";
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
await executeAction("coverage.importReport", "/tmp/lines.lcov");
});
await expect(branch).toHaveCount(0);
await expect(line).toBeVisible();
expect((await ready.getByTitle("100% (20/20)").boundingBox())!.x).toBeCloseTo((await line.boundingBox())!.x, 0);
});
-66
Переглянути файл
@@ -1,66 +0,0 @@
import { expect, stubDesktop, test } from "./fixtures";
test("long diagnostics and quick fixes wrap within a narrow editor hover", async ({ workbench: page }) => {
await page.setViewportSize({ width: 520, height: 580 });
const path = "/dev/acme-api/Settlement.ts";
const identifier = "QuarterlyCrossBorderSettlementProjection".repeat(4);
const message = `Cannot resolve ${identifier}.\nCheck the settlement calculation.`;
const title = `Replace with ${identifier}Result`;
const range = { start: { line: 0, col: 0 }, end: { line: 0, col: 7 } };
await page.evaluate(async (path) => {
const backend = "/src/editor/core/backend.ts";
(await import(/* @vite-ignore */ backend)).docBackend().files.set(path, "pending();\n");
const service = "/src/workbench/contributions.ts";
await (await import(/* @vite-ignore */ service)).editorService().openFile(path);
}, path);
await expect(page.locator(".cm-content")).toContainText("pending()");
await stubDesktop(page);
await page.evaluate(
async ({ path, message, title, range }) => {
window.__ipc.handlers.lsp_hover = () => null;
window.__ipc.handlers.lsp_code_actions = () => [
{
title,
kind: "quickfix",
isPreferred: true,
disabledReason: null,
edit: {
files: [{ kind: "edit", path, edits: [{ range, new_text: "settled" }] }],
},
command: null,
data: null,
server: 1,
},
];
const diagnostic = "/src/editor/lsp/diagnostics.ts";
(await import(/* @vite-ignore */ diagnostic)).setFileDiagnostics(path, "settlement-lint", [
{ severity: "error", message, range, source: "settlement-lint", code: "missing-model" },
{ severity: "hint", message: "Review the reported total.", range, source: "settlement-lint", code: "review" },
]);
},
{ path, message, title, range },
);
await page.locator(".cm-content .cm-lintRange-error").hover();
const hover = page.locator(".cm-lsp-hover");
await expect(hover).toBeVisible();
const fix = hover.getByRole("button", { name: new RegExp(`^${title}`) });
await expect(fix).toBeVisible();
expect(await hover.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
const messageText = hover.locator(".cm-lsp-diag-message").first();
await expect(messageText).toHaveText(message);
await expect(messageText).toHaveCSS("font-size", "13px");
const shortcut = fix.locator(".cm-lsp-diag-shortcut");
await expect(shortcut).toBeVisible();
await expect(shortcut).toHaveCSS("font-size", "12px");
const more = hover.getByRole("button", { name: "More actions…", exact: true }).first();
await expect(more).toBeInViewport({ ratio: 1 });
const outer = (await hover.boundingBox())!;
const action = (await fix.boundingBox())!;
const editor = (await page.locator(".cm-editor").boundingBox())!;
expect(outer.x + outer.width).toBeLessThanOrEqual(editor.x + editor.width + 1);
expect(action.x + action.width).toBeLessThanOrEqual(outer.x + outer.width);
await more.click();
const intentions = page.getByRole("dialog", { name: "Intentions", exact: true });
await expect(intentions.getByRole("option", { name: title })).toBeVisible();
});
-75
Переглянути файл
@@ -55,39 +55,6 @@ test("⌘F opens the find bar and highlights matches; Escape returns to the edit
await expect(editor.locator(".cm-content")).toBeFocused();
});
test("Go to Line keeps its label beside the selected coordinates and returns focus to the editor", async ({
workbench: page,
}) => {
const editor = await openFromTree(page, "build.gradle.kts");
const content = editor.locator(".cm-content");
await content.focus();
await page.keyboard.press("Meta+l");
const dialog = page.getByRole("dialog", { name: "Go to Line:Column", exact: true });
const coordinates = dialog.getByRole("textbox", { name: "Line and column", exact: true });
await expect(coordinates).toBeFocused();
await expect(coordinates).toHaveValue("1:1");
expect(await coordinates.evaluate((el: HTMLInputElement) => [el.selectionStart, el.selectionEnd])).toEqual([0, 3]);
await page.setViewportSize({ width: 360, height: 500 });
const label = dialog.getByText("Line and column", { exact: true });
await expect(label).toBeVisible();
const text = (await label.boundingBox())!;
const field = (await coordinates.boundingBox())!;
expect(text.x + text.width).toBeLessThan(field.x);
expect(Math.abs(text.y + text.height / 2 - field.y - field.height / 2)).toBeLessThan(2);
await expect(coordinates).toHaveCSS("font-size", await label.evaluate((el) => getComputedStyle(el).fontSize));
await coordinates.fill("0:2");
await expect(coordinates).toHaveAttribute("aria-invalid", "true");
await expect(dialog.getByRole("button", { name: "OK", exact: true })).toBeDisabled();
await coordinates.fill("6:8");
await coordinates.press("Enter");
await expect(dialog).toBeHidden();
await expect(content).toBeFocused();
await page.setViewportSize({ width: 960, height: 600 });
await expect(page.getByRole("button", { name: "6:8", exact: true })).toBeVisible();
});
test("each file keeps its own find bar, query and caret", async ({ workbench: page }) => {
const find = page.getByRole("textbox", { name: "Find" });
const caret = page.getByRole("button", { name: /^\d+:\d+/ });
@@ -406,48 +373,6 @@ test("Markdown preview highlights ⌘F matches, selected words and scales diagra
expect(reset.excalidraw).toBeCloseTo(base.excalidraw, 1);
});
test("Markdown preview keeps following find and edits after scrolling the source", async ({ workbench: page }) => {
const editor = await openFromTree(page, "README.md");
const content = editor.locator(".cm-content");
const preview = page.getByRole("document", { name: "Markdown preview" });
await content.click();
await page.keyboard.press("Meta+a");
const spacer = Array.from({ length: 90 }, (_, i) => `Paragraph ${i}.`).join("\n\n");
await page.keyboard.insertText(`First needle\n\n${spacer}\n\nSecond needle\n\n${spacer}\n\nThird needle`);
await content.press("Control+Home");
await expect(preview).toContainText("Third needle");
await editor.locator(".cm-scroller").evaluate((el) => (el.scrollTop = 2000));
await expect.poll(() => preview.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
await preview.focus();
await page.keyboard.press("Meta+f");
const find = page.getByRole("textbox", { name: "Find" });
await find.fill("needle");
const visibleMatch = () =>
preview.evaluate((el) => {
const match = (CSS.highlights.get("markdown-find-current") as unknown as Set<Range> | undefined)
?.values()
.next().value;
if (!match) return null;
const box = el.getBoundingClientRect();
const range = match.getBoundingClientRect();
return range.top >= box.top && range.bottom <= box.bottom ? match.startContainer.textContent : null;
});
await expect.poll(visibleMatch).toBe("First needle");
await find.press("ArrowDown");
await expect.poll(visibleMatch).toBe("Second needle");
await find.press("ArrowDown");
await expect.poll(visibleMatch).toBe("Third needle");
await find.press("ArrowUp");
await expect.poll(visibleMatch).toBe("Second needle");
await find.press("Escape");
await content.focus();
await page.keyboard.press("Meta+a");
await page.keyboard.insertText("- **$`v_0`$ Flat wings.**");
await expect(preview.locator("strong .katex annotation")).toHaveText("v_0");
});
test("Markdown preview aligns Mermaid diagrams to their container align attribute", async ({ workbench: page }) => {
const editor = await openFromTree(page, "README.md");
const content = editor.locator(".cm-content");
-65
Переглянути файл
@@ -1,65 +0,0 @@
import type { ExtractInterfaceInfo } from "../src/bindings";
import { expect, stubDesktop, test } from "./fixtures";
const info: ExtractInterfaceInfo = {
className: "InvoiceService",
packages: [
{ displayName: "com.example.billing", path: "/dev/acme-api", isParentOfSelectedFile: true },
{ displayName: "com.example.billing.api", path: "/dev/acme-api/api" },
].map((entry) => JSON.stringify(entry)),
members: Array.from({ length: 24 }, (_, i) => ({
name: `prepareInvoiceForInternationalSettlement${i + 1}`,
parameters: ["BigDecimal", "Map<String, BigDecimal>", "LocalDate", "boolean"],
typeName: "SettlementInvoice",
handleIdentifier: `method-${i + 1}`,
})),
};
test("keeps the interface fields, members and actions usable in a short window", async ({ workbench: page }) => {
await page.setViewportSize({ width: 470, height: 410 });
await page.evaluate(async () => {
const workbench = "/src/workbench/contributions.ts";
const { editorService } = await import(/* @vite-ignore */ workbench);
await editorService().openFile("/dev/acme-api/InvoiceService.java", { focus: true });
});
const editor = page.locator(".cm-editor .cm-content");
await expect(editor).toBeVisible();
await stubDesktop(page);
await editor.focus();
await page.evaluate(async (info) => {
window.__ipc.handlers.lsp_extract_interface_info = () => info;
const actions = "/src/platform/actions.ts";
const { executeAction } = await import(/* @vite-ignore */ actions);
await executeAction("refactor.extractInterface");
}, info);
const dialog = page.getByRole("dialog", { name: "Extract Interface" });
const table = dialog.getByRole("table", { name: "Members to Form Interface" });
await expect(table.getByRole("row")).toHaveCount(25);
const source = dialog.getByRole("textbox", { name: "Extract interface from:", exact: true });
const name = dialog.getByRole("textbox", { name: "Interface name:", exact: true });
await expect(source).toHaveAttribute("readonly", "");
await expect(source).toHaveValue("InvoiceService");
await expect(name).toBeFocused();
await expect(source).toBeInViewport({ ratio: 1 });
await name.fill("SettlementInvoicing");
const body = dialog.locator("[data-dialog-body]");
const refactor = dialog.getByRole("button", { name: "Refactor", exact: true });
await expect(refactor).toBeDisabled();
const last = table.getByRole("checkbox", { name: /^prepareInvoiceForInternationalSettlement24\(/ });
await last.scrollIntoViewIfNeeded();
await expect(last).toBeInViewport({ ratio: 1 });
await expect(table.getByRole("columnheader", { name: "Member" })).toBeInViewport({ ratio: 1 });
await expect.poll(() => table.evaluate((el) => el.scrollTop)).toBeGreaterThan(100);
expect(await table.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
expect(await body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await last.check();
await expect(refactor).toBeEnabled();
expect(await body.evaluate((el) => el.scrollHeight - el.clientHeight)).toBeLessThanOrEqual(1);
await expect(refactor).toBeInViewport({ ratio: 1 });
await expect(dialog.getByRole("button", { name: "Preview", exact: true })).toBeInViewport({ ratio: 1 });
await dialog.getByRole("button", { name: "Cancel", exact: true }).click();
await expect(dialog).toBeHidden();
await expect(editor).toBeFocused();
});
-68
Переглянути файл
@@ -1,68 +0,0 @@
import type { Remote, RemoteEdit } from "../src/bindings";
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
test("keeps remote columns, actions and editing usable in a short window", async ({ workbench: page }) => {
await page.setViewportSize({ width: 450, height: 420 });
await stubDesktop(page);
const originalUrl = "https://git.example.test/engineering/international-settlement/replica-18.git";
await page.evaluate(async (originalUrl) => {
let remotes: Remote[] = Array.from({ length: 18 }, (_, i) => ({
name: i === 0 ? "origin" : `mirror-${i + 1}`,
url: i === 17 ? originalUrl : `https://git.example.test/project/repository-${i + 1}.git`,
}));
window.__ipc.handlers.vcs_remotes = () => remotes;
window.__ipc.handlers.vcs_edit_remote = ({ edit }) => {
const patch = edit as RemoteEdit;
if (patch.op === "edit") {
remotes = remotes.map((remote) =>
remote.name === patch.name ? { name: patch.new_name, url: patch.url } : remote,
);
}
return null;
};
window.__ipc.handlers.vcs_branches = () => [];
const module = "/src/features/vcs/gitMenuDialogs.tsx";
const { showManageRemotes } = await import(/* @vite-ignore */ module);
showManageRemotes();
}, originalUrl);
const dialog = page.getByRole("dialog", { name: "Git Remotes", exact: true });
await expect(dialog.getByText(originalUrl, { exact: true })).toBeVisible();
const table = dialog.getByRole("grid", { name: "Remotes", exact: true });
const name = table.getByRole("columnheader", { name: "Name", exact: true });
const url = table.getByRole("columnheader", { name: "URL", exact: true });
await expect(name).toBeInViewport({ ratio: 1 });
await expect(url).toBeInViewport({ ratio: 1 });
const first = table.getByRole("row", { name: /^origin / });
const last = table.getByRole("row", { name: /^mirror-18 / });
await first.click();
await page.keyboard.press("End");
await expect(last).toBeFocused();
await expect(last).toHaveAttribute("aria-selected", "true");
await expect(last).toBeInViewport({ ratio: 1 });
await expect(url).toBeInViewport({ ratio: 1 });
const cell = last.getByRole("gridcell", { name: originalUrl, exact: true });
await expect(cell).toHaveAttribute("title", originalUrl);
expect((await cell.boundingBox())!.x).toBeCloseTo((await url.boundingBox())!.x, 0);
const scroller = table.locator("..");
expect(await scroller.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
expect(await scroller.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await expect(dialog.getByRole("button", { name: "Add Remote…" })).toBeInViewport({ ratio: 1 });
await expect(dialog.getByRole("button", { name: "OK", exact: true })).toBeInViewport({ ratio: 1 });
await page.keyboard.press("Enter");
const edit = page.getByRole("dialog", { name: "Edit Remote", exact: true });
const editName = edit.getByRole("textbox", { name: "Name", exact: true });
const editUrl = edit.getByRole("textbox", { name: "URL", exact: true });
await expect(editName).toHaveValue("mirror-18");
await expect(editUrl).toHaveValue(originalUrl);
expect((await editName.boundingBox())!.x).toBeCloseTo((await editUrl.boundingBox())!.x, 0);
const nextUrl = "https://git.example.test/repository-18.git";
await editUrl.fill(nextUrl);
await edit.getByRole("button", { name: "OK", exact: true }).click();
await expect(last).toContainText(nextUrl);
await expect(last).toBeFocused();
expect(await ipcCalls(page, "vcs_edit_remote")).toMatchObject([
{ edit: { op: "edit", name: "mirror-18", new_name: "mirror-18", url: nextUrl } },
]);
});
-75
Переглянути файл
@@ -1,75 +0,0 @@
import type { EditorView } from "@codemirror/view";
import { expect, stubDesktop, test } from "./fixtures";
test("an inline change keeps its actions and original code readable at the editor zoom", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 445, height: 520 });
await stubDesktop(page);
const original = "const routingPolicy = 'use the legacy regional settlement cutoff before reconciliation';";
const current = "const routingPolicy = 'use the current policy';";
const content = Array.from({ length: 22 }, (_, i) => {
if (i === 4) return current;
if (i === 11) return "const settlementWindow = 12;";
return `// context ${i + 1}`;
}).join("\n");
await page.evaluate(async (text) => {
const service = "/src/workbench/contributions.ts";
window.__ipc.handlers.fs_probe = () => ({ size: text.length, binary: false, tooLarge: false });
window.__ipc.handlers.fs_read_text = () => text;
await (await import(/* @vite-ignore */ service)).editorService().openFile("/dev/acme-api/settlement.ts");
}, content);
const editor = page.locator(".cm-editor");
await expect(editor.locator(".cm-content")).toBeVisible();
await editor.evaluate(
async (el, { original, content }) => {
const { view } = (el.querySelector(".cm-content") as HTMLElement & { cmTile: { view: EditorView } }).cmTile;
view.dom.style.setProperty("--openidea-editor-font-size", "18px");
view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: content }, selection: { anchor: 0 } });
window.__ipc.handlers.vcs_line_hunks = () => [
{ kind: "modified", start: 4, lines: 1, oldStart: 4, oldLines: 1, oldText: original + "\n" },
{ kind: "added", start: 11, lines: 1, oldStart: 11, oldLines: 0, oldText: "" },
{ kind: "deleted", start: 15, lines: 0, oldStart: 14, oldLines: 1, oldText: "// obsolete window\n" },
];
const storeModule = "/src/features/vcs/store.ts";
const { useVcs } = await import(/* @vite-ignore */ storeModule);
useVcs.setState({ available: true, version: useVcs.getState().version + 1 });
},
{ original, content },
);
await editor.getByTitle("Modified lines (click to show)", { exact: true }).click();
const modified = page.getByRole("dialog", { name: "Modified lines" });
await expect(modified).toBeVisible();
const originalText = modified.getByText(original, { exact: false });
await expect(originalText).toHaveCSS("font-size", "18px");
await expect(modified.getByText(current, { exact: false })).toHaveCount(0);
await expect(editor.getByText(current, { exact: true })).toBeVisible();
const preview = modified.getByRole("region", { name: "Original text" });
await expect(preview.locator(".tok-keyword")).toHaveText("const");
const toolbar = modified.getByRole("toolbar", { name: "Change actions" });
expect(await preview.evaluate((el) => el.scrollWidth > el.clientWidth)).toBe(true);
const previewBox = (await preview.boundingBox())!;
const toolbarBox = (await toolbar.boundingBox())!;
const currentBox = (await editor.getByText(current, { exact: true }).boundingBox())!;
expect(previewBox.y).toBeGreaterThanOrEqual(toolbarBox.y + toolbarBox.height - 1);
expect(
toolbarBox.y >= currentBox.y + currentBox.height - 1 || previewBox.y + previewBox.height <= currentBox.y + 1,
).toBe(true);
expect(previewBox.x).toBeGreaterThanOrEqual(0);
expect(previewBox.x + previewBox.width).toBeLessThanOrEqual(445);
await toolbar.getByRole("button", { name: "Next Change" }).click();
const added = page.getByRole("dialog", { name: "Added lines" });
await expect(added).toBeVisible();
await expect(added.getByRole("region", { name: "Original text" })).toHaveCount(0);
await expect(added.getByRole("button", { name: "Copy Original Text" })).toBeDisabled();
await added.getByRole("button", { name: "Next Change" }).click();
const deleted = page.getByRole("dialog", { name: "Deleted lines" });
await expect(deleted.getByRole("region", { name: "Original text" })).toHaveText("// obsolete window");
await deleted.getByRole("button", { name: "Rollback" }).click();
await expect(deleted).toBeHidden();
await expect(editor.getByText("// obsolete window", { exact: true })).toBeVisible();
});
-37
Переглянути файл
@@ -1,37 +0,0 @@
import { expect, test } from "./fixtures";
test("gutter icon previews align in narrow settings and the master switch keeps each choice", async ({
workbench: page,
}) => {
await page.keyboard.press("Meta+,");
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
await settings.getByRole("textbox", { name: "Search settings" }).fill("Color preview");
await settings.getByRole("treeitem", { name: "Gutter Icons", exact: true }).click();
await page.setViewportSize({ width: 520, height: 620 });
const list = settings.getByRole("list", { name: "Gutter Icons", exact: true });
await expect(list.getByRole("listitem")).toHaveCount(5);
await expect(list.locator("mark")).toHaveText(["Color", "preview"]);
const layout = await list.getByRole("listitem").evaluateAll((rows) =>
rows.map((row) => {
const preview = row.firstElementChild!.getBoundingClientRect();
const input = row.querySelector("input")!.getBoundingClientRect();
return { x: input.x, previewRight: preview.right, overflow: row.scrollWidth - row.clientWidth };
}),
);
for (const row of layout) {
expect(row.previewRight).toBeLessThan(row.x);
expect(row.x).toBeCloseTo(layout[0]!.x, 0);
expect(row.overflow).toBeLessThanOrEqual(1);
}
const master = settings.getByRole("checkbox", { name: "Show gutter icons", exact: true });
const color = list.getByRole("checkbox", { name: "Color preview", exact: true });
await color.uncheck();
await master.uncheck();
for (const option of await list.getByRole("checkbox").all()) await expect(option).toBeDisabled();
await master.check();
await expect(color).toBeEnabled();
await expect(color).not.toBeChecked();
await expect(list.getByRole("checkbox", { name: "Bookmarks", exact: true })).toBeChecked();
});
-89
Переглянути файл
@@ -1,89 +0,0 @@
import { expect, stubDesktop, test } from "./fixtures";
test("inspection results keep source context and actions visible as the dock narrows", async ({ workbench: page }) => {
await page.setViewportSize({ width: 1100, height: 720 });
const relative = "modules/settlement/reconciliation/QuarterlySettlementReconciliationCoordinator.ts";
const path = `/dev/acme-api/${relative}`;
const title = "The estimated settlement total ignores the currency conversion for pending merchant payments";
const detail = "Check the calculation before saving the reconciliation report.";
await page.evaluate(async (path) => {
const backend = "/src/editor/core/backend.ts";
(await import(/* @vite-ignore */ backend))
.docBackend()
.files.set(path, "const amount = 100;\nconst exchangeRate = 3;\nconst estimate = amount;\n");
const service = "/src/workbench/contributions.ts";
await (await import(/* @vite-ignore */ service)).editorService().openFile(path);
}, path);
await expect(page.locator(".cm-content")).toContainText("estimate");
await stubDesktop(page);
await page.evaluate(
async ({ path, relative, title, detail }) => {
window.__ipc.handlers.inspect_code = ({ onEvent }) => {
window.__ipc.send(onEvent, { type: "started", total: 1 });
window.__ipc.send(onEvent, {
type: "file",
done: 1,
file: {
path,
relPath: relative,
diagnostics: [
{
range: { start: { line: 2, col: 6 }, end: { line: 2, col: 14 } },
severity: "warning",
message: `${title}\n${detail}`,
source: "lint",
code: "pending-currency-conversion",
},
],
},
});
window.__ipc.send(onEvent, {
type: "done",
summary: { files: 1, problems: 1, skipped: 0, failed: 0, cancelled: false, elapsedMs: 30 },
});
};
const actions = "/src/platform/actions.ts";
await (await import(/* @vite-ignore */ actions)).executeAction("analyze.inspectFile");
},
{ path, relative, title, detail },
);
const tree = page.getByRole("tree", { name: "Inspection results" });
const problem = tree.getByRole("treeitem").filter({ hasText: title });
await problem.click({ position: { x: 95, y: 12 } });
const jump = page.getByRole("button", { name: "Jump to Source" });
const message = page.getByText(detail, { exact: false }).filter({ visible: true }).last();
expect((await jump.boundingBox())!.y).toBeLessThan((await message.boundingBox())!.y);
const details = page.getByRole("region", { name: "Inspection details" });
const quickFixes = details.getByRole("button", { name: "Show Quick Fixes" });
await expect(details.getByText(`${relative}:3:7`)).toBeVisible();
const split = page.getByRole("separator", { name: "Resize inspection panes" });
await expect(split).toHaveAttribute("aria-valuenow", "50");
await split.focus();
await page.keyboard.press("ArrowRight");
await expect(split).not.toHaveAttribute("aria-valuenow", "50");
await page.setViewportSize({ width: 540, height: 680 });
await expect(quickFixes).toBeInViewport({ ratio: 1 });
await expect(jump).toBeInViewport({ ratio: 1 });
const right = (await details.boundingBox())!;
const jumpBounds = (await jump.boundingBox())!;
expect(jumpBounds.x + jumpBounds.width).toBeLessThan(right.x + right.width);
const file = tree.getByRole("treeitem").filter({ has: page.getByTitle(relative, { exact: true }) });
const count = file.getByText("1", { exact: true });
const fileBounds = (await file.boundingBox())!;
const countBounds = (await count.boundingBox())!;
expect(countBounds.x + countBounds.width).toBeLessThan(fileBounds.x + fileBounds.width);
expect(await message.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
expect(await tree.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await jump.click();
await expect
.poll(() =>
page.evaluate(async () => {
const service = "/src/workbench/contributions.ts";
const cursor = (await import(/* @vite-ignore */ service)).editorService().activeCursor();
return { path: cursor?.path, line: cursor?.line, col: cursor?.col };
}),
)
.toEqual({ path, line: 2, col: 6 });
});
-59
Переглянути файл
@@ -1,59 +0,0 @@
import { expect, openFromTree, test } from "./fixtures";
test("keyboard navigation reveals items in a short Git submenu", async ({ workbench: page }) => {
await page.setViewportSize({ width: 650, height: 390 });
const editor = await openFromTree(page, "README.md");
await editor.locator(".cm-content").click({ button: "right" });
await page.getByRole("menuitem", { name: "Git", exact: true }).hover();
const last = page.getByRole("menuitem", { name: "Clone…", exact: true });
const popup = last.locator("xpath=ancestor::*[@data-popup][1]");
const first = popup.locator('[role="menuitem"]:not([aria-disabled="true"])').first();
await expect(popup).toHaveAttribute("data-positioned", "true");
await expect(first).toBeFocused();
expect(await popup.evaluate((el) => el.scrollHeight)).toBeGreaterThan(await popup.evaluate((el) => el.clientHeight));
await page.keyboard.press("End");
await expect(last).toBeFocused();
await expect(last).toBeInViewport({ ratio: 1 });
await expect.poll(() => popup.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
const scroll = await popup.evaluate((el) => el.scrollTop);
await popup.evaluate((el) => (el.scrollTop = 0));
await page.keyboard.press("End");
await expect(last).toBeInViewport({ ratio: 1 });
await expect.poll(() => popup.evaluate((el) => el.scrollTop)).toBe(scroll);
await page.keyboard.press("Home");
await expect(first).toBeFocused();
await expect(first).toBeInViewport({ ratio: 1 });
await expect.poll(() => popup.evaluate((el) => el.scrollTop)).toBeLessThan(scroll);
await page.keyboard.press("ArrowLeft");
await expect(last).toBeHidden();
await expect(page.getByRole("menuitem", { name: "Git", exact: true })).toBeFocused();
});
test("shortcut ends align on a menu level with submenus", async ({ workbench: page }) => {
await page.setViewportSize({ width: 390, height: 480 });
const chord = "Ctrl+Shift+Meta+K, Ctrl+Shift+Meta+B, Ctrl+Shift+Meta+M";
await page.evaluate(async (chord) => {
const path = "/src/ui/Menu.tsx";
const { showContextMenu } = await import(/* @vite-ignore */ path);
showContextMenu({ x: 80, y: 80 }, [
{ label: "Open", shortcut: "Ctrl+O" },
{ label: "Open Recent", shortcut: "Ctrl+Shift+O", submenu: [{ label: "Payments service" }] },
{ label: "Open File in a New Window", shortcut: chord },
]);
}, chord);
const menu = page.getByRole("menu", { name: "Context menu" });
const first = menu.getByText("Ctrl+O", { exact: true });
const second = menu.getByText("Ctrl+Shift+O", { exact: true });
await expect(first).toBeVisible();
await expect(second).toBeVisible();
const a = (await first.boundingBox())!;
const b = (await second.boundingBox())!;
expect(a.x + a.width).toBeCloseTo(b.x + b.width, 0);
const long = menu.getByText(chord, { exact: true });
await expect(long).toHaveAttribute("title", chord);
expect(await long.evaluate((el) => el.scrollWidth)).toBeGreaterThan(await long.evaluate((el) => el.clientWidth));
await expect(menu.getByText("Open File in a New Window", { exact: true })).toBeInViewport({ ratio: 1 });
});
-138
Переглянути файл
@@ -1,138 +0,0 @@
import { expect, stubDesktop, test } from "./fixtures";
test("the floating navigation list stays beside the visible segment and scrolls to keyboard selection", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 600, height: 560 });
const folder = "billing";
const parent =
"/dev/acme-api/quarterly-settlement-and-reconciliation/merchant-accounts-with-exchange-rate-adjustments";
const directory = `${parent}/${folder}`;
const filename = "SettlementSummary.ts";
const path = `${directory}/${filename}`;
const long = "QuarterlyReconciliationForPendingSettlementAndCrossBorderMerchantAdjustments.ts";
const last = "YearEndTotals.ts";
await page.evaluate(async (path) => {
const backend = "/src/editor/core/backend.ts";
(await import(/* @vite-ignore */ backend)).docBackend().files.set(path, "export const pending = 1;\n");
const service = "/src/workbench/contributions.ts";
await (await import(/* @vite-ignore */ service)).editorService().openFile(path);
}, path);
await expect(page.locator(".cm-content")).toContainText("pending");
await stubDesktop(page);
await page.evaluate(
async ({ directory, filename, long, last }) => {
window.__ipc.handlers.fs_read_dir = ({ path }) =>
path === directory
? ["archive", long, ...Array.from({ length: 24 }, (_, i) => `Report-${i + 1}.ts`), filename, last].map(
(name) => ({
name,
path: `${directory}/${name}`,
kind: name === "archive" ? "dir" : "file",
size: name === "archive" ? 0 : 1,
}),
)
: [];
const actions = "/src/platform/actions.ts";
await (await import(/* @vite-ignore */ actions)).executeAction("navigate.navigationBar");
},
{ directory, filename, long, last },
);
const bar = page.getByRole("toolbar", { name: "Navigation bar" });
await expect(bar).toBeVisible();
await page.keyboard.press("ArrowLeft");
const segment = bar.getByRole("button", { name: folder, exact: true });
await expect(segment).toHaveAttribute("aria-current", "location");
const barBounds = (await bar.boundingBox())!;
await page.keyboard.press("ArrowDown");
const list = page.getByRole("listbox", { name: "Children" });
await expect(list).toBeVisible();
await expect(list.getByRole("option", { name: filename, exact: true })).toHaveAttribute("aria-selected", "true");
await expect
.poll(async () => {
const bounds = (await list.boundingBox())!;
return bounds.x >= 5 && bounds.x + bounds.width <= 595;
})
.toBe(true);
expect((await list.boundingBox())!.y).toBeGreaterThanOrEqual(barBounds.y + barBounds.height - 4);
expect((await bar.boundingBox())!.height).toBeCloseTo(barBounds.height);
await page.keyboard.press("Home");
const folderRow = list.getByRole("option", { name: "archive" });
await expect(folderRow).toHaveAttribute("aria-selected", "true");
await expect(folderRow).toBeInViewport({ ratio: 1 });
await expect(list.getByRole("option", { name: long, exact: true }).getByTitle(long)).toBeVisible();
expect(await list.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await page.keyboard.press("End");
const lastRow = list.getByRole("option", { name: last, exact: true });
await expect(lastRow).toHaveAttribute("aria-selected", "true");
await expect(lastRow).toBeInViewport({ ratio: 1 });
await page.keyboard.press("Escape");
await expect(list).toBeHidden();
await expect(bar).toBeFocused();
await page.keyboard.press("Escape");
await expect(bar).toBeHidden();
});
for (const position of ["top", "statusBar"] as const) {
test(`the ${position} navigation list opens toward the editor and keeps folder navigation`, async ({
workbench: page,
}) => {
const directory = "/dev/acme-api/src";
const path = `${directory}/Overview.ts`;
await page.evaluate(async (path) => {
const backend = "/src/editor/core/backend.ts";
(await import(/* @vite-ignore */ backend)).docBackend().files.set(path, "export const overview = 1;\n");
const service = "/src/workbench/contributions.ts";
await (await import(/* @vite-ignore */ service)).editorService().openFile(path);
}, path);
await expect(page.locator(".cm-content")).toContainText("overview");
await stubDesktop(page);
await page.evaluate(
async ({ directory, position }) => {
const archive = `${directory}/archive`;
window.__ipc.handlers.fs_read_dir = ({ path }) =>
path === directory
? [
{ path: archive, name: "archive", kind: "dir", size: 0 },
{ path: `${directory}/Overview.ts`, name: "Overview.ts", kind: "file", size: 1 },
]
: path === archive
? [{ path: `${archive}/Previous.ts`, name: "Previous.ts", kind: "file", size: 1 }]
: [];
const source = await (await fetch("/src/workbench/Workbench.tsx")).text();
const project = source.match(/["'](\/src\/platform\/project\.ts(?:\?[^"']+)?)["']/)?.[1];
if (!project) throw new Error("Missing project store");
const { useProject } = await import(/* @vite-ignore */ project);
const settings = useProject.getState().settings;
useProject.setState({
settings: { ...settings, appearance: { ...settings?.appearance, navigationBar: position } },
});
},
{ directory, position },
);
const anchor = page
.getByRole("navigation", { name: "Breadcrumbs" })
.getByRole("button", { name: "src", exact: true });
await anchor.click();
const list = page.getByRole("listbox", { name: "src", exact: true });
const archive = list.getByRole("option", { name: "archive" });
await expect(archive).toHaveAttribute("aria-selected", "true");
await expect(list).toBeFocused();
await expect
.poll(async () => {
const bounds = (await anchor.boundingBox())!;
const popup = (await list.boundingBox())!;
return position === "top" ? popup.y >= bounds.y + bounds.height : popup.y + popup.height <= bounds.y;
})
.toBe(true);
await page.keyboard.press("ArrowRight");
const nested = page.getByRole("listbox", { name: "archive" });
await expect(nested.getByRole("option", { name: "Previous.ts" })).toHaveAttribute("aria-selected", "true");
await page.keyboard.press("ArrowLeft");
await expect(archive).toHaveAttribute("aria-selected", "true");
await page.keyboard.press("Escape");
await expect(list).toBeHidden();
await expect(anchor).toBeFocused();
});
}
+1 -44
Переглянути файл
@@ -1,4 +1,4 @@
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
import { expect, stubDesktop, test } from "./fixtures";
test.use({ video: "on" });
@@ -100,46 +100,3 @@ test("uses the single project's type in the keyboard New popup", async ({ workbe
page.getByRole("dialog", { name: "New File from Template" }).getByText("Go File", { exact: true }),
).toBeVisible();
});
test("names a file from a template and keeps keyboard kind selection visible in a short window", async ({
workbench: page,
}) => {
const root = "/dev/acme-api";
await stubDesktop(page);
await page.evaluate(() => {
window.__ipc.handlers.fs_create_file = () => null;
});
await page.locator(`[data-project-path="${root}"]`).click();
await page.keyboard.press("Meta+n");
const menu = page.getByRole("dialog", { name: "New", exact: true });
await menu.getByRole("textbox", { name: "Search for file type" }).fill("from template");
await menu.getByText("From Template…", { exact: true }).click();
const templates = page.getByRole("dialog", { name: "New File from Template" });
const kotlin = templates.getByRole("option", { name: "Kotlin Class/File", exact: true });
await kotlin.hover();
await expect(kotlin).toHaveAttribute("aria-selected", "true");
await page.keyboard.press("Enter");
const dialog = page.getByRole("dialog", { name: "New Kotlin Class/File", exact: true });
const name = dialog.getByRole("textbox", { name: "Name", exact: true });
const kinds = dialog.getByRole("listbox", { name: "Kind", exact: true });
await expect(name).toBeFocused();
await page.setViewportSize({ width: 430, height: 380 });
const bounds = (await dialog.boundingBox())!;
expect(Math.abs(bounds.y + bounds.height / 2 - 190)).toBeLessThan(12);
await expect.poll(() => kinds.evaluate((el) => el.scrollHeight - el.clientHeight)).toBeGreaterThan(0);
await name.press("Enter");
await expect(dialog.getByRole("alert")).toHaveText("Enter a name");
await name.fill("OrderSummary");
await name.press("ArrowUp");
const last = kinds.getByRole("option", { name: "JUnit 5 Test", selected: true });
await expect(last).toBeInViewport({ ratio: 1 });
await expect(name).toBeFocused();
for (let i = 0; i < 3; i++) await name.press("ArrowUp");
await expect(kinds.getByRole("option", { name: "Data class", selected: true })).toBeVisible();
await name.press("Enter");
await expect(dialog).toBeHidden();
await expect.poll(() => ipcCalls(page, "fs_create_file")).toEqual([{ path: `${root}/OrderSummary.kt` }]);
await expect(page.getByRole("tab", { name: "OrderSummary.kt" })).toHaveAttribute("aria-selected", "true");
});
-50
Переглянути файл
@@ -37,30 +37,6 @@ test("type-ahead jumps to a matching node", async ({ workbench: page }) => {
await expect(tree.locator('[role="treeitem"][aria-selected="true"]')).toHaveText("README.md");
});
test("the file deletion form keeps its option and buttons visible in a narrow window", async ({ workbench: page }) => {
const file = page.getByRole("treeitem", { name: "README.md", exact: true });
await file.click({ button: "right" });
await page.getByRole("menuitem", { name: /^Delete…/ }).click();
const dialog = page.getByRole("dialog", { name: "Delete", exact: true });
await expect(dialog).toBeVisible();
await page.setViewportSize({ width: 430, height: 530 });
await expect(dialog.locator("[data-dialog-titlebar]")).toContainText("Delete");
await expect(dialog).toContainText("Delete 'README.md'?");
await expect(dialog).toContainText("Items are moved to the Trash.");
const search = dialog.getByRole("checkbox", { name: "Safe delete (with usage search)", exact: true });
await expect(search).toBeChecked();
await expect(dialog.getByRole("button", { name: "Delete", exact: true })).toBeFocused();
await expect(dialog.getByRole("button", { name: "Cancel", exact: true })).toBeInViewport();
const option = await search.boundingBox();
const footer = await dialog.locator("[data-dialog-footer]").boundingBox();
expect(option!.y + option!.height).toBeLessThan(footer!.y);
await search.uncheck();
await page.keyboard.press("Escape");
await expect(dialog).toBeHidden();
await page.setViewportSize({ width: 1100, height: 730 });
await expect(file).toBeVisible();
});
test("Git ignore submenu offers shared and local destinations for files and folders", async ({ workbench: page }) => {
for (const name of ["README.md", "src"]) {
await page.getByRole("treeitem", { name, exact: true }).click({ button: "right" });
@@ -134,29 +110,3 @@ test("a real mouse drag still shows the drag label until release", async ({ work
await page.mouse.up();
await expect(dragLabel).toHaveCount(0);
});
test("Copy aligns the file fields and keeps the open-in-editor option in the footer", async ({ workbench: page }) => {
await page.getByRole("treeitem", { name: "README.md", exact: true }).click();
await page.keyboard.press("F5");
const dialog = page.getByRole("dialog", { name: "Copy", exact: true });
const name = dialog.getByRole("textbox", { name: "New name" });
const target = dialog.getByRole("textbox", { name: "Target directory" });
const openCopy = dialog.getByRole("checkbox", { name: "Open copy in editor" });
await expect(name).toBeFocused();
expect(await name.evaluate((el: HTMLInputElement) => el.value.slice(el.selectionStart!, el.selectionEnd!))).toBe(
(await name.inputValue()).replace(/\.md$/, ""),
);
for (const width of [1100, 430]) {
await page.setViewportSize({ width, height: 560 });
const [nameBox, targetBox] = await Promise.all([name.boundingBox(), target.boundingBox()]);
expect(nameBox!.x).toBeCloseTo(targetBox!.x, 0);
expect(targetBox!.x).toBeGreaterThan((await dialog.getByText("To directory:", { exact: true }).boundingBox())!.x);
await expect(dialog.locator("[data-dialog-footer]").getByRole("checkbox")).toBeInViewport();
}
await name.fill("release-notes.md");
await target.fill("src");
await openCopy.check();
await dialog.getByRole("button", { name: "OK", exact: true }).click();
await expect(dialog).toBeHidden();
await expect(page.getByRole("tab", { name: "release-notes.md" })).toBeVisible();
});
-56
Переглянути файл
@@ -1,56 +0,0 @@
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
const parent = "/dev/imports/From-vendor/QuarterlySettlementReconciliationAndReportingProjects";
const project = `${parent}/settlement-api`;
test("the trust prompt keeps the folder scope and restricted preview visible in a narrow window", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 420, height: 455 });
await stubDesktop(page);
await page.evaluate(() => {
const h = window.__ipc.handlers;
h.project_trust_status = ({ path }) => ({ root: path, trusted: false, decided: false });
h.project_trust_set = () => null;
h.open_project = ({ path }) => ({ root: path, name: "settlement-api", trusted: false, isGit: false, settings: {} });
h.fs_read_dir = () => [];
});
const open = () =>
page.evaluate(async (path) => {
const projectModule = "/src/platform/project.ts";
const { openProject } = await import(/* @vite-ignore */ projectModule);
void openProject(path).catch(() => undefined);
}, project);
await open();
const dialog = page.getByRole("dialog", { name: "Trust and Open Project?" });
const restricted = dialog.getByRole("button", { name: "Preview in Restricted Mode" });
const folder = dialog.getByRole("checkbox", { name: /Trust projects in/ });
const projectAction = dialog.getByRole("button", { name: "Trust Project", exact: true });
const folderAction = dialog.getByRole("button", { name: "Trust Folder", exact: true });
await expect(restricted).toBeFocused();
await expect(projectAction).toBeVisible();
await expect(folder).not.toBeChecked();
await expect(dialog.getByTitle(project, { exact: true })).toBeVisible();
await expect(dialog.getByTitle(parent, { exact: true })).toBeVisible();
await folder.check();
await expect(folderAction).toHaveCount(1);
await expect(projectAction).toHaveCount(0);
for (const selector of ["[data-dialog-body]", "[data-dialog-footer]"]) {
expect(await dialog.locator(selector).evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
}
await expect(restricted).toBeInViewport({ ratio: 1 });
await page.keyboard.press("Escape");
await expect(dialog).toBeHidden();
expect(await ipcCalls(page, "project_trust_set")).toEqual([]);
expect(await ipcCalls(page, "open_project")).toEqual([]);
await open();
await expect(projectAction).toBeVisible();
await expect(folder).not.toBeChecked();
await folder.check();
await restricted.click();
await expect(dialog).toBeHidden();
expect(await ipcCalls(page, "project_trust_set")).toEqual([{ path: project, trusted: false, folder: false }]);
await expect.poll(() => ipcCalls(page, "open_project")).toEqual([{ path: project }]);
});
+1 -2
Переглянути файл
@@ -53,8 +53,7 @@ test("Python syntax supplements retain PyCharm colours without a language server
await expect(page.locator(".cm-sem-python-predefined-definition")).toHaveCSS("color", "rgb(187, 153, 34)");
await expect(page.locator(".cm-sem-python-predefined-usage")).toHaveCSS("color", "rgb(204, 170, 51)");
await expect(page.locator(".cm-sem-keyword").filter({ hasText: /^type$/ })).toHaveCSS("color", "rgb(17, 34, 51)");
// The scheme is Darcula-based and doesn't name NOT_USED_ELEMENT_ATTRIBUTES: Darcula's #72737A applies.
await expect(page.locator(".cm-sem-unused")).toHaveCSS("color", "rgb(114, 115, 122)");
await expect(page.locator(".cm-sem-unused")).toHaveCSS("color", "rgb(111, 115, 122)");
expect(errors).toEqual([]);
await page.screenshot({ path: info.outputPath("python-highlighting.png") });
});
-88
Переглянути файл
@@ -1,88 +0,0 @@
import type { EditorView } from "@codemirror/view";
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
test("Quick Evaluate opens an object tree that fits the editor and returns focus on Escape", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 445, height: 500 });
await stubDesktop(page);
await page.evaluate(async () => {
const path = "/dev/acme-api/settlement.py";
const h = window.__ipc.handlers;
const value = (name: string, text: string, typeName: string, variablesReference = 0) => ({
name,
value: text,
typeName,
variablesReference,
evaluateName: name,
});
h.fs_probe = () => ({ size: 48, binary: false, tooLarge: false });
h.fs_read_text = () => "summary = {}\nsubtotal = 42\n";
h.debug_evaluate_in = ({ expression }) =>
expression === "summary" ? value("summary", "{...}", "dict", 101) : value("subtotal", "42", "int");
h.debug_variables = ({ reference }) =>
reference === 101
? [value("audit", "{...}", "dict", 102), value("total", "47.74", "float")]
: Array.from({ length: 22 }, (_, i) => value(`entry${i.toString().padStart(2, "0")}`, String(i), "int"));
h.debug_scopes = () => [];
const servicesModule = "/src/workbench/contributions.ts";
const { editorService } = await import(/* @vite-ignore */ servicesModule);
await editorService().openFile(path, { focus: true });
const debugModule = "/src/features/debugger/state.ts";
const { adoptSession, publishContext } = await import(/* @vite-ignore */ debugModule);
adoptSession(91, {
name: "Checkout",
adapter: "debugpy",
status: "paused",
selectedFrame: 11,
frames: [{ id: 11, name: "checkout", path, line: 0, column: 0, presentationHint: null }],
});
publishContext();
});
const editor = page.locator(".cm-editor");
const content = editor.locator(".cm-content");
await expect(content).toBeVisible();
await content.evaluate((el) => {
const { view } = (el as HTMLElement & { cmTile: { view: EditorView } }).cmTile;
view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: "summary = {}\nsubtotal = 42\n" } });
});
const evaluate = (line: number) =>
content.evaluate(async (el, lineNo) => {
const { view } = (el as HTMLElement & { cmTile: { view: EditorView } }).cmTile;
view.dispatch({ selection: { anchor: view.state.doc.line(lineNo).from + 2 } });
const actionModule = "/src/platform/actions.ts";
await (await import(/* @vite-ignore */ actionModule)).executeAction("debug.quickEvaluate");
}, line);
await evaluate(1);
const hint = page.locator(".cm-lsp-hint");
await expect(hint).toBeVisible();
await expect(hint.getByRole("button", { name: "Expand value" })).toHaveCount(0);
const tree = hint.getByRole("tree", { name: "summary" });
await expect(tree).toBeFocused();
await expect(tree.getByText("audit", { exact: true })).toBeVisible();
await page.setViewportSize({ width: 400, height: 360 });
await expect
.poll(async () => {
const editorBox = (await editor.boundingBox())!;
const hintBox = (await hint.boundingBox())!;
return hintBox.x >= editorBox.x - 1 && hintBox.x + hintBox.width <= editorBox.x + editorBox.width + 1;
})
.toBe(true);
await tree.getByText("audit", { exact: true }).click();
await tree.press("ArrowRight");
await expect(tree.getByText("entry00", { exact: true })).toBeVisible();
expect(await tree.evaluate((el) => el.scrollHeight > el.clientHeight)).toBe(true);
await tree.press("Escape");
await expect(hint).toBeHidden();
await expect(content).toBeFocused();
await evaluate(2);
await expect(hint.getByRole("tree")).toHaveCount(0);
await expect(hint).toHaveText(/subtotal\s*=\s*42/);
expect(await ipcCalls(page, "debug_evaluate_in")).toEqual([
{ session: 91, frameId: 11, expression: "summary", context: "hover" },
{ session: 91, frameId: 11, expression: "subtotal", context: "hover" },
]);
});
+1 -2
Переглянути файл
@@ -84,8 +84,7 @@ test("Recent Locations keeps all snippet lines visible when the editor font grow
await expect(code).toHaveCSS("font-size", "19px");
await expect(code).toHaveCSS("line-height", "30px");
await expect(code).toHaveCSS("font-family", /"Fira Code".*"Maple Mono NF CN"/);
// Three 30px lines; layout may land on a fractional pixel.
expect((await code.boundingBox())!.height).toBeCloseTo(90, 0);
expect((await code.boundingBox())!.height).toBe(90);
await page.setViewportSize({ width: 400, height: 500 });
const filter = dialog.getByRole("textbox", { name: "Filter recent locations" });
-74
Переглянути файл
@@ -1,74 +0,0 @@
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
test("Rollback fits a short window and scopes its options to checked files", async ({ workbench: page }) => {
await page.setViewportSize({ width: 410, height: 330 });
await stubDesktop(page);
const root = "/dev/settlement-engine";
const added = `${root}/ledger/additional-settlement-schedule.txt`;
const deleted = `${root}/ledger/retired-settlement-routing.txt`;
const modified = Array.from({ length: 16 }, (_, i) => `${root}/ledger/merchant-settlement-batch-${i + 1}.txt`);
await page.evaluate(
async ({ root, added, deleted, modified }) => {
const status = [
{ path: added, staged: "added", unstaged: null },
{ path: deleted, staged: "deleted", unstaged: null },
...modified.map((path) => ({ path, staged: null, unstaged: "modified" })),
].map((file) => ({ ...file, relPath: file.path.slice(root.length + 1), renamedFrom: null }));
const branch = { head: "main", headCommit: "c1", upstream: null, ahead: 0, behind: 0, operation: null };
const h = window.__ipc.handlers;
h.vcs_branch_info = () => branch;
h.vcs_roots = () => [{ root, ...branch }];
h.vcs_status = () => status;
h.vcs_unstage = () => null;
h.vcs_discard = () => null;
const storeModule = "/src/features/vcs/store.ts";
const { useVcs } = await import(/* @vite-ignore */ storeModule);
useVcs.setState({ available: true, root, repo: root, roots: [root], branch, status });
const contextModule = "/src/platform/context.ts";
const { setContext } = await import(/* @vite-ignore */ contextModule);
setContext("vcsAvailable", true);
const actionsModule = "/src/platform/actions.ts";
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
await executeAction("vcs.rollback", [root]);
},
{ root, added, deleted, modified },
);
const dialog = page.getByRole("dialog", { name: "Rollback Changes", exact: true });
const tree = dialog.getByRole("tree", { name: "Files to roll back" });
const body = dialog.locator("[data-dialog-body]");
await expect(tree).toBeVisible();
expect(await body.evaluate((el) => el.scrollHeight - el.clientHeight)).toBeLessThanOrEqual(1);
expect(await body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBe(0);
expect(await tree.evaluate((el) => el.scrollHeight > el.clientHeight)).toBe(true);
await expect(tree).toBeFocused();
await expect(tree.getByTitle("ledger/additional-settlement-schedule.txt", { exact: true })).toBeVisible();
const status = dialog.getByRole("status");
const deleteCopies = dialog.getByRole("checkbox", { name: "Delete local copies of added files" });
const rollback = dialog.getByRole("button", { name: "Rollback", exact: true });
await expect(status).toHaveText("1 added16 modified1 deleted");
await expect(deleteCopies).toBeEnabled();
await expect(deleteCopies).not.toBeChecked();
await deleteCopies.check();
await tree.getByRole("checkbox", { name: "Include additional-settlement-schedule.txt" }).uncheck();
await expect(deleteCopies).toBeDisabled();
await expect(status).toHaveText("16 modified1 deleted");
const rootCheckbox = tree.getByRole("checkbox", { name: "Include settlement-engine", exact: true });
await expect(rootCheckbox).toHaveAttribute("aria-checked", "mixed");
await rootCheckbox.click();
await rootCheckbox.uncheck();
await expect(rollback).toBeDisabled();
await expect(status).toHaveText("No files selected");
await tree.getByRole("checkbox", { name: "Include merchant-settlement-batch-1.txt", exact: true }).check();
await expect(status).toHaveText("1 modified");
await expect(deleteCopies).toBeDisabled();
await rollback.click();
await expect(dialog).toBeHidden();
await expect.poll(() => ipcCalls(page, "vcs_discard")).toEqual([{ paths: [modified[0]] }]);
expect(await ipcCalls(page, "vcs_unstage")).toEqual([]);
});
-79
Переглянути файл
@@ -1,79 +0,0 @@
import { expect, stubDesktop, test } from "./fixtures";
test("the environment editor resizes both tables and focuses a new variable", async ({ workbench: page }) => {
await stubDesktop(page);
await page.evaluate(async () => {
const path = "/src/features/run/store.ts";
const { useRun } = await import(/* @vite-ignore */ path);
window.__ipc.handlers.run_system_env = () =>
Object.fromEntries(Array.from({ length: 28 }, (_, i) => [`SYSTEM_${i + 1}`, `example-${i + 1}`]));
useRun.setState({
configs: [
{
id: "layout:env",
kind: "shell",
name: "Environment example",
command: "npm",
args: ["start"],
env: Object.fromEntries(Array.from({ length: 18 }, (_, i) => [`APP_${i + 1}`, `value-${i + 1}`])),
detected: false,
isTest: false,
debugAdapter: null,
},
],
selectedId: "layout:env",
loaded: true,
editorOpen: true,
});
});
const configurations = page.getByRole("dialog", { name: "Run/Debug Configurations", exact: true });
const edit = configurations.getByRole("button", { name: "Edit Environment Variables" });
await edit.click();
const dialog = page.getByRole("dialog", { name: "Environment Variables", exact: true });
const user = dialog.getByRole("table", { name: "User environment variables" });
const system = dialog.getByRole("table", { name: "System environment variables" });
await expect(system.getByRole("row")).toHaveCount(29);
const userHeight = (await user.boundingBox())!.height;
const systemHeight = (await system.boundingBox())!.height;
const handle = dialog.getByRole("separator", { name: "Resize" });
await expect(handle).toBeVisible();
const { x, y } = (await handle.boundingBox())!;
await page.mouse.move(x + 5, y + 5);
await page.mouse.down();
await page.mouse.move(x + 5, y + 101, { steps: 5 });
await page.mouse.up();
await expect.poll(async () => (await user.boundingBox())!.height).toBeGreaterThan(userHeight + 30);
await expect.poll(async () => (await system.boundingBox())!.height).toBeGreaterThan(systemHeight + 30);
await system.evaluate((el) => (el.scrollTop = el.scrollHeight));
expect(await system.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
expect(await user.evaluate((el) => el.scrollTop)).toBe(0);
const columnHeader = (await system.getByRole("columnheader", { name: "Name" }).boundingBox())!;
expect(columnHeader.y).toBeGreaterThanOrEqual((await system.boundingBox())!.y);
expect(columnHeader.y).toBeLessThan((await system.boundingBox())!.y + columnHeader.height);
await dialog.getByRole("button", { name: "Cancel", exact: true }).click();
await page.setViewportSize({ width: 430, height: 530 });
await edit.click();
await dialog.getByRole("button", { name: "Add", exact: true }).click();
const name = user.getByRole("textbox", { name: "Variable 19 name", exact: true });
await expect(name).toBeFocused();
await expect(name).toBeInViewport();
expect(await user.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
await name.fill("APP_1");
await expect(dialog.getByRole("alert")).toHaveText("Duplicate environment variable: APP_1");
const ok = dialog.getByRole("button", { name: "OK", exact: true });
await expect(ok).toBeDisabled();
await expect(ok).toBeInViewport({ ratio: 1 });
await expect(dialog.getByRole("button", { name: "Cancel", exact: true })).toBeInViewport({ ratio: 1 });
await name.fill("LOG_LEVEL");
await user.getByRole("textbox", { name: "Variable 19 value", exact: true }).fill("debug");
await dialog.getByRole("checkbox", { name: "Include system environment variables" }).uncheck();
await ok.click();
await expect(configurations.getByRole("textbox", { name: "Environment variables", exact: true })).toHaveValue(
/LOG_LEVEL=debug/,
);
await edit.click();
await expect(dialog.getByRole("checkbox", { name: "Include system environment variables" })).not.toBeChecked();
});
-63
Переглянути файл
@@ -1,63 +0,0 @@
import { expect, test } from "./fixtures";
test("keeps scope navigation and editing usable as Settings narrows", async ({ workbench: page }) => {
await page.setViewportSize({ width: 1180, height: 770 });
await page.keyboard.press("Meta+,");
const dialog = page.getByRole("dialog", { name: "Settings", exact: true });
await expect(dialog).toBeVisible();
const longName = "Shared API and generated deployment artifacts for regional settlement services";
const longPattern = "file:services/settlement//*.ts && !file:*.test.ts";
await page.evaluate(
async ({ longName, longPattern }) => {
const path = "/src/features/settings/model/staging.ts";
const { selectPage, stage } = await import(/* @vite-ignore */ path);
stage("scopes", "project", "scopes", [
{ name: longName, pattern: longPattern },
...Array.from({ length: 23 }, (_, i) => ({
name: `Settlement area ${i + 1}`,
pattern: `file:services/area-${i + 1}//*.ts`,
})),
]);
selectPage("scopes");
},
{ longName, longPattern },
);
const scopes = dialog.getByRole("listbox", { name: "Scopes", exact: true });
const toolbar = dialog.getByRole("toolbar", { name: "Scopes actions" });
const name = dialog.getByRole("textbox", { name: /^Name:?$/ });
const pattern = dialog.getByRole("textbox", { name: /^Pattern:?$/ });
await expect(name).toHaveValue(longName);
await expect(pattern).toHaveValue(longPattern);
expect((await name.boundingBox())!.x).toBeGreaterThan(
(await scopes.boundingBox())!.x + (await scopes.boundingBox())!.width,
);
const first = scopes.getByRole("option", { name: longName, exact: true });
await expect(first.getByTitle(new RegExp(longName))).toBeVisible();
expect(await scopes.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await scopes.focus();
await page.keyboard.press("End");
const last = scopes.getByRole("option", { name: "Settlement area 23", exact: true });
await expect(last).toHaveAttribute("aria-selected", "true");
await expect(last).toBeInViewport({ ratio: 1 });
await expect(pattern).toHaveValue("file:services/area-23//*.ts");
expect(await scopes.evaluate((el) => el.scrollTop)).toBeGreaterThan(100);
await expect(toolbar).toBeInViewport({ ratio: 1 });
await page.setViewportSize({ width: 650, height: 730 });
const listBounds = (await scopes.boundingBox())!;
expect((await name.boundingBox())!.y).toBeGreaterThan(listBounds.y + listBounds.height);
await toolbar.getByRole("button", { name: "Add", exact: true }).click();
await expect(name).toBeFocused();
await expect(name).toHaveValue("Scope");
expect(await name.evaluate((el: HTMLInputElement) => [el.selectionStart, el.selectionEnd])).toEqual([0, 5]);
const added = scopes.getByRole("option", { name: "Scope", exact: true });
await expect(added).toHaveAttribute("aria-selected", "true");
await expect(added).toBeInViewport({ ratio: 1 });
await page.keyboard.type("Settlement exports");
await pattern.fill("file:exports//*.csv");
await expect(scopes.getByRole("option", { name: "Settlement exports", exact: true })).toHaveAttribute(
"aria-selected",
"true",
);
});
-86
Переглянути файл
@@ -1,86 +0,0 @@
import { expect, test } from "./fixtures";
test("the scratch language chooser fits short windows and keeps recents separate from search results", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 470, height: 400 });
const long = "Zebra Configuration Language for Regional Settlement and Reconciliation Pipelines";
await page.evaluate(async (long) => {
const scratch = "/src/features/scratch/scratches.ts";
const store = "/src/features/scratch/store.ts";
const actions = "/src/platform/actions.ts";
const { setScratchBackend } = await import(/* @vite-ignore */ scratch);
const { rememberLanguage } = await import(/* @vite-ignore */ store);
setScratchBackend({
dataDir: async () => "/test-app-data",
listNames: async () => [],
createDir: async () => {},
createFile: async () => {},
languages: async () => [
...Array.from({ length: 24 }, (_, i) => {
const n = String(i + 1).padStart(2, "0");
return { id: `config-${n}`, name: `Configuration ${n}`, ext: `cfg${n}` };
}),
{ id: "json", name: "JSON", ext: "json" },
{ id: "python", name: "Python", ext: "py" },
{ id: "zebra", name: long, ext: "zebra" },
],
open: async (path: string) => localStorage.setItem("scratch-layout-opened", path),
});
rememberLanguage("json");
rememberLanguage("python");
await (await import(/* @vite-ignore */ actions)).executeAction("file.newScratchFile");
}, long);
const dialog = page.getByRole("dialog", { name: "New Scratch File", exact: true });
const input = dialog.getByRole("textbox", { name: "Filter languages" });
await expect(input).toBeFocused();
const list = dialog.getByRole("listbox", { name: "Languages" });
for (let i = 0; i < 3; i++) await input.press("PageDown");
const last = list.getByRole("option", { name: long, exact: true });
await expect(last).toHaveAttribute("aria-selected", "true");
await expect
.poll(async () => {
const popup = (await dialog.boundingBox())!;
const item = (await last.boundingBox())!;
return item.y + item.height - popup.y - popup.height;
})
.toBeLessThanOrEqual(1);
await expect(last).toBeInViewport({ ratio: 0.99 });
await expect(last.getByTitle(long)).toBeVisible();
await expect(input).toBeInViewport({ ratio: 1 });
await input.fill("python");
const python = list.getByRole("option", { name: "Python", exact: true });
await expect(python).toHaveAttribute("aria-selected", "true");
await expect(list.getByRole("separator")).toHaveCount(0);
await input.fill("");
const divider = list.getByRole("separator");
await expect(divider).toBeVisible();
await expect(python).toHaveAttribute("aria-selected", "true");
await input.press("ArrowDown");
const json = list.getByRole("option", { name: "JSON", exact: true });
await expect(json).toHaveAttribute("aria-selected", "true");
await input.press("ArrowDown");
const first = list.getByRole("option", { name: "Configuration 01", exact: true });
await expect(first).toHaveAttribute("aria-selected", "true");
expect((await divider.boundingBox())!.y).toBeLessThan((await first.boundingBox())!.y);
expect(await input.getAttribute("aria-activedescendant")).toBe(await first.getAttribute("id"));
await page.setViewportSize({ width: 640, height: 520 });
await expect
.poll(async () => {
const bounds = (await dialog.boundingBox())!;
return Math.abs(bounds.x + bounds.width / 2 - 320);
})
.toBeLessThanOrEqual(1);
await expect(input).toBeFocused();
await input.fill("zzz");
await expect(dialog.getByText("No matching languages")).toBeVisible();
await input.fill("json");
await input.press("Enter");
await expect(dialog).toBeHidden();
await expect
.poll(() => page.evaluate(() => localStorage.getItem("scratch-layout-opened")))
.toBe("/test-app-data/scratches/scratch.json");
});
-94
Переглянути файл
@@ -1,94 +0,0 @@
import type { EditorView } from "@codemirror/view";
import { expect, stubDesktop, test } from "./fixtures";
test("selection history keeps a full-width diff above a keyboard-resizable revision table", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 1140, height: 740 });
const filename = "QuarterlyCrossBorderSettlementReconciliationProjection.ts";
const path = `/dev/acme-api/modules/${filename}`;
const lastMessage = "Introduce the reconciliation projection for pending cross-border merchant settlements";
await page.evaluate(async (path) => {
const backend = "/src/editor/core/backend.ts";
(await import(/* @vite-ignore */ backend))
.docBackend()
.files.set(path, "export const pending = 0;\nconst projection = uncommitted;\n");
const service = "/src/workbench/contributions.ts";
await (await import(/* @vite-ignore */ service)).editorService().openFile(path);
}, path);
const editor = page.locator(".cm-content");
await expect(editor).toContainText("uncommitted");
await editor.evaluate((el) => {
const view = (el as HTMLElement & { cmTile: { view: EditorView } }).cmTile.view;
const line = view.state.doc.line(2);
view.dispatch({ selection: { anchor: line.from, head: line.to } });
view.focus();
});
await stubDesktop(page);
await page.evaluate(
async ({ path, lastMessage }) => {
window.__ipc.handlers.cancel_request = () => null;
window.__ipc.handlers.vcs_block_history = () => ({
headLines: [1, 1],
revisions: Array.from({ length: 22 }, (_, i) => ({
id: (i + 16).toString(16).padStart(40, "0"),
shortId: (i + 16).toString(16).padStart(7, "0"),
author: "Alexandra Reconciliation Coordinator",
email: "[email protected]",
timeMs: 1738329600000 - i * 86400000,
summary: i === 21 ? lastMessage : `Update reconciliation estimate ${22 - i}`,
path,
before: `const projection = estimate${21 - i};\n`,
after: `const projection = estimate${22 - i};\n`,
beforeLine: 1,
afterLine: 1,
})),
});
const actions = "/src/platform/actions.ts";
await (await import(/* @vite-ignore */ actions)).executeAction("vcs.showHistoryForSelection");
},
{ path, lastMessage },
);
const diff = page.locator(".cm-mergeView");
await expect(diff).toContainText("uncommitted");
const revisions = page.getByRole("grid", { name: "Revisions" });
const history = revisions.or(page.getByRole("listbox", { name: "Revisions" }));
await expect(history).toBeVisible();
const preview = (await diff.boundingBox())!;
const list = (await history.boundingBox())!;
expect(list.y).toBeGreaterThanOrEqual(preview.y + preview.height - 1);
expect(preview.width).toBeGreaterThanOrEqual(list.width - 2);
await expect(revisions.getByRole("columnheader")).toHaveText(["Revision", "Date", "Author", "Message"]);
const divider = page.getByRole("separator", { name: "Revisions", exact: true });
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
const initial = (await divider.boundingBox())!.y;
await divider.press("ArrowUp");
await expect.poll(async () => (await divider.boundingBox())!.y).toBeLessThan(initial);
await expect(revisions.getByRole("row", { selected: true })).toContainText("Local Changes");
await page.setViewportSize({ width: 490, height: 620 });
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
await expect(page.getByTitle(`${filename}:2-2`, { exact: true })).toBeVisible();
const body = revisions.getByRole("rowgroup");
await body.press("End");
const last = revisions.getByRole("row", { selected: true });
await expect(last.getByRole("gridcell", { name: lastMessage, exact: true })).toHaveAttribute("title", lastMessage);
await expect
.poll(async () => {
const listBounds = (await body.boundingBox())!;
const rowBounds = (await last.boundingBox())!;
return Math.max(listBounds.y - rowBounds.y, rowBounds.y + rowBounds.height - listBounds.y - listBounds.height);
})
.toBeLessThanOrEqual(1);
const headers = revisions.getByRole("columnheader");
const cells = last.getByRole("gridcell");
for (let i = 0; i < 4; i++) {
expect(
Math.abs((await headers.nth(i).boundingBox())!.x - (await cells.nth(i).boundingBox())!.x),
).toBeLessThanOrEqual(1);
}
expect(await body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await expect(diff).toContainText("estimate1");
});
+1 -56
Переглянути файл
@@ -1,4 +1,4 @@
import { expect, stubDesktop, test } from "./fixtures";
import { expect, test } from "./fixtures";
test("Add Python Interpreter keeps environment labels and fields inside their rows", async ({ workbench: page }) => {
await page.keyboard.press("Meta+,");
@@ -80,61 +80,6 @@ test("⌘, opens Settings with the page tree; Escape closes", async ({ workbench
await expect(dialog).toBeHidden();
});
test("Directory Mappings keeps the controls and headers visible while scrolling repositories", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 760, height: 550 });
await stubDesktop(page);
await page.evaluate(() => {
const parent = "/dev/acme-api/integrations/finance-and-order-reconciliation";
window.__ipc.handlers.vcs_detected_roots = () =>
Array.from({ length: 32 }, (_, i) =>
`${parent}/ledger-adapter-${String(i + 1).padStart(2, "0")}`.replaceAll("/", "\\"),
);
window.__ipc.handlers["plugin:dialog|open"] = () => `${parent}/billing-audit-adapter`;
});
await page.keyboard.press("Meta+,");
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
await settings.getByRole("textbox", { name: "Search settings" }).fill("Directory Mappings");
await settings.getByRole("treeitem", { name: "Directory Mappings", exact: true }).click();
const table = settings.getByRole("table", { name: "Directory mappings", exact: true });
await expect(table.getByRole("row")).toHaveCount(33);
const header = table.getByRole("columnheader", { name: "Directory", exact: true });
const vcsHeader = table.getByRole("columnheader", { name: "VCS", exact: true });
const toolbar = settings.getByRole("toolbar", { name: "Directory mappings actions" });
const directoryBox = (await header.boundingBox())!;
expect(directoryBox.width).toBeGreaterThan(2 * (await vcsHeader.boundingBox())!.width);
const viewport = table.locator("xpath=..");
await expect.poll(() => viewport.evaluate((el) => el.scrollHeight - el.clientHeight)).toBeGreaterThan(0);
expect(await viewport.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await viewport.evaluate((el) => (el.scrollTop = el.scrollHeight));
await expect(toolbar.getByRole("button", { name: "Add", exact: true })).toBeInViewport({ ratio: 1 });
expect(Math.abs((await header.boundingBox())!.y - directoryBox.y)).toBeLessThan(1);
const repo = table.getByRole("row").filter({ hasText: "ledger-adapter-32" });
const name = repo.getByText("ledger-adapter-32", { exact: true });
await expect(name).toBeInViewport({ ratio: 1 });
expect(await name.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
const vcs = repo.getByRole("button", {
name: "VCS of integrations/finance-and-order-reconciliation/ledger-adapter-32",
exact: true,
});
await vcs.click();
await page.getByRole("option", { name: "<none>", exact: true }).click();
await expect(vcs).toHaveText("<none>");
await toolbar.getByRole("button", { name: "Add", exact: true }).click();
const added = table.getByRole("row").filter({ hasText: "billing-audit-adapter" });
await expect(added.getByText("billing-audit-adapter", { exact: true })).toBeInViewport({ ratio: 1 });
await expect(added).toHaveAttribute("aria-selected", "true");
await toolbar.getByRole("button", { name: "Remove", exact: true }).click();
await expect(added).toHaveCount(0);
await settings.getByRole("button", { name: "Cancel", exact: true }).click();
await expect(settings).toBeHidden();
});
test("editor appearance groups related controls and keeps whitespace options editable", async ({ workbench: page }) => {
await page.keyboard.press("Meta+,");
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
+2 -2
Переглянути файл
@@ -2,9 +2,9 @@ import { expect, test } from "./fixtures";
for (const [id, selector] of [
["build.deployment", "[class*='layout'] > [class*='note']"],
["editor.inspections", "[class*='split'] section[class*='details']"],
["editor.inspections", "[class*='split'] > [class*='details']"],
["languages.servers", "[class*='body'] > [class*='language'][aria-label]"],
["plugins", "[class*='body'] [class*='details'][aria-label]"],
["plugins", "[class*='body'] > [class*='details']"],
["agents.list", "section[aria-label='Codex']"],
] as const) {
test(`${id} keeps its details usable beside the list`, async ({ workbench: page }) => {
+3 -3
Переглянути файл
@@ -73,9 +73,9 @@
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-dialog": "^2.8.3",
"@tauri-apps/plugin-opener": "^2",
"@xterm/addon-fit": "0.12.0-beta.334",
"@xterm/addon-search": "0.17.0-beta.332",
"@xterm/xterm": "6.1.0-beta.338",
"@xterm/addon-fit": "^0.11.0",
"@xterm/addon-search": "^0.16.0",
"@xterm/xterm": "^6.0.0",
"anser": "^2.3.5",
"clsx": "^2.1.1",
"dompurify": "^3.4.17",
Створено
+15 -23
Переглянути файл
@@ -102,14 +102,14 @@ importers:
specifier: ^2
version: 2.7.2
'@xterm/addon-fit':
specifier: 0.12.0-beta.334
version: 0.12.0-beta.334(@xterm/[email protected])
specifier: ^0.11.0
version: 0.11.0
'@xterm/addon-search':
specifier: 0.17.0-beta.332
version: 0.17.0-beta.332(@xterm/[email protected])
specifier: ^0.16.0
version: 0.16.0
'@xterm/xterm':
specifier: 6.1.0-beta.338
version: 6.1.0-beta.338
specifier: ^6.0.0
version: 6.0.0
anser:
specifier: ^2.3.5
version: 2.3.5
@@ -1452,18 +1452,14 @@ packages:
'@vitest/[email protected]':
resolution: {integrity: sha512-lwJRExuH417257Q5wv9QYugN9IMJkoxcrKrYxGPQkBzl7wlNpTUxD/5yNX4ESKVUIShKPgkGchYPFMWOOk0wzw==}
'@xterm/[email protected]2.0-beta.334':
resolution: {integrity: sha512-fIFQHJ15PER9KhAG24IhA5vF4ysHEKrJgImt/ZqRcahvNUGF1T3WnpJ6bLvlvnsft7bVT0ofBWySx6nxFNAXkA==}
peerDependencies:
'@xterm/xterm': ^6.1.0-beta.338
'@xterm/[email protected]1.0':
resolution: {integrity: sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==}
'@xterm/[email protected]7.0-beta.332':
resolution: {integrity: sha512-XiyGiCWIRdguk45PiXT9ejuuGcCh0Z46ADBXNK4JNL8ElXIwyJ3uiljjxjFOiZ4QFeSrvhUtaQYgmvtOwWEO1A==}
peerDependencies:
'@xterm/xterm': ^6.1.0-beta.338
'@xterm/[email protected]6.0':
resolution: {integrity: sha512-9OeuBFu0/uZJPu+9AHKY6g/w0Czyb/Ut0A5t79I4ULoU4IfU5BEpPFVGQxP4zTTMdfZEYkVIRYbHBX1xWwjeSA==}
'@xterm/xterm@6.1.0-beta.338':
resolution: {integrity: sha512-VBygvapFKV5gsqvVFsk6gYpArn4AXnUtZvt3tfN2LXI284i0mivC6Kus84GMJo0GJPLRFziWcSPVz95nViPuWw==}
'@xterm/xterm@6.0.0':
resolution: {integrity: sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==}
[email protected]:
resolution: {integrity: sha512-vcZjxvvVoxTeR5XBNJB38oTu/7eDCZlwdz32N1eNgpyPF7j/Z7Idf+CUwQOkKKpJ7RJyjxgLHCM7vdIK0iCNMQ==}
@@ -3455,15 +3451,11 @@ snapshots:
'@vitest/[email protected]': {}
'@xterm/[email protected]2.0-beta.334(@xterm/[email protected])':
dependencies:
'@xterm/xterm': 6.1.0-beta.338
'@xterm/[email protected]1.0': {}
'@xterm/[email protected]7.0-beta.332(@xterm/[email protected])':
dependencies:
'@xterm/xterm': 6.1.0-beta.338
'@xterm/[email protected]6.0': {}
'@xterm/xterm@6.1.0-beta.338': {}
'@xterm/xterm@6.0.0': {}
[email protected]: {}
-12
Переглянути файл
@@ -187,18 +187,6 @@ describe("IntelliJ theme import", () => {
});
});
it("takes what a Darcula-based scheme leaves out from Darcula", () => {
const s = convertIcls(`<scheme name="Mine" version="142" parent_scheme="Darcula"><attributes>
<option name="DEFAULT_KEYWORD"><value><option name="FOREGROUND" value="ff8800"/></value></option>
<option name="DEFAULT_STRING"><value/></option>
</attributes></scheme>`);
expect(s.tokens["--bg-editor"]).toBe("#2b2b2b");
expect(s.tokens["--syn-keyword"]).toBe("#ff8800");
// An empty entry of its own replaces Darcula's colour.
expect(s.tokens["--syn-string"]).toBeUndefined();
expect(convertIcls(`<scheme name="I" parent_scheme="Islands Dark"></scheme>`).tokens).toEqual({});
});
it("only targets tokens that exist in tokens.css", () => {
const declared = new Set([...css.matchAll(/(--[a-z0-9-]+)\s*:/g)].map((m) => m[1]!));
// Read with a fallback by the editor (no tokens.css default), still themeable.
+1 -304
Переглянути файл
@@ -1,8 +1,4 @@
use ide_core::{EventSink, IdeEvent, SharedSink};
use parking_lot::Mutex;
use std::collections::{HashMap, VecDeque};
use std::sync::Arc;
use std::time::Duration;
use ide_core::{EventSink, IdeEvent};
use tauri::{AppHandle, Emitter, Manager, UserAttentionType};
/// Name of the single backend → UI event. Payload: [`IdeEvent`].
@@ -42,103 +38,6 @@ pub struct TauriSink {
pub window: Option<String>,
}
const COALESCE_WINDOW: Duration = Duration::from_millis(16);
const MAX_PENDING_DIAGNOSTICS: usize = 4096;
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
struct DiagnosticKey {
path: ide_core::IpcPath,
source: String,
}
#[derive(Default)]
struct PendingDiagnostics {
order: VecDeque<DiagnosticKey>,
events: HashMap<DiagnosticKey, IdeEvent>,
scheduled: bool,
}
fn diagnostic_key(event: &IdeEvent) -> Option<DiagnosticKey> {
let IdeEvent::Diagnostics { path, source, .. } = event else {
return None;
};
Some(DiagnosticKey { path: path.clone(), source: source.clone() })
}
fn take_pending(state: &mut PendingDiagnostics) -> Vec<IdeEvent> {
let mut events = Vec::with_capacity(state.events.len());
for key in state.order.drain(..) {
if let Some(event) = state.events.remove(&key) {
events.push(event);
}
}
events
}
/// Collapses repeated full-replacement diagnostics for one `(path, source)` into the
/// latest event in a frame-sized window. Any other event flushes the pending
/// diagnostics first so lifecycle and ordered events cannot overtake them.
pub fn coalescing_sink(sink: SharedSink, runtime: tokio::runtime::Handle) -> SharedSink {
let pending = Arc::new(Mutex::new(PendingDiagnostics::default()));
let dispatch = Arc::new(Mutex::new(()));
Arc::new(move |event| {
let Some(key) = diagnostic_key(&event) else {
let _dispatch = dispatch.lock();
let events = take_pending(&mut pending.lock());
for pending_event in events {
sink.emit(pending_event);
}
sink.emit(event);
return;
};
loop {
let schedule = {
let mut state = pending.lock();
if !state.events.contains_key(&key) && state.events.len() >= MAX_PENDING_DIAGNOSTICS {
None
} else {
if !state.events.contains_key(&key) {
state.order.push_back(key.clone());
}
state.events.insert(key.clone(), event.clone());
if state.scheduled {
return;
}
state.scheduled = true;
Some(())
}
};
if schedule.is_none() {
let _dispatch = dispatch.lock();
let events = take_pending(&mut pending.lock());
for pending_event in events {
sink.emit(pending_event);
}
continue;
}
let pending = pending.clone();
let dispatch = dispatch.clone();
let sink = sink.clone();
runtime.spawn(async move {
tokio::time::sleep(COALESCE_WINDOW).await;
let _dispatch = dispatch.lock();
let events = {
let mut state = pending.lock();
state.scheduled = false;
take_pending(&mut state)
};
for event in events {
sink.emit(event);
}
});
return;
}
})
}
/// A debug session stopped on a breakpoint: bounce/flash the taskbar icon
/// (IDEA) unless the user is already looking at an OpenIDEA window. The focus
/// check and the request both touch the windowing system, so they run on the
@@ -195,205 +94,3 @@ impl EventSink for TauriSink {
}
}
}
#[cfg(test)]
mod tests {
use super::*;
use ide_core::{Diagnostic, IpcPath, Pos, Range, Severity, TaskId};
use parking_lot::Mutex;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::time::Duration;
use std::time::Instant;
fn setup() -> (ide_core::SharedSink, Arc<Mutex<Vec<IdeEvent>>>) {
let events = Arc::new(Mutex::new(Vec::new()));
let saved = events.clone();
(coalescing_sink(Arc::new(move |event| saved.lock().push(event)), tokio::runtime::Handle::current()), events)
}
fn diagnostics(path: &str, source: &str, message: &str) -> IdeEvent {
IdeEvent::Diagnostics {
path: IpcPath::from(path),
source: source.into(),
items: vec![Diagnostic {
range: Range::point(Pos::new(0, 0)),
severity: Severity::Error,
message: message.into(),
source: None,
code: None,
unnecessary: false,
deprecated: false,
server: None,
}],
}
}
fn task(message: &str, done: bool) -> IdeEvent {
IdeEvent::Task {
id: TaskId(1),
title: "Indexing".into(),
message: Some(message.into()),
fraction: Some(if done { 1.0 } else { 0.5 }),
done,
cancellable: !done,
}
}
#[tokio::test]
async fn coalesces_diagnostics_by_path_and_source() {
let (sink, events) = setup();
for index in 0..100 {
sink.emit(diagnostics("/p/a.rs", "rust-analyzer", &format!("old {index}")));
}
sink.emit(diagnostics("/p/a.rs", "eslint", "lint"));
sink.emit(diagnostics("/p/b.rs", "rust-analyzer", "other"));
assert!(events.lock().is_empty());
tokio::task::yield_now().await;
tokio::time::sleep(Duration::from_millis(30)).await;
tokio::task::yield_now().await;
{
let saved_events = events.lock();
assert_eq!(saved_events.len(), 3);
assert!(matches!(
&saved_events[0],
IdeEvent::Diagnostics { path, source, items }
if path == &IpcPath::from("/p/a.rs")
&& source == "rust-analyzer"
&& items[0].message == "old 99"
));
assert!(matches!(
&saved_events[1],
IdeEvent::Diagnostics { path, source, .. }
if path == &IpcPath::from("/p/a.rs") && source == "eslint"
));
assert!(matches!(
&saved_events[2],
IdeEvent::Diagnostics { path, source, .. }
if path == &IpcPath::from("/p/b.rs") && source == "rust-analyzer"
));
}
tokio::time::sleep(Duration::from_millis(30)).await;
assert_eq!(events.lock().len(), 3);
}
#[tokio::test]
async fn immediate_events_flush_pending_events_first() {
let (sink, events) = setup();
sink.emit(diagnostics("/p/a.rs", "rust-analyzer", "before"));
sink.emit(diagnostics("/p/b.rs", "rust-analyzer", "other"));
sink.emit(IdeEvent::SettingsChanged { key: "editor.fontSize".into() });
let events = events.lock();
assert_eq!(events.len(), 3);
assert!(matches!(&events[0], IdeEvent::Diagnostics { .. }));
assert!(matches!(&events[1], IdeEvent::Diagnostics { .. }));
assert!(matches!(&events[2], IdeEvent::SettingsChanged { .. }));
}
#[tokio::test]
async fn lifecycle_events_remain_immediate() {
let (sink, events) = setup();
sink.emit(task("complete", true));
let events = events.lock();
assert_eq!(events.len(), 1);
assert!(matches!(
&events[0],
IdeEvent::Task { message, done, .. }
if message.as_deref() == Some("complete") && *done
));
}
#[tokio::test]
async fn diagnostic_buffer_cap_flushes_without_dropping() {
let (sink, events) = setup();
for index in 0..=MAX_PENDING_DIAGNOSTICS {
sink.emit(diagnostics(&format!("/p/{index}.rs"), "rust-analyzer", "diagnostic"));
}
assert_eq!(events.lock().len(), MAX_PENDING_DIAGNOSTICS);
tokio::time::sleep(Duration::from_millis(30)).await;
assert_eq!(events.lock().len(), MAX_PENDING_DIAGNOSTICS + 1);
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
#[ignore = "run for before/after diagnostics transport measurements"]
async fn diagnostics_coalescing_benchmark() {
const FILES: usize = 2_000;
const ROUNDS: usize = 10;
let burst: Vec<IdeEvent> = (0..ROUNDS)
.flat_map(|round| {
(0..FILES).map(move |file| {
diagnostics(&format!("/workspace/src/File{file}.rs"), "rust-analyzer", &format!("round-{round}"))
})
})
.collect();
let raw_events = Arc::new(AtomicUsize::new(0));
let raw_count = raw_events.clone();
let raw: SharedSink = Arc::new(move |event| {
let encoded = serde_json::to_vec(&event).unwrap();
raw_count.fetch_add(1, Ordering::Relaxed);
std::hint::black_box(encoded.len());
});
let raw_started = Instant::now();
for event in &burst {
raw.emit(event.clone());
}
let raw_elapsed = raw_started.elapsed();
assert_eq!(raw_events.load(Ordering::Relaxed), FILES * ROUNDS);
let coalesced_events = Arc::new(AtomicUsize::new(0));
let delivered_state = Arc::new(Mutex::new(HashMap::<IpcPath, String>::new()));
let coalesced_count = coalesced_events.clone();
let delivered = delivered_state.clone();
let target: SharedSink = Arc::new(move |event| {
let encoded = serde_json::to_vec(&event).unwrap();
coalesced_count.fetch_add(1, Ordering::Relaxed);
if let IdeEvent::Diagnostics { path, items, .. } = event {
delivered.lock().insert(path, items[0].message.clone());
}
std::hint::black_box(encoded.len());
});
let coalesced = coalescing_sink(target, tokio::runtime::Handle::current());
let coalesced_started = Instant::now();
for event in &burst {
coalesced.emit(event.clone());
}
let expected_last_round = format!("round-{}", ROUNDS - 1);
let deadline = Instant::now() + Duration::from_secs(2);
loop {
let complete = {
let delivered_state = delivered_state.lock();
delivered_state.len() == FILES
&& delivered_state.values().all(|message| message == &expected_last_round)
};
if complete {
break;
}
assert!(Instant::now() < deadline, "diagnostics did not settle before benchmark timeout");
tokio::time::sleep(Duration::from_millis(5)).await;
}
let coalesced_elapsed = coalesced_started.elapsed();
let coalesced_count = coalesced_events.load(Ordering::Relaxed);
assert!(coalesced_count >= FILES);
assert!(coalesced_count < FILES * ROUNDS);
let delivered_state = delivered_state.lock();
assert_eq!(delivered_state.len(), FILES);
assert!(delivered_state.values().all(|message| message == &expected_last_round));
println!(
"diagnostics transport burst: raw_events={} raw_ms={:.2} coalesced_events={} \
coalesced_total_ms={:.2} reduction_pct={:.1}",
FILES * ROUNDS,
raw_elapsed.as_secs_f64() * 1_000.0,
coalesced_count,
coalesced_elapsed.as_secs_f64() * 1_000.0,
(1.0 - coalesced_count as f64 / (FILES * ROUNDS) as f64) * 100.0,
);
}
}
-6
Переглянути файл
@@ -288,12 +288,6 @@ pub fn run() {
window_groups::frame_changed(window.app_handle(), window.label());
}
tauri::WindowEvent::Destroyed => {
// Also release a view that failed during startup, before the parent could watch it.
if let Some(state) = window.try_state::<AppState>()
&& let Ok(project) = state.host.project(window.label())
{
project.agents.unsubscribe(window.label());
}
window_zoom::forget(window.label());
#[cfg(target_os = "macos")]
{
+7 -41
Переглянути файл
@@ -1282,11 +1282,11 @@ fn build_rendered<R: Runtime>(
for rendered in menus {
let submenu = Submenu::with_id(app, format!("submenu:{}", rendered.id), &rendered.title, true)?;
append_rendered(app, &submenu, &rendered.items, disabled)?;
// The Window menu is registered after `set_menu`: doing it here cannot see the submenu
// on NSApp, so AppKit never adds the open-window list.
#[cfg(target_os = "macos")]
if rendered.id == "help" {
submenu.set_as_help_menu_for_nsapp()?;
match rendered.id {
"window" => submenu.set_as_windows_menu_for_nsapp()?,
"help" => submenu.set_as_help_menu_for_nsapp()?,
_ => {}
}
menu.append(&submenu)?;
}
@@ -1632,43 +1632,9 @@ pub fn install<R: Runtime>(app: &AppHandle<R>, menu_state: &MenuState, recent: &
*slot = Some(rendered);
return;
}
let installed = match build(app, Os::current(), &config, &items, &disabled).and_then(|menu| app.set_menu(menu)) {
Ok(_) => {
*slot = Some(rendered);
true
}
Err(e) => {
tracing::warn!("failed to build the app menu: {e}");
false
}
};
drop(slot);
if installed {
// After the menu bar is installed. Holding `rendered` across this would deadlock a menu
// click on the main thread, which also takes that lock.
#[cfg(target_os = "macos")]
register_macos_windows_menu(app);
}
}
/// Makes the Window submenu the macOS windows menu, so AppKit lists open windows under it.
///
/// Each item uses the window title (`project – file`, or the workspace name). muda can only
/// resolve the submenu once `set_menu` has attached it, and Tauri itself only does this for
/// the id `__tauri_window_menu__`.
#[cfg(target_os = "macos")]
fn register_macos_windows_menu<R: Runtime>(app: &AppHandle<R>) {
let Some(menu) = app.menu() else { return };
let Ok(items) = menu.items() else { return };
for item in items {
let Some(submenu) = item.as_submenu() else { continue };
if submenu.id().as_ref() != "submenu:window" {
continue;
}
if let Err(error) = submenu.set_as_windows_menu_for_nsapp() {
tracing::warn!("failed to register the macOS Window menu: {error}");
}
return;
match build(app, Os::current(), &config, &items, &disabled).and_then(|menu| app.set_menu(menu)) {
Ok(_) => *slot = Some(rendered),
Err(e) => tracing::warn!("failed to build the app menu: {e}"),
}
}
-45
Переглянути файл
@@ -1161,50 +1161,6 @@ pub async fn remote_import_local(
result
}
/// One file of a [`remote_download_local`] transfer starting: `done` of `total` files are finished.
#[derive(Clone, Serialize, Type)]
#[serde(rename_all = "camelCase")]
pub struct DownloadProgress {
pub path: String,
pub done: u32,
pub total: u32,
}
/// The project view's Download to…: remote files and folders of this window's project into the
/// local folder `target`, each under its own name. Like Remote Host › Download to…, nothing is
/// written outside `target`, even through a local symlink inside it.
#[desktop_command(trust = trusted)]
#[tauri::command]
#[specta::specta]
pub async fn remote_download_local(
window: Window,
state: State<'_, AppState>,
paths: Vec<String>,
target: std::path::PathBuf,
request: ide_core::RequestId,
on_progress: Channel<DownloadProgress>,
) -> IdeResult<ide_remote::TransferReport> {
let label = AppState::owner_window(window.label());
let c = state.remote_dev.get(label).ok_or_else(|| IdeError::unavailable("Remote project is disconnected"))?;
let Some(session) = c.session.clone() else {
return Err(IdeError::unavailable("Downloading files is not supported in a WSL project yet"));
};
let cancel = state.host.begin_request(request);
let result = async {
let fs = ide_ssh::RemoteFs::new(session.sftp().await?);
let mut progress = |path: &str, done: usize, total: usize| {
let _ =
on_progress.send(DownloadProgress { path: path.to_owned(), done: done as u32, total: total as u32 });
};
let result = ide_remote::service::download_into(&fs, &paths, &target, &cancel, &mut progress).await;
fs.close().await;
result
}
.await;
state.host.end_request(request);
result
}
/// A command the server does not know, from a server of another version than this app: says so,
/// instead of the bare JSON-RPC error.
fn older_server_error(e: IdeError, server_version: &str, host: &str) -> IdeError {
@@ -1435,7 +1391,6 @@ ide_command::desktop_domain!(
remote_connect,
remote_current,
remote_disconnect,
remote_download_local,
remote_forward_port,
remote_forwarded_ports,
remote_import_local,
+4 -9
Переглянути файл
@@ -1,4 +1,4 @@
use crate::events::{TauriSink, coalescing_sink};
use crate::events::TauriSink;
use ide_core::{EventSink, IdeEvent, IdeResult, SharedSink};
use ide_language::{LanguageRegistry, Syntax};
use ide_workspace::RecentProjects;
@@ -83,11 +83,9 @@ impl AppState {
tracing::info!("invalidated caches: {removed:?}");
}
ide_host::data_dirs::migrate(&data_dir, &local_data_dir);
let runtime = tauri::async_runtime::handle().inner().clone();
let global_sink = coalescing_sink(Arc::new(TauriSink { app: app.clone(), window: None }), runtime.clone());
let global_sink: SharedSink = Arc::new(TauriSink { app: app.clone(), window: None });
let languages = Arc::new(LanguageRegistry::load(Some(&config_dir.join("languages")))?);
let sink_app = app.clone();
let sink_runtime = runtime.clone();
let host = Arc::new(Host::new(ide_host::HostConfig {
config_dir: config_dir.clone(),
data_dir: data_dir.clone(),
@@ -95,13 +93,10 @@ impl AppState {
languages: languages.clone(),
syntax,
sink_for: Box::new(move |window| {
coalescing_sink(
Arc::new(TauriSink { app: sink_app.clone(), window: Some(window.to_owned()) }),
sink_runtime.clone(),
)
Arc::new(TauriSink { app: sink_app.clone(), window: Some(window.to_owned()) })
}),
owner: Self::owner_window,
runtime,
runtime: tauri::async_runtime::handle().inner().clone(),
project_environment: false,
}));
let announce = global_sink.clone();
+2 -34
Переглянути файл
@@ -84,16 +84,11 @@ pub struct Launch {
pub editor: Option<Box<EditorLaunch>>,
}
/// What a lightweight editor window shows: a file, with optional caret / selection (0-based), or
/// the tab of another editor kind.
/// A file opened in a lightweight editor window, with optional caret / selection (0-based).
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Type)]
#[serde(rename_all = "camelCase")]
pub struct EditorLaunch {
#[serde(default, skip_serializing_if = "Option::is_none")]
pub path: Option<ide_core::IpcPath>,
/// The tab's editor input, as JSON.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub input: Option<String>,
pub path: ide_core::IpcPath,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub line: Option<u32>,
#[serde(default, skip_serializing_if = "Option::is_none")]
@@ -360,12 +355,6 @@ impl WindowsState {
pub fn take_launch(&self, label: &str) -> Option<Launch> {
let mut launches = self.launches.lock();
// Lightweight windows need their launch again when their webview reloads.
if let Some(launch) = launches.get(label)
&& launch.editor.is_some()
{
return Some(launch.clone());
}
let launch = launches.remove(label)?;
if launch.project.is_some() || launch.remote.is_some() || !launch.files.is_empty() || launch.diff.is_some() {
self.opening.lock().insert(label.to_owned(), launch.clone());
@@ -2766,27 +2755,6 @@ mod tests {
assert_eq!(st.take_launch("project-1"), None);
}
#[test]
fn editor_launch_survives_webview_reload_until_window_closes() {
let st = WindowsState::default();
let launch = Launch {
editor: Some(Box::new(EditorLaunch {
path: None,
input: Some(r#"{"kind":"agent-session","key":"agent:running-task"}"#.into()),
line: None,
column: None,
end_line: None,
end_column: None,
})),
..Default::default()
};
st.set_launch("editor-main-3", launch.clone());
assert_eq!(st.take_launch("editor-main-3"), Some(launch.clone()));
assert_eq!(st.take_launch("editor-main-3"), Some(launch));
st.forget("editor-main-3");
assert!(st.take_launch("editor-main-3").is_none());
}
#[test]
fn a_taken_launch_owns_its_window_until_completion() {
for launch in [
+1 -6
Переглянути файл
@@ -7,7 +7,6 @@ agent_base_text trusted project_host bin
agent_cancel always project_host bindings sync
agent_changes trusted project_host bindings async
agent_commands always project_host bindings async
agent_context_usage trusted project_host bindings async
agent_create trusted project_host bindings async
agent_custom_import trusted desktop bindings sync
agent_custom_remove trusted desktop bindings sync
@@ -49,7 +48,6 @@ agent_stop_background always project_host bin
agent_subscribe always project_host bindings sync
agent_unarchive always project_host bindings sync
agent_unqueue always project_host bindings sync
agent_unsubscribe always project_host bindings sync
analysis_locate_duplicates always project_host bindings async
android_devices trusted desktop bindings async
android_logcat trusted desktop bindings async
@@ -217,7 +215,6 @@ doc_open_untitled always project_host bin
doc_open_virtual always project_host bindings async
doc_outline always project_host bindings async
doc_python_facts always project_host bindings async
doc_reload_from_disk always project_host bindings async
doc_save always project_host bindings async
doc_save_all always project_host bindings async
doc_save_as always project_host bindings async
@@ -378,7 +375,6 @@ maven_dependency_completion trusted project_host bin
maven_dependency_declaration trusted project_host bindings async
maven_exclude_dependency trusted project_host bindings async
maven_goto_declaration trusted project_host bindings async
maven_managed_declarations trusted project_host bindings async
mcp_agent_run_closed trusted project_host bindings sync
mcp_background_projects always project_host bindings sync
mcp_regenerate_token outside_restricted project_host bindings sync
@@ -513,7 +509,6 @@ remote_current always desktop bin
remote_delete trusted project_host bindings async
remote_disconnect always desktop bindings sync
remote_download_into trusted project_host bindings async
remote_download_local trusted desktop bindings async
remote_forward_port trusted desktop bindings async
remote_forwarded_ports trusted desktop bindings sync
remote_import_local trusted desktop bindings async
@@ -574,7 +569,7 @@ sdk_php_language_level trusted project_host bin
sdk_php_xdebug trusted project_host bindings async
sdk_project_libraries trusted project_host bindings async
sdk_python_create_venv outside_restricted project_host bindings async
sdk_python_effective trusted project_host bindings async
sdk_python_effective trusted project_host bindings sync
sdk_python_interpreter outside_restricted project_host bindings async
sdk_python_packages outside_restricted project_host bindings async
sdk_python_pip outside_restricted project_host bindings async
+9 -85
Переглянути файл
@@ -38,8 +38,6 @@ export const commands = {
* before a task exists (skills and custom commands on disk included).
*/
agentCommands: (provider: string, task: string | null) => typedError<AgentCommand[], IdeError>(__TAURI_INVOKE("agent_commands", { provider, task })),
/** Reads the running session's context categories without sending a prompt. */
agentContextUsage: (task: string) => typedError<AgentContextUsage, IdeError>(__TAURI_INVOKE("agent_context_usage", { task })),
agentCreate: (request: NewAgentTask) => typedError<AgentTask_Serialize, IdeError>(__TAURI_INVOKE("agent_create", { request })),
/** Imports a JetBrains `acp.json` file's `agent_servers` entries as custom agents. */
agentCustomImport: (text: string) => typedError<AcpImportOutcome[], IdeError>(__TAURI_INVOKE("agent_custom_import", { text })),
@@ -146,16 +144,11 @@ export const commands = {
agentShell: (task: string, command: string, request: RequestId) => typedError<null, IdeError>(__TAURI_INVOKE("agent_shell", { task, command, request })),
/** Stops one of the task's background tasks. */
agentStopBackground: (task: string, background: string) => typedError<null, IdeError>(__TAURI_INVOKE("agent_stop_background", { task, background })),
/**
* Streams the project's agent events to `subscriber`, one of the project's windows (a remote
* host sees them all as one `window`); returns every task.
*/
agentSubscribe: (onEvent: Channel<AgentEvent_Deserialize>, subscriber: string) => typedError<AgentTask_Serialize[], IdeError>(__TAURI_INVOKE("agent_subscribe", { onEvent, subscriber })),
/** Streams the project's agent events to this window; returns every task. */
agentSubscribe: (onEvent: Channel<AgentEvent_Deserialize>) => typedError<AgentTask_Serialize[], IdeError>(__TAURI_INVOKE("agent_subscribe", { onEvent })),
agentUnarchive: (task: string) => typedError<null, IdeError>(__TAURI_INVOKE("agent_unarchive", { task })),
/** Drops a queued message and returns it (to edit it). */
agentUnqueue: (task: string, queued: string) => typedError<AgentQueued, IdeError>(__TAURI_INVOKE("agent_unqueue", { task, queued })),
/** Stops the events of a window that closed. */
agentUnsubscribe: (subscriber: string) => typedError<null, IdeError>(__TAURI_INVOKE("agent_unsubscribe", { subscriber })),
/** Locate Duplicates over the files of `scope`. */
analysisLocateDuplicates: (request: RequestId, scope: SearchScope, options: DuplicateOptions) => typedError<DuplicatesReport, IdeError>(__TAURI_INVOKE("analysis_locate_duplicates", { request, scope, options })),
/** Devices `adb` knows about, online ones first. */
@@ -540,8 +533,6 @@ export const commands = {
docOutline: (doc: DocId) => typedError<OutlineItem[], IdeError>(__TAURI_INVOKE("doc_outline", { doc })),
/** Python class facts for the inheritance inspections: tree-sitter, no language server. */
docPythonFacts: (doc: DocId) => typedError<PythonFacts, IdeError>(__TAURI_INVOKE("doc_python_facts", { doc })),
/** Load Changes from Disk: discards the buffer's unsaved changes and reads its file again. */
docReloadFromDisk: (doc: DocId) => typedError<null, IdeError>(__TAURI_INVOKE("doc_reload_from_disk", { doc })),
docSave: (doc: DocId) => typedError<null, IdeError>(__TAURI_INVOKE("doc_save", { doc })),
docSaveAll: () => typedError<null, IdeError>(__TAURI_INVOKE("doc_save_all")),
/**
@@ -969,9 +960,8 @@ export const commands = {
mavenExcludeDependency: (pom: string, dependency: ArtifactKey, exclusion: ArtifactKey) => typedError<Location, IdeError>(__TAURI_INVOKE("maven_exclude_dependency", { pom, dependency, exclusion })),
/**
* The go-to-declaration target at `pos` of a Maven POM: the definition of the
* `${property}` at the caret, the parent POM, or the dependency / plugin's own POM
* (a project module first, then the local repository). A dependency without a
* resolvable artifact POM falls back to its management entry.
* `${property}` at the caret, or the `<dependencyManagement>` / `<pluginManagement>`
* entry providing the dependency's / plugin's version, along the parent chain.
*/
mavenGotoDeclaration: (pom: string, pos: Pos) => typedError<{
/**
@@ -985,12 +975,6 @@ export const commands = {
/** The declaration as named for the user (`example.version`, `com.example:example-lib`). */
label: string,
} | null, IdeError>(__TAURI_INVOKE("maven_goto_declaration", { pom, pos })),
/**
* Gutter targets of the unversioned dependencies and plugins in a Maven POM:
* the management declarations that actually supply their versions, including
* parent POMs and imported BOMs. Cancel with `cancel_request(request)`.
*/
mavenManagedDeclarations: (pom: string, request: RequestId) => typedError<PomManagedDeclaration[], IdeError>(__TAURI_INVOKE("maven_managed_declarations", { pom, request })),
/** The user closed the Run tool window tab of an agent command (`run_command`). */
mcpAgentRunClosed: (name: string) => typedError<null, IdeError>(__TAURI_INVOKE("mcp_agent_run_closed", { name })),
/**
@@ -1350,12 +1334,6 @@ export const commands = {
remoteDelete: (connection: FsConnection, path: string) => typedError<null, IdeError>(__TAURI_INVOKE("remote_delete", { connection, path })),
remoteDisconnect: () => __TAURI_INVOKE<void>("remote_disconnect"),
remoteDownloadInto: (connection: FsConnection, paths: string[], target: IpcPath, request: RequestId) => typedError<TransferReport, IdeError>(__TAURI_INVOKE("remote_download_into", { connection, paths, target, request })),
/**
* The project view's Download to…: remote files and folders of this window's project into the
* local folder `target`, each under its own name. Like Remote Host › Download to…, nothing is
* written outside `target`, even through a local symlink inside it.
*/
remoteDownloadLocal: (paths: string[], target: string, request: RequestId, onProgress: Channel<DownloadProgress>) => typedError<TransferReport, IdeError>(__TAURI_INVOKE("remote_download_local", { paths, target, request, onProgress })),
/**
* Forwards `localhost:<remote_port>` of the remote host to the same port here when it is free,
* else to a free one. Nothing needs to listen there yet; connections are opened per use.
@@ -2166,8 +2144,6 @@ export type AgentCapabilities = {
steer?: boolean,
/** It reports its background tasks and stops them one by one. */
backgroundTasks?: boolean,
/** The connected agent can report a breakdown of its context window. */
contextUsage?: boolean,
};
/**
@@ -2272,21 +2248,6 @@ export type AgentConfigVia =
/** `session/set_model` (agents that report `models` instead of a model config option). */
"model";
export type AgentContextCategory = {
name: string,
tokens: number,
kind: string | null,
};
export type AgentContextUsage = {
categories: AgentContextCategory[],
totalTokens: number,
maxTokens: number,
model: string,
isAutoCompactEnabled: boolean | null,
autoCompactThreshold: number | null,
};
export type AgentCost = {
amount: number | null,
/** ISO 4217 code, e.g. `USD`. */
@@ -5491,13 +5452,6 @@ export type DocumentTextChange = {
insert: string,
};
/** One file of a [`remote_download_local`] transfer starting: `done` of `total` files are finished. */
export type DownloadProgress = {
path: string,
done: number,
total: number,
};
export type DuplicateGroup = {
tokens: number,
/** Lines of the first fragment. */
@@ -5615,34 +5569,21 @@ export type EditorGeneralSettings = {
richTextCopy?: boolean,
};
/**
* What a lightweight editor window shows: a file, with optional caret / selection (0-based), or
* the tab of another editor kind.
*/
/** A file opened in a lightweight editor window, with optional caret / selection (0-based). */
export type EditorLaunch = EditorLaunch_Serialize | EditorLaunch_Deserialize;
/**
* What a lightweight editor window shows: a file, with optional caret / selection (0-based), or
* the tab of another editor kind.
*/
/** A file opened in a lightweight editor window, with optional caret / selection (0-based). */
export type EditorLaunch_Deserialize = {
path?: IpcPath | null,
/** The tab's editor input, as JSON. */
input?: string | null,
path: IpcPath,
line?: number | null,
column?: number | null,
endLine?: number | null,
endColumn?: number | null,
};
/**
* What a lightweight editor window shows: a file, with optional caret / selection (0-based), or
* the tab of another editor kind.
*/
/** A file opened in a lightweight editor window, with optional caret / selection (0-based). */
export type EditorLaunch_Serialize = {
path?: IpcPath | null,
/** The tab's editor input, as JSON. */
input?: string | null,
path: IpcPath,
line?: number | null,
column?: number | null,
endLine?: number | null,
@@ -6509,8 +6450,6 @@ export type GitSettings = {
*/
inlineBlameClickable?: boolean,
showBranchInProjectView?: boolean,
/** Branch operations from the branches popup act on every repository of the project. */
syncBranchOperations?: boolean,
/** Path to the git executable; empty = auto-detect. */
executable?: string,
/** Default of Update Project: `merge` | `rebase`. */
@@ -7087,11 +7026,6 @@ workspaceEdit?: boolean } |
{ type: "docDirty"; doc: DocId; dirty: boolean;
/** Text version when this transition occurred, including when it was saved. */
version: number } |
/**
* An open document's file changed on disk while the buffer had unsaved changes. The buffer
* keeps them (autosave leaves the file alone); the UI offers to load the disk version.
*/
{ type: "docDiskConflict"; doc: DocId; path: string } |
/** A complete workspace edit can be undone as one operation. */
{ type: "workspaceEditApplied"; id: number; paths: IpcPath[];
/**
@@ -9819,16 +9753,6 @@ export type PomGotoKind =
/** The POM of the artifact itself: a project module's, else the local repository's. */
"artifactPom";
/** A dependency or plugin whose version comes from a management declaration. */
export type PomManagedDeclaration = {
/** 0-based line of the `<dependency>` or `<plugin>` declaration. */
line: number,
/** The interpolated version the management entry provides, when it has one. */
version: string | null,
/** The management entry, possibly in a parent POM or an imported BOM. */
target: PomGoto,
};
/** A 0-based line / UTF-16 column position. */
export type Pos = {
line: number,
+1 -15
Переглянути файл
@@ -490,11 +490,7 @@ export type ContributedFormatter = (
range: { from: number; to: number } | null,
) => Array<{ from: number; to: number; insert: string }>;
/** Go to Declaration / ⌘-click: `true` when it handled `pos`. */
export interface ContributedDefinition {
(view: EditorView, pos: number): boolean;
/** Cheap, side-effect-free eligibility for hover underline and navigation probing. */
canHandle?(state: EditorState, pos: number): boolean;
}
export type ContributedDefinition = (view: EditorView, pos: number) => boolean;
/** Hover and Quick Documentation: Markdown about the symbol at `pos`. */
export type ContributedHover = (
state: EditorState,
@@ -505,16 +501,6 @@ export function contributedAt<T>(state: EditorState, key: string, pos: number):
return state.languageDataAt<T>(key, pos)[0];
}
/**
* Every provider registered for a contributed language-data key at `pos`. A provider may
* be present for the document but decline this particular position (the MyBatis SQL
* provider on a Maven POM, for example), so callers that dispatch a request must not stop
* at the first entry when it returns "not handled".
*/
export function contributedAtAll<T>(state: EditorState, key: string, pos: number): readonly T[] {
return state.languageDataAt<T>(key, pos);
}
/** A context action a feature offers at the caret, listed by Show Context Actions (⌥↵). */
export interface ContributedIntention {
id: string;
-93
Переглянути файл
@@ -1,93 +0,0 @@
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import type { EditorInput } from "@/workbench/contributions";
import { activateEditorWindow } from "./EditorWindow";
const boot = vi.hoisted(() => ({
emit: vi.fn(async () => {}),
prepare: vi.fn(async (input: EditorInput) => input),
openInput: vi.fn(async (_input: EditorInput, _options: unknown) => {}),
openFile: vi.fn(async () => {}),
setProject: vi.fn(),
takeLaunch: vi.fn(),
}));
vi.mock("@tauri-apps/api/event", () => ({ emitTo: boot.emit }));
vi.mock("@tauri-apps/api/window", () => ({
getCurrentWindow: () => ({
label: "editor-main-3",
onCloseRequested: async () => () => {},
setTitle: async () => {},
}),
}));
vi.mock("@/platform/ipc", () => ({
commands: {
windowTakeLaunch: boot.takeLaunch,
projectCurrent: async () => ({ name: "Project", root: "/project", settings: {} }),
},
}));
vi.mock("@/platform/context", () => ({ setContext: vi.fn() }));
vi.mock("@/platform/project", () => ({ basename: (path: string) => path, useProject: { setState: boot.setProject } }));
vi.mock("@/platform/remote", () => ({ restoreRemote: async () => {} }));
vi.mock("@/platform/platformInfo", () => ({ usePlatform: vi.fn() }));
vi.mock("@/ui", () => ({ Spinner: () => null, T: () => null, isPopupOpen: () => false }));
vi.mock("@/workbench/contributions", () => ({
editorService: () => ({ openInput: boot.openInput, openFile: boot.openFile }),
notifications: () => ({ notify: vi.fn() }),
useContributions: {
getState: () => ({ editorKinds: new Map([["agent-session", { prepareWindowInput: boot.prepare }]]) }),
},
}));
vi.mock("@/workbench/EditorArea", () => ({ EditorArea: () => null }));
vi.mock("@/workbench/OverlayHost", () => ({ OverlayHost: () => null }));
vi.mock("@/workbench/TitleBar", () => ({ TitleBar: () => null }));
vi.mock("@/workbench/WindowResizeHandles", () => ({ WindowResizeHandles: () => null }));
vi.mock("@/workbench/theme", () => ({ useApplyTheme: () => {} }));
vi.mock("@/workbench/messages", () => ({ ask: vi.fn() }));
vi.mock("./controller", () => ({ editorController: vi.fn(), tabTitle: () => "Conversation" }));
let stop: (() => void) | undefined;
const input: EditorInput = { kind: "agent-session", key: "agent:one", data: { task: "one" } };
beforeEach(() => {
vi.clearAllMocks();
boot.takeLaunch.mockResolvedValue({ editor: { input: JSON.stringify(input) } });
});
afterEach(() => stop?.());
describe("lightweight window handoff", () => {
it("opens and reports ready only after its kind prepared the input", async () => {
let ready!: (input: EditorInput) => void;
boot.prepare.mockImplementationOnce(
() =>
new Promise((resolve) => {
ready = resolve;
}),
);
stop = activateEditorWindow("main");
await vi.waitFor(() => expect(boot.prepare).toHaveBeenCalledWith(input));
expect(boot.openInput).not.toHaveBeenCalled();
expect(boot.emit).not.toHaveBeenCalled();
const recovered = { ...input, data: { task: "one", draft: { text: "Latest draft" } } };
ready(recovered);
await vi.waitFor(() =>
expect(boot.emit).toHaveBeenCalledWith("main", "openidea://editor/ready", {
label: "editor-main-3",
path: input.key,
ok: true,
}),
);
expect(boot.openInput).toHaveBeenCalledWith(recovered, { focus: true });
});
it("reports failure without opening a broken conversation", async () => {
boot.prepare.mockRejectedValueOnce(new Error("Cannot load conversation"));
stop = activateEditorWindow("main");
await vi.waitFor(() =>
expect(boot.emit).toHaveBeenCalledWith("main", "openidea://editor/ready", {
label: "editor-main-3",
path: input.key,
ok: false,
error: "Error: Cannot load conversation",
}),
);
expect(boot.openInput).not.toHaveBeenCalled();
});
});
+12 -20
Переглянути файл
@@ -1,6 +1,6 @@
/**
* Lightweight editor window (`editor-<parent>-<n>`): one project file, or one tab of another
* editor kind, in a window of its own ("Open in New Window" without a second workbench).
* Lightweight editor window (`editor-<parent>-<n>`): one project file in a window of its own
* ("Open in New Window" without a second workbench).
*/
import clsx from "clsx";
import { create } from "zustand";
@@ -15,14 +15,14 @@ import { basename, useProject } from "@/platform/project";
import { restoreRemote } from "@/platform/remote";
import { usePlatform } from "@/platform/platformInfo";
import { Spinner, T, isPopupOpen } from "@/ui";
import { editorService, notifications, useContributions, type EditorInput } from "@/workbench/contributions";
import { editorService, notifications } from "@/workbench/contributions";
import { EditorArea } from "@/workbench/EditorArea";
import { OverlayHost } from "@/workbench/OverlayHost";
import { TitleBar } from "@/workbench/TitleBar";
import { WindowResizeHandles } from "@/workbench/WindowResizeHandles";
import { useApplyTheme } from "@/workbench/theme";
import { ask } from "@/workbench/messages";
import { editorController, tabTitle } from "./controller";
import { editorController } from "./controller";
import type { DocModel } from "./model/document";
import styles from "./EditorWindow.module.css";
@@ -71,7 +71,7 @@ async function settleUnsaved(models: DocModel[], project: string | null): Promis
return answer.button === "save" || answer.button === "discard";
}
/** Loads the launch's file or tab into this window's editor. */
/** Loads the launch's file into this window's editor. */
export function activateEditorWindow(parent: string): () => void {
let projectName: string | null = null;
const native = getCurrentWindow();
@@ -131,20 +131,14 @@ export function activateEditorWindow(parent: string): () => void {
try {
await restoreRemote();
const launch = (await commands.windowTakeLaunch())?.editor as EditorLaunch | null | undefined;
let input = launch?.input ? (JSON.parse(launch.input) as EditorInput) : null;
path = launch?.path ?? input?.key ?? "";
if (!launch || !path) throw new Error(tx("Missing editor request"));
if (!launch?.path) throw new Error(tx("Missing editor request"));
path = launch.path;
const project = await commands.projectCurrent();
if (!project) throw new Error(tx("The editor’s project is no longer open"));
projectName = project.name;
// Other editor kinds read the project; the controller leaves its saved tabs to the main window.
useProject.setState(input ? { project, settings: project.settings } : { settings: project.settings });
// Settings only: restoring the project's editor session here would overwrite the main window's tabs.
useProject.setState({ settings: project.settings });
setContext("projectOpen", true);
if (input) {
const prepare = useContributions.getState().editorKinds.get(input.kind)?.prepareWindowInput;
if (prepare) input = await prepare(input);
}
if (disposed) return;
const selection =
launch.line != null && launch.column != null
? {
@@ -153,11 +147,9 @@ export function activateEditorWindow(parent: string): () => void {
...(launch.endLine != null ? { endLine: launch.endLine, endCol: launch.endColumn ?? 0 } : {}),
}
: undefined;
if (input) await editorService().openInput(input, { focus: true });
else await editorService().openFile(path, { focus: true, selection });
await editorService().openFile(path, { focus: true, selection });
useEditorWindow.setState({ path });
const title = input ? tabTitle(input, useContributions.getState().editorKinds) : basename(path);
showCaption(`${project.name} — ${title}`);
showCaption(`${project.name} — ${basename(path)}`);
await reportReady(parent, { path, ok: true });
} catch (error) {
const message = String(error);
@@ -179,7 +171,7 @@ export function EditorWindow() {
const ownTitleBar = usePlatform((s) => s.overlayTitleBar || s.framelessTitleBar);
return (
<main className={clsx(styles.window, os === "linux" && styles.edge)}>
{ownTitleBar && <TitleBar minimal title={title} />}
{ownTitleBar && <TitleBar minimal dialog title={title} />}
{error ? (
<div className={styles.error} role="alert">
{error}
-6
Переглянути файл
@@ -77,10 +77,6 @@ export interface DocBackend {
onDirty(handler: (e: DocDirtyEvent) => void): () => void;
/** Files changed on disk (used to refresh nothing but closed-file state). */
onFsChanged?(handler: (e: { removed: string[] }) => void): () => void;
/** A file changed on disk while its buffer had unsaved changes, which the buffer kept. */
onDiskConflict?(handler: (e: { doc: DocId; path: string }) => void): () => void;
/** Load Changes from Disk: drops the buffer's unsaved changes and reads its file again. */
reloadDiscarding?(doc: DocId): Promise<void>;
/**
* Every OpenIDEA window lost focus to another application. Also seen while focus is in a frame
* (a plugin's web view), which hides the window's own `blur`.
@@ -116,8 +112,6 @@ export const ipcBackend: DocBackend = {
onPatched: (h) => onIdeEvent("docPatched", (e) => h(e)),
onDirty: (h) => onIdeEvent("docDirty", (e) => h(e)),
onFsChanged: (h) => onIdeEvent("fsChanged", (e) => h(e)),
onDiskConflict: (h) => onIdeEvent("docDiskConflict", (e) => h(e)),
reloadDiscarding: async (doc) => void (await call(commands.docReloadFromDisk(doc))),
onApplicationDeactivated: (h) => {
if (!isTauri()) return () => {};
const listener = getCurrentWebviewWindow().listen("ide://application-deactivated", () => h());
-34
Переглянути файл
@@ -171,40 +171,6 @@ describe("find in selection", () => {
});
});
describe("plain-text queries", () => {
it("match regex syntax and line breaks literally, case-insensitively", () => {
const v = make("a.b(c)[d]$ x A.B(C)[D]$ axb\nend\n1 + 1 = 2", { search: "a.b(c)[d]$" });
expect(countMatches(v.state).total).toBe(2);
expect(countMatches(make("one\ntwo\none two", { search: "one\ntwo" }).state).total).toBe(1);
expect(countMatches(make("1+1 11", { search: "1+1" }).state).total).toBe(1);
expect(countMatches(make("a/b a\\b", { search: "a\\b" }).state).total).toBe(1);
});
it("replace with `$` and backslashes as written", () => {
const v = make("cost: x; cost: y", { search: "cost", replace: "$& $1 $$ \\n" });
replaceAll(v);
expect(v.state.doc.toString()).toBe("$& $1 $$ \\n: x; $& $1 $$ \\n: y");
const w = make("cost", { search: "cost", replace: "$" });
replaceNext(w, true);
replaceNext(w, true);
expect(w.state.doc.toString()).toBe("$");
});
it("previous wraps from the start to the last match, skipping the selected one", () => {
const v = make("ab ab ab", { search: "ab" });
v.dispatch({ selection: { anchor: 0, head: 2 } });
findPrevious(v);
expect(sel(v)).toEqual([6, 8]);
findPrevious(v);
expect(sel(v)).toEqual([3, 5]);
const only = make("x ab", { search: "ab" });
only.dispatch({ selection: { anchor: 2, head: 4 } });
expect(findPrevious(only)).toBe(false);
expect(sel(only)).toEqual([2, 4]);
expect(findPrevious(make("x", { search: "ab" }))).toBe(false);
});
});
describe("search context, exclude and preserve case", () => {
const lang = StreamLanguage.define<null>({
token(stream) {
+5 -31
Переглянути файл
@@ -17,12 +17,12 @@ import {
type ChangeDesc,
type EditorState,
type Extension,
type SelectionRange,
} from "@codemirror/state";
import { Decoration, EditorView, ViewPlugin, type DecorationSet, type ViewUpdate } from "@codemirror/view";
import {
SearchQuery,
findNext as cmFindNext,
findPrevious as cmFindPrevious,
getSearchQuery,
replaceAll as cmReplaceAll,
replaceNext as cmReplaceNext,
@@ -240,21 +240,15 @@ export interface FindQueryOptions extends FindOptions {
inChanges?: boolean;
}
/** The characters a regular expression treats as syntax (`-` only inside a class, which never opens here). */
const REGEX_SYNTAX = /[\\^$.*+?()[\]{}|/]/g;
export function makeQuery(o: FindQueryOptions) {
// CodeMirror compares a plain-text query one character at a time; the same text as an escaped
// regular expression runs on the engine's matcher, over 20× faster in a large file, so every
// keystroke in the bar stays responsive. Its replacement escapes `$` to stay literal too.
return new SearchQuery({
search: o.regexp ? o.search : o.search.replace(REGEX_SYNTAX, "\\$&"),
search: o.search,
// Plain-text search and replace are literal (`\n` is not a newline), as in IDEA.
literal: !o.regexp,
caseSensitive: o.caseSensitive,
wholeWord: o.wholeWord,
regexp: true,
replace: o.regexp ? o.replace : o.replace.replaceAll("$", "$$$$"),
regexp: o.regexp,
replace: o.replace,
test: testFor(o.context ?? "any", !!o.inChanges),
});
}
@@ -351,28 +345,8 @@ export function findNext(view: EditorView): boolean {
return view.state.field(findScope, false) ? step(view, true) : cmFindNext(view);
}
/** The last match in `from`–`to` other than `skip`. */
function lastMatch(state: EditorState, from: number, to: number, skip?: SelectionRange): Match | null {
const cursor = getSearchQuery(state).getCursor(state, from, to);
let last: Match | null = null;
for (let r = cursor.next(); !r.done; r = cursor.next())
if (!skip || r.value.from !== skip.from || r.value.to !== skip.to) last = r.value as Match;
return last;
}
/**
* The match before the selection, wrapping to the end. CodeMirror finds it by scanning ever larger
* chunks backwards, quadratic in the distance to the match; one forward pass is linear.
*/
export function findPrevious(view: EditorView): boolean {
const { state } = view;
if (state.field(findScope, false)) return step(view, false);
if (!getSearchQuery(state).valid) return false;
const main = state.selection.main;
const m = lastMatch(state, 0, main.from) ?? lastMatch(state, main.from, state.doc.length, main);
if (!m) return false;
selectMatch(view, m);
return true;
return view.state.field(findScope, false) ? step(view, false) : cmFindPrevious(view);
}
/** The text replacing `m`, keeping its case when `preserve` is set. */
-5
Переглянути файл
@@ -376,11 +376,6 @@ export const openideaTheme = EditorView.theme({
borderRadius: "var(--radius-popup)",
boxShadow: "var(--shadow-popup)",
},
// Near the window edge CodeMirror caps the hover host's height; its sections then shrink and
// scroll inside the popup instead of running past its border. Content tooltips still carry
// their own `max-height` + `overflow` for the space they get when not squeezed.
".cm-tooltip.cm-tooltip-hover": { display: "flex", flexDirection: "column" },
".cm-tooltip-hover > .cm-tooltip-section": { minHeight: 0, flexShrink: 1 },
".cm-tooltip .cm-tooltip-arrow:before": {
borderTopColor: "var(--border-popup)",
borderBottomColor: "var(--border-popup)",
-29
Переглянути файл
@@ -1,29 +0,0 @@
import { afterEach, expect, it } from "vitest";
import { EditorState } from "@codemirror/state";
import { EditorView } from "@codemirror/view";
import { openideaTheme } from "./theme";
let view: EditorView | null = null;
afterEach(() => {
view?.destroy();
view = null;
});
it("shrinks hover tooltip sections near the window edge instead of spilling past the popup", () => {
view = new EditorView({
state: EditorState.create({ extensions: [openideaTheme] }),
parent: document.body,
});
// The DOM CodeMirror builds: the hover host wraps one section per tooltip.
const host = document.createElement("div");
host.className = "cm-tooltip cm-tooltip-hover";
const section = document.createElement("div");
section.className = "cm-tooltip-section";
host.appendChild(section);
view.dom.appendChild(host);
const hostStyle = getComputedStyle(host);
expect(hostStyle.display).toBe("flex");
expect(hostStyle.flexDirection).toBe("column");
// `min-height: 0` releases the section from the flex minimum so it can shrink and scroll.
expect(getComputedStyle(section).minHeight).toBe("0px");
});
+2 -48
Переглянути файл
@@ -54,7 +54,6 @@ import { hoverActionsAt } from "@/platform/hoverActions";
import { save as saveFileDialog, type DialogFilter as SaveDialogFilter } from "@/platform/dialog";
import { isUntitledUri, untitledTitle } from "@/platform/virtualDocs";
import { isRemoteWindow } from "@/platform/remote";
import { auxiliaryWindow } from "@/platform/auxWindow";
import { fileIconName, showContextMenu, type MenuItem } from "@/ui";
import { canOpenWithSystemApp, canRevealInFileManager, fileManagerName } from "@/platform/fileManager";
import {
@@ -467,8 +466,6 @@ export class EditorController implements SlotHost {
if (prevRoot) this.projectTransition = this.restoreSession(prevRoot);
if (this.manager.backend.onFsChanged)
this.disposers.push(this.manager.backend.onFsChanged((e) => this.onFilesRemoved(e.removed)));
if (this.manager.backend.onDiskConflict)
this.disposers.push(this.manager.backend.onDiskConflict((e) => this.onDiskConflict(e.path)));
const onWindowBlur = () => {
if (this.autoSave() && !this.closeSession) {
void this.manager.saveAll("auto");
@@ -664,8 +661,6 @@ export class EditorController implements SlotHost {
/** Reopens the tabs, splits and carets saved for `root` (after the project opened). */
async restoreSession(root: string) {
// The project window owns the saved layout; a lightweight window shows what it was opened for.
if (auxiliaryWindow()) return;
this.sessionRoot = root;
// A window close dropped this session: the next open starts from the tabs opened now.
if (this.forgottenSessions.delete(root)) return;
@@ -1770,39 +1765,6 @@ export class EditorController implements SlotHost {
});
}
/** Reload from Disk: re-reads the open, unmodified documents of `paths`. */
/**
* A file changed on disk while its buffer had unsaved changes: the buffer keeps them (autosave
* leaves the file alone) until the user loads the disk version or saves over it.
*/
private onDiskConflict(path: string) {
const key = `disk-conflict:${path}`;
notifications().notify({
level: "warning",
key,
sticky: true,
title: tx`${basename(path)} changed on disk`,
body: tx(
"The file was changed outside the IDE while it has unsaved changes in the editor. Saving keeps the editor's version and overwrites the file.",
),
actions: [
{
label: tx("Load Changes from Disk"),
run: () => {
const doc = this.manager.get(path)?.getMeta().doc;
if (doc === undefined || !this.manager.backend.reloadDiscarding) return;
this.manager.backend.reloadDiscarding(doc).catch((e: unknown) =>
notifications().notify({
level: "error",
title: tx("Cannot reload from disk"),
body: e instanceof Error ? e.message : String(e),
}),
);
},
},
{ label: tx("Keep Editor Changes"), run: () => {} },
],
});
}
async reloadFromDisk(paths: string[]) {
for (const path of paths) {
const model = this.manager.get(path);
@@ -1916,8 +1878,6 @@ export class EditorController implements SlotHost {
/** Open a lightweight aux editor (or a full window outside the project), then remove the original tab. */
async detachTab(paneId: string, tabId: string): Promise<boolean> {
const tab = useTabs.getState().panes[paneId]?.tabs.find((t) => t.id === tabId);
const moves = tab && useContributions.getState().editorKinds.get(tab.input.kind)?.openInWindow;
if (moves) return moves(tab.input);
const path = tab?.input.path;
if (
!tab ||
@@ -1986,11 +1946,6 @@ export class EditorController implements SlotHost {
},
});
}
/** Shows `input` in a lightweight window of this project; resolves to the window's label once it is shown. */
openInWindow(input: EditorInput): Promise<string> {
if (!isTauri() || isRemoteWindow()) return Promise.reject(new Error(t("app.window.desktopOnly")));
return openLightweightEditor({ input: JSON.stringify(input) }, windowBackgroundHex(), input.key);
}
/** IDEA "Open in Opposite Group": the tab stays and a copy opens next door (or in a new split). */
openInOpposite(paneId: string, tabId: string) {
const s = useTabs.getState();
@@ -2304,9 +2259,8 @@ export class EditorController implements SlotHost {
{ label: "Unsplit All", run: () => void this.unsplitAll(paneId) },
] as MenuItem[])
: []),
...(useContributions.getState().editorKinds.get(tab.input.kind)?.openInWindow ||
(tab.input.path &&
(tab.input.kind === "file" || documentLifecycle(tab.input, useContributions.getState().editorKinds)))
...(tab.input.path &&
(tab.input.kind === "file" || documentLifecycle(tab.input, useContributions.getState().editorKinds))
? ([{ label: "Open in New Window", run: () => void this.detachTab(paneId, tab.id) }] as MenuItem[])
: []),
{ kind: "separator" },
+1 -19
Переглянути файл
@@ -39,7 +39,7 @@ beforeEach(() => {
status: "ok",
data: { kind: "opened", label: "second" },
});
vi.spyOn(light, "openLightweightEditor").mockResolvedValue("editor-main-1");
vi.spyOn(light, "openLightweightEditor").mockResolvedValue();
});
afterEach(() => {
ctrl?.stop();
@@ -51,24 +51,6 @@ afterEach(() => {
});
describe("detachTab", () => {
it("leaves the move to an editor kind that moves its own tabs", async () => {
const openInWindow = vi.fn(async () => true);
unregister = registerEditorKind({ kind: "chat", component: () => null, title: () => "Chat", openInWindow });
ctrl = new EditorController(createMemoryBackend({}));
ctrl.start();
await ctrl.openInput({ kind: "chat", key: "chat:1", data: { id: 1 } }, { focus: false });
const [pane, id] = current();
expect(await ctrl.detachTab(pane, id)).toBe(true);
expect(openInWindow).toHaveBeenCalledWith(expect.objectContaining({ key: "chat:1", data: { id: 1 } }));
expect(light.openLightweightEditor).not.toHaveBeenCalled();
await ctrl.openInWindow({ kind: "chat", key: "chat:1", data: { id: 1 } });
expect(light.openLightweightEditor).toHaveBeenCalledWith(
{ input: JSON.stringify({ kind: "chat", key: "chat:1", data: { id: 1 } }) },
null,
"chat:1",
);
});
it("moves a project file to a lightweight editor without saving first", async () => {
useProject.setState({
project: { root: "/p", workspace: { projects: ["/p"] } } as never,
-1
Переглянути файл
@@ -45,7 +45,6 @@ export function activate(): void | (() => void) {
provideEditorService({
openFile: (path, options) => ctrl.openFile(path, options),
openInput: (input, options) => ctrl.openInput(input, options),
openInWindow: (input) => ctrl.openInWindow(input),
openUntitled: (options) => ctrl.openUntitled(options),
activePath: () => ctrl.activePath(),
activeCursor: () => ctrl.activeCursor(),
+5 -10
Переглянути файл
@@ -5,23 +5,18 @@ import { call, commands, type EditorLaunch } from "@/platform/ipc";
const READY_MS = 30_000;
/** Opens a lightweight editor window; resolves to its label once it shows the file or tab. */
export async function openLightweightEditor(
launch: EditorLaunch,
background: string | null,
/** What the window reports as shown: the file, or the key of the launch's tab. */
target = launch.path,
): Promise<string> {
/** Opens a project-file aux editor and resolves once it has taken over the document. */
export async function openLightweightEditor(launch: EditorLaunch, background: string | null): Promise<void> {
const parent = getCurrentWindow();
let off: (() => void) | undefined;
let timer: ReturnType<typeof setTimeout> | undefined;
try {
return await new Promise<string>((resolve, reject) => {
await new Promise<void>((resolve, reject) => {
timer = setTimeout(() => reject(new Error(tx("Timed out opening the editor window"))), READY_MS);
void parent
.listen<EditorReadyResult>(EDITOR_READY, ({ payload }) => {
if (payload.path && payload.path !== target) return;
if (payload.ok) resolve(payload.label);
if (payload.path && payload.path !== launch.path) return;
if (payload.ok) resolve();
else reject(new Error(payload.error || tx("Could not open the editor window")));
})
.then((unlisten) => {
+4 -37
Переглянути файл
@@ -275,19 +275,12 @@
/* Go to line */
.gotoBody {
display: grid;
grid-template-columns: fit-content(50%) minmax(0, 1fr);
align-items: center;
gap: var(--space-1) var(--space-2);
padding: var(--space-1) var(--space-4) 0;
}
.gotoLabel {
overflow-wrap: anywhere;
color: var(--fg);
font-size: var(--fs-ui);
display: flex;
flex-direction: column;
gap: var(--space-2);
padding: 8px 16px 0;
}
.gotoHint {
grid-column: 2;
color: var(--fg-subtle);
font-size: var(--fs-small);
}
@@ -356,32 +349,6 @@
align-items: center;
}
.encodingPopup {
width: 264px;
padding-block: var(--space-1);
}
.encodingHeading {
padding: var(--space-1) var(--space-3) 0;
color: var(--fg-strong);
font-size: var(--fs-ui);
font-weight: 600;
}
.encodingCommands {
display: flex;
flex-direction: column;
margin-top: var(--space-1);
padding: var(--space-1) var(--space-1-5) 0;
border-top: 1px solid var(--border-popup);
}
.encodingCommands button {
justify-content: flex-start;
height: auto;
min-height: var(--h-list-row);
padding-block: var(--space-1);
text-align: left;
white-space: normal;
}
/* tab drag & drop target on the editor */
.dropZone {
position: absolute;
+8 -13
Переглянути файл
@@ -1,8 +1,9 @@
/** ⌘L: "Go to Line:Column" (1-based `line[:col]`). */
import { useId, useState, type FormEvent } from "react";
import { Dialog, Input, T } from "@/ui";
import { useState, type FormEvent } from "react";
import { Dialog, Input } from "@/ui";
import { editorController, useEditorStatus, useGotoLine } from "../controller";
import styles from "./EditorArea.module.css";
import { tx } from "@/platform/i18n";
export function parseLineCol(text: string): { line: number; col: number } | null {
const m = /^\s*(\d+)\s*(?:[:,]\s*(\d+))?\s*$/.exec(text);
@@ -21,7 +22,6 @@ export function GotoLineDialog() {
function GotoLineInner() {
const status = useEditorStatus((s) => s.status);
const coordinatesId = useId();
const [value, setValue] = useState(() => (status ? `${status.line + 1}:${status.col + 1}` : ""));
const parsed = parseLineCol(value);
const close = () => useGotoLine.setState({ open: false });
@@ -43,24 +43,19 @@ function GotoLineInner() {
]}
>
<form onSubmit={submit} className={styles.gotoBody}>
<label className={styles.gotoLabel} htmlFor={coordinatesId}>
<T>Line and column</T>
</label>
<Input
id={coordinatesId}
data-autofocus=""
mono
value={value}
invalid={!!value && !parsed}
onChange={(e) => setValue(e.target.value)}
onFocus={(e) => e.currentTarget.select()}
aria-describedby={status ? undefined : `${coordinatesId}-hint`}
aria-label="Line and column"
placeholder="line[:column]"
/>
{!status && (
<span className={styles.gotoHint} id={`${coordinatesId}-hint`}>
<T>No active editor</T>
</span>
)}
<span className={styles.gotoHint}>
{status ? tx`Current position ${status.line + 1}:${status.col + 1}` : tx("No active editor")}
</span>
</form>
</Dialog>
);
+30 -40
Переглянути файл
@@ -1,22 +1,18 @@
.barPopup,
.childPopup {
width: max-content;
overflow: hidden;
font-size: var(--fs-chrome);
.popup {
max-width: min(90vw, 900px);
padding: 0;
}
.root {
outline: none;
display: flex;
flex-direction: column;
max-width: 900px;
}
.bar {
display: flex;
align-items: center;
min-width: 0;
padding: var(--space-1);
gap: 0;
padding: 3px 4px;
overflow-x: auto;
scrollbar-width: thin;
white-space: nowrap;
}
.segmentWrap {
@@ -26,20 +22,20 @@
}
.sep {
color: var(--fg-faint);
margin: 0 var(--space-0-5);
margin: 0 1px;
}
.segment {
display: inline-flex;
align-items: center;
gap: var(--space-1);
max-width: min(288px, 55vw);
gap: 5px;
height: var(--h-control-small);
padding: 0 var(--space-1-5);
padding: 0 5px;
border: none;
border-radius: var(--radius-small);
background: transparent;
color: var(--fg);
font: inherit;
font-size: var(--fs-ui);
cursor: default;
}
.segment:hover {
@@ -50,28 +46,22 @@
background: var(--bg-list-selected);
color: var(--fg-strong);
}
.childPopup {
display: flex;
flex-direction: column;
min-width: min(200px, calc(100vw - 12px));
}
.list {
min-height: 0;
min-width: 0;
max-width: min(480px, calc(100vw - 14px));
max-height: min(360px, 62vh);
padding: var(--space-1);
overflow: auto;
overflow-x: hidden;
outline: none;
align-self: flex-start;
min-width: 200px;
max-height: 360px;
overflow-y: auto;
margin: 0 4px 4px;
padding: 4px;
border-top: 1px solid var(--border-popup);
}
.row {
display: flex;
align-items: center;
gap: var(--space-1);
gap: var(--space-1-5);
height: var(--h-list-row);
padding: 0 var(--space-2);
border-radius: var(--radius-selection);
padding: 0 6px;
border-radius: var(--radius-row);
color: var(--fg);
white-space: nowrap;
}
@@ -80,31 +70,31 @@
color: var(--fg-strong);
}
.rowLabel {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.rowIcon {
flex: none;
}
.empty {
padding: 4px 6px;
color: var(--fg-muted);
}
.childList {
min-width: 200px;
max-height: 360px;
overflow-y: auto;
padding: 4px;
outline: none;
}
.childHeader {
display: flex;
flex: none;
align-items: center;
gap: var(--space-1);
max-width: min(480px, calc(100vw - 14px));
height: calc(var(--h-list-row) + var(--space-2));
padding: 0 var(--space-3);
gap: var(--space-1-5);
height: var(--h-list-row);
padding: 0 6px;
margin-bottom: 2px;
border-bottom: 1px solid var(--border-popup);
color: var(--fg-muted);
}
.rowChevron {
flex: none;
margin-left: auto;
color: var(--fg-faint);
}
+93 -155
Переглянути файл
@@ -4,13 +4,13 @@
* (folder contents, file / symbol members); Enter on a child opens it (a
* folder becomes the next segment), Escape closes the list, then the bar.
*/
import { useEffect, useId, useLayoutEffect, useMemo, useRef, useState, type KeyboardEvent } from "react";
import { useEffect, useLayoutEffect, useMemo, useRef, useState, type KeyboardEvent } from "react";
import clsx from "clsx";
import { create } from "zustand";
import { call, commands, isTauri, type OutlineItem } from "@/platform/ipc";
import { projectFolder, useProject } from "@/platform/project";
import { useProjectViewLead } from "@/workbench/contributions";
import { Icon, listNavigate, Popup, revealHorizontally, revealVertically, T } from "@/ui";
import { Icon, Popup, T } from "@/ui";
import { editorController, useEditorStatus } from "../controller";
import { useOutline } from "../model/document";
import { symbolChain } from "./outline";
@@ -64,74 +64,6 @@ function anchorPoint(): { x: number; y: number } {
return r ? { x: r.left + 8, y: r.top + 4 } : { x: 80, y: 80 };
}
function NavChildList({
label,
id,
items,
active,
onSelect,
onChoose,
onKeyDown,
}: {
label: string;
id: string;
items: readonly NavChild[] | null;
active: number;
onSelect: (index: number) => void;
onChoose: (child: NavChild) => void;
onKeyDown?: (e: KeyboardEvent) => void;
}) {
const ref = useRef<HTMLDivElement>(null);
useLayoutEffect(() => {
const scroller = ref.current;
const row = scroller?.querySelector<HTMLElement>('[aria-selected="true"]');
if (!scroller || !row) return;
const reveal = () => revealVertically(scroller, row);
reveal();
if (typeof ResizeObserver === "undefined") return;
const resize = new ResizeObserver(reveal);
resize.observe(scroller);
return () => resize.disconnect();
}, [active, items]);
return (
<div
ref={ref}
id={id}
className={styles.list}
role="listbox"
aria-label={label}
aria-activedescendant={items?.[active] ? `${id}-${active}` : undefined}
tabIndex={0}
data-autofocus
onKeyDown={onKeyDown}
>
{items?.length === 0 && (
<div className={styles.empty}>
<T>Nothing here</T>
</div>
)}
{items?.map((child, i) => (
<div
key={`${child.path}:${child.label}:${i}`}
id={`${id}-${i}`}
role="option"
aria-selected={i === active}
className={clsx(styles.row, i === active && styles.rowActive)}
onMouseEnter={() => onSelect(i)}
onClick={() => onChoose(child)}
>
<Icon name={iconOf(child)} size={16} className={styles.rowIcon} />
<span className={styles.rowLabel} title={child.label}>
{child.label}
</span>
{child.kind === "dir" && <Icon name="chevron-right" size={12} className={styles.rowChevron} />}
</div>
))}
</div>
);
}
function NavBar({ path, line, col, directory }: { path: string; line: number; col: number; directory: boolean }) {
const project = useProject((s) => s.project);
const outline = useOutline((s) => s[path]);
@@ -145,19 +77,11 @@ function NavBar({ path, line, col, directory }: { path: string; line: number; co
const [active, setActive] = useState(() =>
Math.max(0, directory ? initial.length - 1 : initial.findIndex((s) => s.kind === "file")),
);
const [list, setList] = useState<{ seg: number; items: NavChild[]; active: number } | null>(null);
const [childAnchor, setChildAnchor] = useState<HTMLButtonElement | null>(null);
const listId = useId();
const [list, setList] = useState<{ seg: number; items: NavChild[]; active: number; left: number } | null>(null);
const [anchor] = useState(anchorPoint);
const strip = useRef<HTMLDivElement>(null);
const buttons = useRef<Array<HTMLButtonElement | null>>([]);
const listRef = useRef<HTMLDivElement>(null);
const request = useRef(0);
const listSegment = list?.seg;
const closeList = () => {
request.current++;
setList(null);
};
const openList = async (index: number, segs = segments) => {
const seg = segs[index];
@@ -168,7 +92,7 @@ function NavBar({ path, line, col, directory }: { path: string; line: number; co
// Start on the child that leads to the next segment, like IDEA.
const next = segs[index + 1];
const at = next ? items.findIndex((c) => c.path === next.path && c.label === next.label) : -1;
setList({ seg: index, items, active: Math.max(0, at) });
setList({ seg: index, items, active: Math.max(0, at), left: buttons.current[index]?.offsetLeft ?? 0 });
};
const choose = (child: NavChild) => {
@@ -201,14 +125,15 @@ function NavBar({ path, line, col, directory }: { path: string; line: number; co
let handled = true;
if (e.key === "ArrowLeft") move(-1);
else if (e.key === "ArrowRight") move(1);
else if (list) {
const next = listNavigate(e.key, list);
if (next !== null) setList({ ...list, active: next });
else if (e.key === "Enter") {
const child = list.items[list.active];
if (child) choose(child);
} else handled = false;
} else if (e.key === "ArrowDown" || e.key === "Enter") void openList(active);
else if (e.key === "ArrowDown" && !list) void openList(active);
else if (e.key === "ArrowDown" && list)
setList({ ...list, active: Math.min(list.items.length - 1, list.active + 1) });
else if (e.key === "ArrowUp" && list) setList({ ...list, active: Math.max(0, list.active - 1) });
else if (e.key === "Enter" && list) {
const child = list.items[list.active];
if (child) choose(child);
} else if (e.key === "Enter") void openList(active);
else if (e.key === "Escape" && list) setList(null);
else handled = false;
if (handled) {
e.preventDefault();
@@ -217,19 +142,11 @@ function NavBar({ path, line, col, directory }: { path: string; line: number; co
};
useLayoutEffect(() => {
const row = strip.current;
const current = buttons.current[active];
if (!row || !current) return;
const reveal = () => revealHorizontally(row, current);
reveal();
if (typeof ResizeObserver === "undefined") return;
const resize = new ResizeObserver(reveal);
resize.observe(row);
return () => resize.disconnect();
}, [active, segments]);
useLayoutEffect(() => {
setChildAnchor(listSegment === undefined ? null : (buttons.current[listSegment] ?? null));
}, [listSegment, segments]);
buttons.current[active]?.scrollIntoView?.({ block: "nearest", inline: "nearest" });
}, [active]);
useEffect(() => {
listRef.current?.querySelector<HTMLElement>('[aria-selected="true"]')?.scrollIntoView?.({ block: "nearest" });
}, [list]);
return (
<Popup
@@ -239,7 +156,7 @@ function NavBar({ path, line, col, directory }: { path: string; line: number; co
offset={0}
onClose={close}
aria-label="Navigation bar"
className={styles.barPopup}
className={styles.popup}
>
<div
className={styles.root}
@@ -249,7 +166,7 @@ function NavBar({ path, line, col, directory }: { path: string; line: number; co
role="toolbar"
aria-label={tx("Navigation bar")}
>
<div className={styles.bar} ref={strip}>
<div className={styles.bar}>
{segments.map((s, i) => (
<span key={`${i}:${s.path}:${s.label}`} className={styles.segmentWrap}>
{i > 0 && <Icon name="chevron-right" size={12} className={styles.sep} />}
@@ -259,39 +176,44 @@ function NavBar({ path, line, col, directory }: { path: string; line: number; co
tabIndex={-1}
className={clsx(styles.segment, i === active && styles.active)}
aria-current={i === active ? "location" : undefined}
aria-haspopup="listbox"
aria-expanded={i === listSegment}
aria-controls={i === listSegment ? listId : undefined}
title={s.label}
onClick={() => {
setActive(i);
void openList(i);
}}
>
<Icon name={iconOf(s)} size={14} className={styles.rowIcon} />
<span className={styles.rowLabel}>{s.label}</span>
<Icon name={iconOf(s)} size={14} />
<span>{s.label}</span>
</button>
</span>
))}
</div>
{list && childAnchor && (
<Popup
open
anchor={childAnchor}
placement="bottom-start"
onClose={closeList}
{list && (
<div
ref={listRef}
className={styles.list}
style={{ marginLeft: list.left }}
role="listbox"
aria-label={tx("Children")}
className={styles.childPopup}
>
<NavChildList
id={listId}
label={tx("Children")}
items={list.items}
active={list.active}
onSelect={(i) => setList({ ...list, active: i })}
onChoose={choose}
/>
</Popup>
{list.items.length === 0 && (
<div className={styles.empty}>
<T>Nothing here</T>
</div>
)}
{list.items.map((c, i) => (
<div
key={`${c.path}:${c.label}:${i}`}
role="option"
aria-selected={i === list.active}
className={clsx(styles.row, i === list.active && styles.rowActive)}
onMouseEnter={() => setList({ ...list, active: i })}
onClick={() => choose(c)}
>
<Icon name={iconOf(c)} size={14} />
<span className={styles.rowLabel}>{c.label}</span>
</div>
))}
</div>
)}
</div>
</Popup>
@@ -306,12 +228,10 @@ function NavBar({ path, line, col, directory }: { path: string; line: number; co
export function NavChildrenPopup({
segment,
anchor,
openAbove = true,
onClose,
}: {
segment: NavSegment;
anchor: HTMLElement;
openAbove?: boolean;
onClose: () => void;
}) {
const [stack, setStack] = useState<NavSegment[]>([segment]);
@@ -319,7 +239,7 @@ export function NavChildrenPopup({
const outline = useOutline((s) => s[top.path]);
const [loaded, setLoaded] = useState<{ top: NavSegment; items: NavChild[] } | null>(null);
const [active, setActive] = useState(0);
const listId = useId();
const listRef = useRef<HTMLDivElement>(null);
const items = loaded?.top === top ? loaded.items : null;
useEffect(() => {
@@ -335,6 +255,10 @@ export function NavChildrenPopup({
alive = false;
};
}, [top, outline]);
useEffect(() => {
listRef.current?.querySelector<HTMLElement>('[aria-selected="true"]')?.scrollIntoView?.({ block: "nearest" });
}, [active, items]);
const choose = (child: NavChild) => {
if (child.kind === "dir") return setStack((s) => [...s, { kind: "dir", path: child.path, label: child.label }]);
onClose();
@@ -346,9 +270,10 @@ export function NavChildrenPopup({
};
const onKeyDown = (e: KeyboardEvent) => {
const next = items ? listNavigate(e.key, { items, active, wrap: true }) : null;
const n = items?.length ?? 0;
let handled = true;
if (next !== null) setActive(next);
if (e.key === "ArrowDown" && n) setActive((a) => (a + 1) % n);
else if (e.key === "ArrowUp" && n) setActive((a) => (a - 1 + n) % n);
else if (e.key === "Enter" || (e.key === "ArrowRight" && items?.[active]?.kind === "dir")) {
const child = items?.[active];
if (child) choose(child);
@@ -361,31 +286,44 @@ export function NavChildrenPopup({
};
return (
<Popup
open
anchor={anchor}
placement={openAbove ? "top-start" : "bottom-start"}
onClose={onClose}
aria-label={top.label}
className={styles.childPopup}
>
{stack.length > 1 && (
<div className={styles.childHeader}>
<Icon name={iconOf(top)} size={16} className={styles.rowIcon} />
<span className={styles.rowLabel} title={top.label}>
{top.label}
</span>
</div>
)}
<NavChildList
id={listId}
label={top.label}
items={items}
active={active}
onSelect={setActive}
onChoose={choose}
<Popup open anchor={anchor} placement="top-start" onClose={onClose} aria-label={top.label} className={styles.popup}>
<div
ref={listRef}
className={styles.childList}
role="listbox"
aria-label={top.label}
tabIndex={0}
data-autofocus
aria-activedescendant={items?.length ? `navbar-child-${active}` : undefined}
onKeyDown={onKeyDown}
/>
>
{stack.length > 1 && (
<div className={styles.childHeader}>
<Icon name={iconOf(top)} size={14} />
<span className={styles.rowLabel}>{top.label}</span>
</div>
)}
{items?.length === 0 && (
<div className={styles.empty}>
<T>Nothing here</T>
</div>
)}
{items?.map((c, i) => (
<div
key={`${c.path}:${c.label}:${i}`}
id={`navbar-child-${i}`}
role="option"
aria-selected={i === active}
className={clsx(styles.row, i === active && styles.rowActive)}
onMouseEnter={() => setActive(i)}
onClick={() => choose(c)}
>
<Icon name={iconOf(c)} size={14} />
<span className={styles.rowLabel}>{c.label}</span>
{c.kind === "dir" && <Icon name="chevron-right" size={12} className={styles.rowChevron} />}
</div>
))}
</div>
</Popup>
);
}
+47 -124
Переглянути файл
@@ -6,18 +6,7 @@ import { executeAction } from "@/platform/actions";
import { shortcutLabel } from "@/platform/keymap";
import { basename, dirname, projectFolder, relativePath, useProject } from "@/platform/project";
import type { LineEnding, OutlineItem } from "@/platform/ipc";
import {
BarButton,
Button,
Dialog,
Icon,
Menu,
Popup,
SelectListbox,
badgeKind,
fileIconName,
revealHorizontally,
} from "@/ui";
import { BarButton, Icon, Menu, badgeKind, fileIconName, revealHorizontally } from "@/ui";
import { notifications, useProjectViewLead } from "@/workbench/contributions";
import { useDistractionFree } from "@/workbench/distractionFree";
import { ENCODING_CHOICES, useEditorPrefs } from "@/platform/editorSettings";
@@ -30,12 +19,12 @@ import {
untitledTitle,
} from "@/platform/virtualDocs";
import { editorController, isTextInput, useEditorStatus, useGotoLine, useTabs } from "../controller";
import { useDocMeta, useOutline, type DocMeta } from "../model/document";
import { useDocMeta, useOutline } from "../model/document";
import { symbolChain } from "./outline";
import { NavChildrenPopup } from "./NavBarPopup";
import type { NavSegment } from "./navBar";
import styles from "./EditorArea.module.css";
import { tx, useTx } from "@/platform/i18n";
import { tx } from "@/platform/i18n";
function useActiveMeta() {
const path = useEditorStatus((s) => s.status?.path ?? null);
@@ -226,15 +215,7 @@ function BreadcrumbStrip({
}
/** A row of crumbs; a segment with `nav` opens a popup of its children. */
function CrumbNav({
segments,
className,
inStatusBar,
}: {
segments: Crumb[];
className?: string;
inStatusBar: boolean;
}) {
function CrumbNav({ segments, className }: { segments: Crumb[]; className?: string }) {
const [popup, setPopup] = useState<{ nav: NavSegment; anchor: HTMLElement } | null>(null);
return (
<BreadcrumbStrip
@@ -269,15 +250,7 @@ function CrumbNav({
</Fragment>
);
})}
{popup && (
<NavChildrenPopup
key={`${popup.nav.kind}:${popup.nav.path}:${popup.nav.label}`}
segment={popup.nav}
anchor={popup.anchor}
openAbove={inStatusBar}
onClose={() => setPopup(null)}
/>
)}
{popup && <NavChildrenPopup segment={popup.nav} anchor={popup.anchor} onClose={() => setPopup(null)} />}
</BreadcrumbStrip>
);
}
@@ -327,7 +300,7 @@ export function Breadcrumbs({ className, inStatusBar = false }: { className?: st
segments.push(projectCrumb(project ?? currentProject));
}
if (!segments.length) return null;
return <CrumbNav segments={segments} className={className ?? styles.status} inStatusBar={inStatusBar} />;
return <CrumbNav segments={segments} className={className ?? styles.status} />;
}
/** The status bar instance of the navigation bar; renders only for `statusBar`. */
@@ -465,25 +438,18 @@ export function LineEndingStatus() {
);
}
const ENCODINGS = ENCODING_CHOICES.map(([value, label]) => ({ value, label, verbatim: true }));
const ENCODINGS = ENCODING_CHOICES;
/** File encoding widget (IDEA: click → choose an encoding, then Reload or Convert). */
export function EncodingStatus() {
const meta = useActiveMeta();
return meta ? <EncodingPicker key={meta.doc} meta={meta} /> : null;
}
function EncodingPicker({ meta }: { meta: DocMeta }) {
const prefs = useEditorPrefs();
const tx = useTx();
const [open, setOpen] = useState(false);
const [target, setTarget] = useState<(typeof ENCODINGS)[number] | null>(null);
const ref = useRef<HTMLButtonElement>(null);
const canReload = meta.canReloadEncoding && !meta.dirty;
const canConvert = !meta.readOnly;
if (!meta) return null;
const apply = (encoding: string, reload: boolean) => {
setTarget(null);
const model = editorController().manager.get(meta.path);
if (!model || !(reload ? canReload : canConvert)) return;
if (!model) return;
void editorController()
.manager.backend.setEncoding(meta.doc, encoding, reload)
.then((enc) => {
@@ -502,7 +468,7 @@ function EncodingPicker({ meta }: { meta: DocMeta }) {
const current = meta.encoding.toLowerCase();
const nativeToAsciiProperties = prefs.encodings.nativeToAscii && meta.path.endsWith(".properties");
const canToggleBom = current === "utf-8" && !nativeToAsciiProperties;
const label = ENCODINGS.find(({ value }) => value === current)?.label ?? meta.encoding;
const label = ENCODINGS.find(([id]) => id === current)?.[1] ?? meta.encoding;
const applyBom = (hasBom: boolean) => {
const controller = editorController();
const model = controller.manager.get(meta.path);
@@ -521,99 +487,56 @@ function EncodingPicker({ meta }: { meta: DocMeta }) {
}),
);
};
const chooseEncoding = (value: string) => {
setOpen(false);
if (value === current) return;
ref.current?.focus({ preventScroll: true });
setTarget(ENCODINGS.find((option) => option.value === value) ?? null);
};
const encodings =
canReload || canConvert
? ENCODINGS
: ENCODINGS.map((option) => ({ ...option, disabled: option.value !== current }));
const group = (reload: boolean) =>
ENCODINGS.filter(([id]) => id !== current).map(([id, label]) => ({
id: `${reload ? "reload" : "convert"}.${id}`,
label,
run: () => apply(id, reload),
}));
return (
<>
<BarButton
ref={ref}
tooltip="File Encoding"
aria-haspopup="dialog"
aria-haspopup="menu"
aria-expanded={open}
onClick={() => setOpen((v) => !v)}
>
{meta.hasBom ? `${label} BOM` : label}
</BarButton>
<Popup
<Menu
open={open}
onClose={() => setOpen(false)}
anchor={ref}
placement="top-end"
aria-label={tx("File encoding")}
className={styles.encodingPopup}
trapFocus
>
<div className={styles.encodingHeading}>{tx("Change File Encoding")}</div>
<SelectListbox
searchable
value={current}
options={encodings}
onChoose={chooseEncoding}
aria-label="File encoding"
/>
<div className={styles.encodingCommands}>
{canToggleBom && (
<Button
variant="ghost"
icon="file"
disabled={meta.readOnly}
onClick={() => {
setOpen(false);
applyBom(!meta.hasBom);
}}
>
{meta.hasBom ? "Remove UTF-8 BOM" : "Add UTF-8 BOM"}
</Button>
)}
<Button
variant="ghost"
icon="settings"
onClick={() => {
setOpen(false);
void executeAction("file.settings", "editor.fileEncodings");
}}
>
File Encodings Settings…
</Button>
</div>
</Popup>
{target && (
<Dialog
open
title="Change File Encoding"
icon="question"
width={384}
blockWorkbenchShortcuts
onClose={() => setTarget(null)}
buttons={[
{
label: "Reload",
title: "Reload with Encoding",
disabled: !canReload,
onClick: () => apply(target.value, true),
},
{
label: "Convert",
title: "Convert to Encoding",
disabled: !canConvert,
onClick: () => apply(target.value, false),
},
{ label: "Cancel", role: "cancel", autoFocus: true },
]}
>
{tx`Use ${target.label} for this file?`}
{"\n"}
{tx("Reload reads the file again. Convert keeps the current text and changes its encoding on save.")}
</Dialog>
)}
aria-label="File encoding"
items={[
{
id: "reload",
label: "Reload with Encoding",
disabled: meta.dirty || !meta.canReloadEncoding,
submenu: group(true),
},
{ id: "convert", label: "Convert to Encoding", disabled: meta.readOnly, submenu: group(false) },
...(canToggleBom
? [
{ kind: "separator" as const },
{
id: "toggle-bom",
label: meta.hasBom ? "Remove UTF-8 BOM" : "Add UTF-8 BOM",
disabled: meta.readOnly,
run: () => applyBom(!meta.hasBom),
},
]
: []),
{ kind: "separator" },
{
id: "configure",
label: "File Encodings Settings…",
run: () => void executeAction("file.settings", "editor.fileEncodings"),
},
]}
/>
</>
);
}
+14 -49
Переглянути файл
@@ -48,7 +48,7 @@ const meta = (patch: Partial<DocMeta> = {}): DocMeta => ({
...patch,
});
const openPicker = (m: DocMeta) => {
const openMenu = (m: DocMeta) => {
useDocMeta.setState({ [m.path]: m });
useEditorStatus.setState({
status: { path: m.path, doc: m.doc, line: 0, col: 0, offset: 0, selectedChars: 0, selectedLines: 0, carets: 1 },
@@ -58,8 +58,7 @@ const openPicker = (m: DocMeta) => {
return view;
};
const choose = (name: string) => fireEvent.click(screen.getByRole("option", { name }));
const button = (name: string) => screen.getByRole<HTMLButtonElement>("button", { name });
const item = (name: string) => screen.getByRole("menuitem", { name });
beforeEach(() => {
vi.clearAllMocks();
@@ -69,67 +68,33 @@ beforeEach(() => {
describe("encoding status of read-only library documents", () => {
it("offers Reload for re-decodable sources, but never Convert or BOM changes", () => {
const view = openPicker(meta());
expect(button("Add UTF-8 BOM").disabled).toBe(true);
choose("GBK");
expect(button("Reload").disabled).toBe(false);
expect(button("Convert").disabled).toBe(true);
const view = openMenu(meta());
expect(item("Reload with Encoding").getAttribute("aria-disabled")).toBeNull();
expect(item("Convert to Encoding").getAttribute("aria-disabled")).toBe("true");
expect(item("Add UTF-8 BOM").getAttribute("aria-disabled")).toBe("true");
view.unmount();
});
it("disables encoding changes for server-generated read-only content", () => {
const view = openPicker(meta({ canReloadEncoding: false }));
expect(screen.getByRole("option", { name: "GBK" }).querySelector("[aria-disabled=true]")).not.toBeNull();
choose("GBK");
expect(screen.queryByRole("dialog", { name: "Change File Encoding" })).toBeNull();
expect(setEncoding).not.toHaveBeenCalled();
it("disables Reload for server-generated content that cannot be re-decoded", () => {
const view = openMenu(meta({ canReloadEncoding: false }));
expect(item("Reload with Encoding").getAttribute("aria-disabled")).toBe("true");
view.unmount();
});
it("keeps Reload disabled while a file has unsaved changes", () => {
const view = openPicker(meta({ path: "/p/Main.java", readOnly: false, dirty: true }));
choose("GBK");
expect(button("Reload").disabled).toBe(true);
expect(button("Convert").disabled).toBe(false);
const view = openMenu(meta({ path: "/p/Main.java", readOnly: false, dirty: true }));
expect(item("Reload with Encoding").getAttribute("aria-disabled")).toBe("true");
view.unmount();
});
it("reloading a virtual document re-decodes it and refreshes the content cache", async () => {
setEncoding.mockResolvedValue({ encoding: "gbk", hasBom: false });
const view = openPicker(meta());
choose("GBK");
fireEvent.click(button("Reload"));
const view = openMenu(meta());
fireEvent.mouseEnter(item("Reload with Encoding"));
fireEvent.click(await screen.findByRole("menuitem", { name: "GBK" }));
expect(setEncoding).toHaveBeenCalledWith(1, "gbk", true);
await waitFor(() => expect(setMeta).toHaveBeenCalledWith({ encoding: "gbk", hasBom: false }));
expect(invalidateVirtualDocument).toHaveBeenCalledWith(JDT);
view.unmount();
});
});
it("filters encodings by typing and allows cancelling without a document change", () => {
const view = openPicker(meta({ readOnly: false }));
const search = screen.getByPlaceholderText("Search…");
expect(document.activeElement).toBe(search);
expect(screen.getByRole("option", { name: "UTF-8" })).toBeTruthy();
fireEvent.change(search, { target: { value: "1252" } });
expect(screen.queryByRole("option", { name: "GBK" })).toBeNull();
fireEvent.keyDown(search, { key: "Enter" });
const cancel = button("Cancel");
expect(document.activeElement).toBe(cancel);
expect(setEncoding).not.toHaveBeenCalled();
fireEvent.keyDown(cancel, { key: "Escape" });
expect(screen.queryByRole("dialog", { name: "Change File Encoding" })).toBeNull();
expect(setEncoding).not.toHaveBeenCalled();
expect(document.activeElement).toBe(button("UTF-8"));
view.unmount();
});
it("converts the current text when Convert is chosen", async () => {
setEncoding.mockResolvedValue({ encoding: "gbk", hasBom: false });
const view = openPicker(meta({ path: "/p/Main.java", readOnly: false }));
choose("GBK");
fireEvent.click(button("Convert"));
expect(setEncoding).toHaveBeenCalledWith(1, "gbk", false);
await waitFor(() => expect(setMeta).toHaveBeenCalledWith({ encoding: "gbk", hasBom: false, dirty: true }));
view.unmount();
});
+5 -21
Переглянути файл
@@ -21,36 +21,20 @@ const target: Location = {
range: { start: { line: 3, col: 4 }, end: { line: 3, col: 9 } },
};
const views: EditorView[] = [];
function editor(doc = 1, language = "yaml", text = "server:\n port: 8080\n", path = `/p/${doc}.${language}`) {
function editor(doc = 1, language = "yaml", text = "server:\n port: 8080\n") {
const view = new EditorView({
state: EditorState.create({
doc: text,
extensions: [lspDoc.of({ doc, path, language, uiMode: language, readOnly: false }), navigationExtension()],
extensions: [
lspDoc.of({ doc, path: `/p/${doc}.${language}`, language, uiMode: language, readOnly: false }),
navigationExtension(),
],
}),
parent: document.body,
});
views.push(view);
return view;
}
it("uses the whole Maven element value for the navigation underline", () => {
const text = " <artifactId>cdf-parent</artifactId>\n <version>${revision}</version>";
const view = editor(1, "xml", text, "/p/pom.xml");
const parent = text.indexOf("cdf-parent");
for (const offset of [parent, parent + 3, parent + 4, parent + "cdf-parent".length]) {
const range = navigationWord(view, offset)!;
expect(view.state.sliceDoc(range.from, range.to)).toBe("cdf-parent");
}
const revision = text.indexOf("${revision}");
const range = navigationWord(view, revision + 4)!;
expect(view.state.sliceDoc(range.from, range.to)).toBe("${revision}");
const multiline = "<artifactId>\n cdf-parent\n </artifactId>";
const multilineView = editor(2, "xml", multiline, "/p/multiline/pom.xml");
const multilineRange = navigationWord(multilineView, multiline.indexOf("parent"))!;
expect(multilineView.state.sliceDoc(multilineRange.from, multilineRange.to)).toBe("cdf-parent");
});
let off: () => void;
beforeEach(() => {
vi.useFakeTimers();
+2 -54
Переглянути файл
@@ -5,7 +5,6 @@
import type { Text } from "@codemirror/state";
import type { EditorView } from "@codemirror/view";
import { onEditorEvent } from "@/editor/api";
import { isMavenPom } from "@/platform/buildFiles";
import { commands, IpcError, onIdeEvent, type GotoKind, type Location } from "@/platform/ipc";
import { useProject } from "@/platform/project";
import { onServerSettled } from "./availability";
@@ -55,60 +54,9 @@ export function isConfigurationDocument(view: EditorView): boolean {
return language === "yaml" || language === "properties";
}
const XML_VALUE_SCAN_LINES = 256;
/** The text of the XML element, trimmed to the value itself. */
function pomElementValueAt(view: EditorView, offset: number): { from: number; to: number } | null {
const doc = view.state.doc;
const line = doc.lineAt(offset);
let open = -1;
const onLine = line.text.lastIndexOf(">", offset - line.from);
if (onLine >= 0) open = line.from + onLine;
else {
for (let number = line.number - 1; number >= 1 && line.number - number <= XML_VALUE_SCAN_LINES; number--) {
const previous = doc.line(number);
const col = previous.text.lastIndexOf(">");
if (col >= 0) {
open = previous.from + col;
break;
}
}
}
if (open < 0 || offset <= open) return null;
const afterOpen = doc.lineAt(Math.min(open + 1, doc.length));
let close = -1;
for (
let number = afterOpen.number;
number <= doc.lines && number - afterOpen.number <= XML_VALUE_SCAN_LINES;
number++
) {
const current = doc.line(number);
const col = current.text.indexOf("<", number === afterOpen.number ? open + 1 - current.from : 0);
if (col >= 0) {
close = current.from + col;
break;
}
}
if (close < 0 || offset > close) return null;
let from = open + 1;
let to = close;
const raw = doc.sliceString(from, to);
from += raw.length - raw.trimStart().length;
to -= raw.length - raw.trimEnd().length;
return from < to ? { from, to } : null;
}
/** Configuration names include hyphens and dots even when the editor's language word
* rules split them. Maven element values use the whole value (`cdf-parent`, not its
* hyphenated words). Share this range between decoration and lookup. */
/** Configuration names include hyphens and dots even when the editor's
* language word rules split them. Share this range between decoration and lookup. */
export function navigationWord(view: EditorView, offset: number): { from: number; to: number } | null {
const doc = docOf(view);
if (doc && isMavenPom(doc.path)) {
const value = pomElementValueAt(view, offset);
if (value) return value;
}
if (!isConfigurationDocument(view)) return view.state.wordAt(offset);
const line = view.state.doc.lineAt(offset);
const nameChar = /[\p{L}\p{N}_.$-]/u;
+37 -61
Переглянути файл
@@ -4,15 +4,7 @@
* history, `docs.ts`) and code.quickDefinition (⌥Space, definition source popup).
*/
import { EditorSelection } from "@codemirror/state";
import {
closeHoverTooltips,
hasHoverTooltips,
hoverTooltip,
repositionTooltips,
ViewPlugin,
type EditorView,
type TooltipView,
} from "@codemirror/view";
import { closeHoverTooltips, hasHoverTooltips, hoverTooltip, ViewPlugin, type EditorView } from "@codemirror/view";
import type { Extension } from "@codemirror/state";
import {
commands,
@@ -25,7 +17,6 @@ import {
type RequestId,
} from "@/platform/ipc";
import { executeAction } from "@/platform/actions";
import { tx } from "@/platform/i18n";
import { shortcutLabel } from "@/platform/keymap";
import { diagnosticsAt, type PlacedDiagnostic, type EditorDiagnostic } from "./diagnostics";
import { isEmptyMarkup, languageForPath } from "./markdown";
@@ -44,10 +35,9 @@ import { basename } from "@/platform/project";
import { iconNode } from "@/ui/iconNode";
import { applyCodeAction, quickFixesAt } from "./intentions";
import { editorPrefs } from "@/platform/editorSettings";
import { CONTRIBUTED_HOVER, contributedAtAll, type ContributedHover } from "@/editor/api";
import { CONTRIBUTED_HOVER, contributedAt, type ContributedHover } from "@/editor/api";
import { navigationModifierHeld, onNavigationModifier, pointerTarget } from "@/platform/navigationModifier";
import { languageSemantics } from "./semantic";
import { tooltipBounds } from "@/editor/core/cm/setup";
let hoverRequest: RequestId | null = null;
@@ -57,9 +47,10 @@ function constructAt(state: EditorView["state"], pos: number, language: string |
}
export async function requestHover(view: EditorView, pos: number): Promise<Hover | null> {
for (const own of contributedAtAll<ContributedHover>(view.state, CONTRIBUTED_HOVER, pos)) {
const own = contributedAt<ContributedHover>(view.state, CONTRIBUTED_HOVER, pos);
if (own) {
const h = own(view.state, pos);
if (!h) continue;
if (!h) return null;
const range = { start: offsetToPos(view.state.doc, h.from), end: offsetToPos(view.state.doc, h.to) };
return { contents: { kind: "markdown", value: h.markdown }, range };
}
@@ -84,26 +75,6 @@ export async function requestHover(view: EditorView, pos: number): Promise<Hover
}
}
function diagnosticAction(label: string, shortcut: string | undefined, run: () => void): HTMLButtonElement {
const button = document.createElement("button");
button.type = "button";
button.className = "cm-lsp-link-button";
const text = document.createElement("span");
text.className = "cm-lsp-diag-action-label";
text.textContent = label;
button.appendChild(text);
if (shortcut) {
const keys = document.createElement("span");
keys.className = "cm-lsp-diag-shortcut";
keys.textContent = shortcut;
keys.setAttribute("aria-hidden", "true");
button.appendChild(keys);
}
button.addEventListener("mousedown", (e) => e.preventDefault());
button.addEventListener("click", run);
return button;
}
function renderDiagnostics(view: EditorView, diags: PlacedDiagnostic[]): HTMLElement {
const box = document.createElement("div");
box.className = "cm-lsp-hover-diagnostics";
@@ -121,39 +92,58 @@ function renderDiagnostics(view: EditorView, diags: PlacedDiagnostic[]): HTMLEle
msg.className = "cm-lsp-diag-message";
msg.textContent = d.message;
row.appendChild(msg);
const meta = document.createElement("div");
meta.className = "cm-lsp-diag-meta";
if (d.source) {
const src = document.createElement("span");
src.className = "cm-lsp-diag-source";
src.textContent = d.source;
row.appendChild(src);
meta.appendChild(src);
}
const actions = document.createElement("div");
actions.className = "cm-lsp-diag-actions";
const more = diagnosticAction(tx("More actions…"), shortcutLabel("code.showIntentions"), () => {
const fix = document.createElement("button");
fix.type = "button";
fix.className = "cm-lsp-link-button";
const keys = shortcutLabel("code.showIntentions");
fix.textContent = keys ? `More actions… ${keys}` : "More actions…";
if (d.severity !== "hint") offerQuickFix(view, meta, fix, from, to, d);
fix.addEventListener("mousedown", (e) => e.preventDefault());
fix.addEventListener("click", () => {
view.dispatch({ selection: EditorSelection.cursor(from) });
view.focus();
void executeAction("code.showIntentions");
});
actions.appendChild(more);
if (d.severity !== "hint") offerQuickFix(view, more, from, to, d);
row.appendChild(actions);
meta.appendChild(fix);
row.appendChild(meta);
box.appendChild(row);
}
return box;
}
/** IDEA's hover link to the problem's preferred quick fix, shown once the server named one. */
function offerQuickFix(view: EditorView, before: HTMLElement, from: number, to: number, diagnostic: EditorDiagnostic) {
function offerQuickFix(
view: EditorView,
meta: HTMLElement,
before: HTMLElement,
from: number,
to: number,
diagnostic: EditorDiagnostic,
) {
const doc = view.state.doc;
void quickFixesAt(view, from, to, diagnostic.problem)
.then(([action]) => {
if (!action || view.state.doc !== doc || !before.isConnected) return;
const link = diagnosticAction(action.title, shortcutLabel("code.applyQuickFix"), () => {
const link = document.createElement("button");
link.type = "button";
link.className = "cm-lsp-link-button";
const keys = shortcutLabel("code.applyQuickFix");
link.textContent = keys ? `${action.title} ${keys}` : action.title;
link.addEventListener("mousedown", (e) => e.preventDefault());
link.addEventListener("click", () => {
view.dispatch({ effects: closeHoverTooltips });
view.focus();
void applyCodeAction(view, action);
});
before.before(link);
meta.insertBefore(link, before);
})
.catch(() => {});
}
@@ -197,26 +187,12 @@ export async function hoverSource(view: EditorView, pos: number) {
create: () => {
const dom = document.createElement("div");
dom.className = `cm-lsp-hover ${selectableText}`;
const tooltip: TooltipView = { dom };
if (diags.length) {
dom.appendChild(renderDiagnostics(view, diags));
const fit = ({ left, right }: { left: number; right: number }) => {
const width = `${Math.max(0, Math.floor(right - left) - 2)}px`;
if (dom.style.getPropertyValue("--cm-diagnostic-hover-width") === width) return false;
dom.style.setProperty("--cm-diagnostic-hover-width", width);
return true;
};
tooltip.mount = () => void fit(tooltipBounds(view));
tooltip.positioned = (space) => {
if (fit(space)) repositionTooltips(view);
};
}
if (!entry) return tooltip;
if (diags.length) dom.appendChild(renderDiagnostics(view, diags));
if (!entry) return { dom };
// The same documentation view as F1's popup: links open in place, ← / →, Edit Source.
dom.classList.add("cm-lsp-hover-doc");
const doc = hoverDoc(entry, () => view.dispatch({ effects: closeHoverTooltips }));
tooltip.destroy = mountHoverDoc(dom.appendChild(document.createElement("div")), doc);
return tooltip;
return { dom, destroy: mountHoverDoc(dom.appendChild(document.createElement("div")), doc) };
},
};
}
Loaded 100 of 276 files, more files were not shown because too many files have changed in this diff. Show more