Skip to content

Commit

Permalink
Merge branch 'zed-industries:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@xtrasmal
xtrasmal authored Aug 9, 2024
2 parents 0009971 + dd36c7d commit 3c4e271
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
6 changes: 5 additions & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@

[submodule "extensions/gdscript"]
path = extensions/gdscript
url = https://github.com/grndctrl/zed-gdscript.git
url = https://github.com/GDQuest/zed-gdscript.git

[submodule "extensions/gemini"]
path = extensions/gemini
Expand Down Expand Up @@ -678,6 +678,10 @@
path = extensions/polar-theme
url = https://github.com/biaqat/polar-theme-zed.git

[submodule "extensions/python-refactoring"]
path = extensions/python-refactoring
url = https://github.com/rowillia/zed-python-refactoring.git

[submodule "extensions/qml"]
path = extensions/qml
url = https://github.com/lkroll/zed-qml.git
Expand Down
12 changes: 8 additions & 4 deletions extensions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ version = "0.0.3"

[gdscript]
submodule = "extensions/gdscript"
version = "0.3.2"
version = "0.3.3"

[gemini]
submodule = "extensions/gemini"
Expand Down Expand Up @@ -430,7 +430,7 @@ version = "0.0.1"
[html]
submodule = "extensions/zed"
path = "extensions/html"
version = "0.1.1"
version = "0.1.2"

[indigo]
submodule = "extensions/indigo"
Expand Down Expand Up @@ -737,7 +737,7 @@ version = "0.1.0"
[php]
submodule = "extensions/zed"
path = "extensions/php"
version = "0.1.2"
version = "0.1.3"

[pica200]
submodule = "extensions/pica200"
Expand Down Expand Up @@ -769,6 +769,10 @@ submodule = "extensions/zed"
path = "extensions/purescript"
version = "0.0.1"

[python-refactoring]
submodule = "extensions/python-refactoring"
version = "0.0.3"

[qml]
submodule = "extensions/qml"
version = "0.0.1"
Expand Down Expand Up @@ -1060,7 +1064,7 @@ version = "1.0.0"

[vscode-dark-modern]
submodule = "extensions/vscode-dark-modern"
version = "0.0.3"
version = "0.0.4"

