Merge branch 'main' into ollama-inline-completions

# Conflicts:
#	Cargo.lock
#	crates/edit_prediction_button/src/edit_prediction_button.rs
#	crates/editor/src/editor.rs
#	crates/zed/src/zed/edit_prediction_registry.rs

crates/edit_prediction_button/Cargo.toml

@@ -0,0 +1,58 @@
+[package]
+name = "edit_prediction_button"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/edit_prediction_button.rs"
+doctest = false
+
+[dependencies]
+anyhow.workspace = true
+client.workspace = true
+cloud_llm_client.workspace = true
+copilot.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
+fs.workspace = true
+gpui.workspace = true
+http_client.workspace = true
+indoc.workspace = true
+edit_prediction.workspace = true
+language.workspace = true
+language_models.workspace = true
+ollama.workspace = true
+
+paths.workspace = true
+project.workspace = true
+regex.workspace = true
+settings.workspace = true
+supermaven.workspace = true
+telemetry.workspace = true
+ui.workspace = true
+workspace-hack.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
+zeta.workspace = true
+
+[dev-dependencies]
+clock.workspace = true
+client = { workspace = true, features = ["test-support"] }
+copilot = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+futures.workspace = true
+http_client = { workspace = true, features = ["test-support"] }
+indoc.workspace = true
+language_model = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+ollama = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+serde_json.workspace = true
+settings = { workspace = true, features = ["test-support"] }
+theme = { workspace = true, features = ["test-support"] }
+gpui_tokio.workspace = true

crates/edit_prediction_button/LICENSE-GPL

@@ -0,0 +1 @@
+../../LICENSE-GPL