[vscode-dark-plus]
submodule = "extensions/vscode-dark-plus"
Expand Down
2 changes: 1 addition & 1 deletion extensions/gdscript
Submodule gdscript updated 4 files
+1 −1 Cargo.toml
+1 −6 README.md
+1 −1 extension.toml
+3 −34 languages/gdscript/indents.scm
1 change: 1 addition & 0 deletions extensions/python-refactoring
Submodule python-refactoring added at f1492e
2 changes: 1 addition & 1 deletion extensions/vscode-dark-modern
Submodule vscode-dark-modern updated 2 files
+1 −1 extension.toml
+82 −50 themes/vscode-dark-modern.json
2 changes: 1 addition & 1 deletion extensions/zed
Submodule zed updated 90 files
+68 −2 Cargo.lock
+1 −0 Cargo.toml
+2 −0 Dockerfile
+1 −0 assets/icons/text-search.svg
+1 −1 assets/keymaps/default-linux.json
+61 −0 assets/prompts/content_prompt.hbs
+0 −0 assets/prompts/edit_workflow.hbs
+0 −0 assets/prompts/step_resolution.hbs
+18 −0 assets/prompts/terminal_assistant_prompt.hbs
+1 −0 crates/assets/src/assets.rs
+1 −0 crates/assistant/Cargo.toml
+30 −6 crates/assistant/src/assistant.rs
+37 −7 crates/assistant/src/assistant_panel.rs
+42 −11 crates/assistant/src/context.rs
+16 −3 crates/assistant/src/context_store.rs
+79 −20 crates/assistant/src/inline_assistant.rs
+32 −30 crates/assistant/src/model_selector.rs
+2 −14 crates/assistant/src/prompt_library.rs
+227 −135 crates/assistant/src/prompts.rs
+30 −25 crates/assistant/src/slash_command/workflow_command.rs
+18 −7 crates/assistant/src/terminal_inline_assistant.rs
+2 −0 crates/collab/.env.toml
+32 −0 crates/collab/migrations_llm.sqlite/20240806182921_test_schema.sql
+16 −0 crates/collab/migrations_llm/20240806182921_create_providers_and_models.sql
+15 −0 crates/collab/migrations_llm/20240806213401_create_usages.sql
+5 −48 crates/collab/src/db.rs
+1 −0 crates/collab/src/db/ids.rs
+5 −1 crates/collab/src/db/tests.rs
+7 −0 crates/collab/src/lib.rs
+24 −1 crates/collab/src/llm.rs
+121 −4 crates/collab/src/llm/authorization.rs
+118 −0 crates/collab/src/llm/db.rs
+8 −0 crates/collab/src/llm/db/ids.rs
+4 −0 crates/collab/src/llm/db/queries.rs
+67 −0 crates/collab/src/llm/db/queries/providers.rs
+57 −0 crates/collab/src/llm/db/queries/usages.rs
+3 −0 crates/collab/src/llm/db/tables.rs
+39 −0 crates/collab/src/llm/db/tables/model.rs
+26 −0 crates/collab/src/llm/db/tables/provider.rs
+40 −0 crates/collab/src/llm/db/tables/usage.rs
+148 −0 crates/collab/src/llm/db/tests.rs
+30 −0 crates/collab/src/llm/db/tests/provider_tests.rs
+24 −0 crates/collab/src/llm/db/tests/usage_tests.rs
+8 −1 crates/collab/src/llm/token.rs
+48 −5 crates/collab/src/main.rs
+48 −0 crates/collab/src/migrations.rs
+1 −0 crates/collab/src/rpc.rs
+4 −3 crates/collab/src/tests/integration_tests.rs
+3 −0 crates/collab/src/tests/test_server.rs
+4 −0 crates/gpui/Cargo.toml
+1 −1 crates/gpui/README.md
+29 −0 crates/gpui/examples/shadow.rs
+1 −1 crates/gpui/src/gpui.rs
+1 −1 crates/gpui/src/platform/blade/shaders.wgsl
+3 −3 crates/gpui/src/platform/mac/shaders.metal
+2 −0 crates/languages/src/c/outline.scm
+2 −0 crates/languages/src/cpp/outline.scm
+1 −0 crates/languages/src/go/outline.scm
+2 −0 crates/languages/src/javascript/outline.scm
+2 −0 crates/languages/src/python/outline.scm
+2 −0 crates/languages/src/tsx/outline.scm
+2 −0 crates/languages/src/typescript/outline.scm
+14 −0 crates/paths/src/paths.rs
+4 −2 crates/repl/src/repl_editor.rs
+75 −14 crates/repl/src/repl_sessions_ui.rs
+18 −14 crates/repl/src/repl_store.rs
+2 −1 crates/search/src/project_search.rs
+7 −3 crates/settings/src/settings_file.rs
+4 −3 crates/terminal_view/src/terminal_panel.rs
+2 −0 crates/ui/src/components/icon.rs
+13 −10 crates/workspace/src/pane.rs
+1 −1 crates/workspace/src/workspace.rs
+55 −14 crates/zed/src/main.rs
+13 −6 crates/zed/src/zed.rs
+9 −2 crates/zed/src/zed/open_listener.rs
+1 −0 docker-compose.sql
+1 −1 docs/src/conversations.md
+77 −0 docs/src/language-model-integration.md
+1 −1 docs/src/remote-development.md
+2 −0 extensions/gleam/languages/gleam/outline.scm
+1 −1 extensions/html/Cargo.toml
+1 −1 extensions/html/extension.toml
+1 −0 extensions/html/languages/html/outline.scm
+1 −1 extensions/php/Cargo.toml
+1 −1 extensions/php/extension.toml
+1 −0 extensions/php/languages/php/brackets.scm
+2 −0 extensions/php/languages/php/outline.scm
+16 −2 script/bootstrap
+1 −0 script/reset_db
+0 −17 script/sqlx

0 comments on commit 3c4e271

Please sign in to comment.