chore!: factor lsp-server and clean up VS Code plugin

Author: rohanku

Cargo.lock

@@ -1,7 +1,7 @@
 [workspace]
 
 resolver = "2"
-members = ["core/compiler", "core/gui", "core/lsp-server"]
+members = ["core/compiler", "core/gui", "core/lang-server"]
 
 [workspace.dependencies]
 anyhow = "1"

Cargo.toml

@@ -48,10 +48,10 @@ cargo b --release
 Add the following to your Neovim Lua configuration:
 
 ```lua
-vim.g.argon_lsp = {
+vim.g.argon = {
     argon_repo_path = '<absolute_path_to_argon_repo>'
 }
-vim.opt.runtimepath:append(vim.g.argon_lsp.argon_repo_path .. '/plugins/nvim')
+vim.opt.runtimepath:append(vim.g.argon.argon_repo_path .. '/plugins/nvim')
 vim.cmd([[autocmd BufRead,BufNewFile *.ar setfiletype argon]])
 ```
 
@@ -61,7 +61,7 @@ To open an example Argon workspace, run the following from the root directory of
 vim core/compiler/examples/argon_workspace/lib.ar
 ```
 
-Start the GUI by running `:ArgonLsp startGui`.
+Start the GUI by running `:Argon startGui`.
 
 From within the GUI, type `:openCell test()` to open the `test` cell. You should now be able to edit layouts 
 in both Neovim and the GUI.
@@ -76,7 +76,7 @@ Add the following key:
 
 ```json
 {
-    "argonLsp.argonRepoDir": "<absolute_path_to_argon_repo>"
+    "argon.argonRepoDir": "<absolute_path_to_argon_repo>"
 }
 ```
 
@@ -107,7 +107,7 @@ With this alias defined, you can now run:
 codear core/compiler/examples/argon_workspace
 ```
 
-Open the `lib.ar` file within the workspace. You can then start the GUI by running `Command Palette > Argon LSP: Start GUI`.
+Open the `lib.ar` file within the workspace. You can then start the GUI by running `Command Palette > Argon: Start GUI`.
 
 > [!WARNING]
 > If you cannot find the command for starting the GUI but did not notice any obvious errors, you may be on an old version of VS Code.
@@ -205,7 +205,7 @@ constituent rectangles.
 ## Logs
 
 <!-- TODO: Implement commands to open GUI log -->
-Argon writes log messages to `~/.local/state/argon/lsp.log` (LSP server) and `~/local/state/argon/gui.log` (GUI).
+Argon writes log messages to `~/.local/state/argon/lang-server.log` (language server) and `~/local/state/argon/gui.log` (GUI).
 Log level can be set using the `ARGON_LOG` environment variable
 or in editor-specific configuration. If no configuration is specified, only errors will be logged.
 Log level configuration follows [`RUST_LOG`](https://docs.rs/tracing-subscriber/latest/tracing_subscriber/fmt/index.html#filtering-events-with-environment-variables) syntax.
@@ -214,34 +214,34 @@ For performance, it is recommended to use `ARGON_LOG=warn` or `ARGON_LOG=error`
 
 ### Neovim
 
-While the LSP is running, you can open the LSP logs using the `:ArgonLsp log` command 
+While the language server is running, you can open the language server logs using the `:Argon log` command 
 
-To configure the log level, you can use the `vim.g.argon_lsp.log.level` key:
+To configure the log level, you can use the `vim.g.argon.log.level` key:
 
 ```lua
-vim.g.argon_lsp = {
+vim.g.argon = {
     -- ...
     log = {
         level = "debug"
     }
 }
 ```
 
-The Neovim plugin will then supply `ARGON_LOG=debug` when starting the LSP server and GUI.
+The Neovim plugin will then supply `ARGON_LOG=debug` when starting the language server and GUI.
 
 ### VS Code
 
-While the LSP is running, you can open the LSP logs using the `Command Palette > Argon LSP: Open Log` command.
+While the language is running, you can open the language logs using the `Command Palette > Argon: Open Log` command.
 
-To configure the log level, you can use the `argonLsp.log.level` key:
+To configure the log level, you can use the `argon.log.level` key:
 
 ```json
 {
-    "argonLsp.log.level": "debug"
+    "argon.log.level": "debug"
 }
 ```
 
-The VS Code plugin will then supply `ARGON_LOG=debug` when starting the LSP server and GUI.
+The VS Code plugin will then supply `ARGON_LOG=debug` when starting the language server and GUI.
 
 ## Contributing
 

README.md

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-lsp-server = { path = "../lsp-server" }
+lang-server = { path = "../lang-server" }
 compiler = { path = "../compiler" }
 gpui = { git = "https://github.com/ucb-substrate/zed", branch = "argon-dev" }
 smallvec = "1"

core/gui/Cargo.toml

@@ -20,7 +20,7 @@ use gpui::{
 };
 use indexmap::IndexSet;
 use itertools::Itertools;
-use lsp_server::rpc::DimensionParams;
+use lang_server::rpc::DimensionParams;
 use tower_lsp::lsp_types::MessageType;
 
 use crate::{
@@ -1293,7 +1293,7 @@ impl LayoutCanvas {
                                                     .find(|name| !names.contains(name))
                                                     .unwrap();
 
-                                                state.lsp_client.draw_rect(
+                                                state.lang_server_client.draw_rect(
                                                     scope.span.clone(),
                                                     rect_name,
                                                     compile::BasicRect {
@@ -1319,14 +1319,14 @@ impl LayoutCanvas {
                                 rect_tool.p0 = Some(p0);
                             }
                         } else {
-                            state.lsp_client.show_message(
+                            state.lang_server_client.show_message(
                                 MessageType::ERROR,
                                 "Cannot draw on an invisible layer.",
                             );
                         }
                     } else {
                         state
-                            .lsp_client
+                            .lang_server_client
                             .show_message(MessageType::ERROR, "No layer has been selected.");
                     }
                 }
@@ -1527,7 +1527,7 @@ impl LayoutCanvas {
 
                             let value = format!("{:?}", edge.2.stop - edge.2.start);
                             state
-                                .lsp_client
+                                .lang_server_client
                                 .draw_dimension(
                                     cell.output.cells[&selected_scope_addr.cell].scopes
                                         [&selected_scope_addr.scope]
@@ -1582,7 +1582,7 @@ impl LayoutCanvas {
                                         format!("- {}", intended_coord - coord)
                                     };
                                     let value = format!("{:?}", right.2.coord - left.2.coord);
-                                    state.lsp_client.draw_dimension(
+                                    state.lang_server_client.draw_dimension(
                                         cell.output.cells[&selected_scope_addr.cell].scopes
                                             [&selected_scope_addr.scope]
                                             .span
@@ -1653,7 +1653,7 @@ impl LayoutCanvas {
                                         )
                                     };
                                     state
-                                        .lsp_client
+                                        .lang_server_client
                                         .draw_dimension(
                                             cell.output.cells[&selected_scope_addr.cell].scopes
                                                 [&selected_scope_addr.scope]
@@ -1719,7 +1719,10 @@ impl LayoutCanvas {
                     }
                     if let Some(span) = selected_obj {
                         select_tool.selected_obj = Some(span.clone());
-                        self.state.read(cx).lsp_client.select_rect(span.clone());
+                        self.state
+                            .read(cx)
+                            .lang_server_client
+                            .select_rect(span.clone());
                     } else {
                         select_tool.selected_obj = None;
                     }

core/gui/src/editor/canvas.rs

@@ -256,7 +256,7 @@ impl TextInput {
                 && self
                     .state
                     .read(cx)
-                    .lsp_client
+                    .lang_server_client
                     .edit_dimension(dim.clone(), self.content.to_string())
                     .is_some()
             {
@@ -271,7 +271,10 @@ impl TextInput {
                     #[allow(clippy::single_match)]
                     match command.trim_start_matches(":") {
                         "openCell" => {
-                            self.state.read(cx).lsp_client.open_cell(rest.to_string());
+                            self.state
+                                .read(cx)
+                                .lang_server_client
+                                .open_cell(rest.to_string());
                             return true;
                         }
                         _ => {} // TODO: support other commands, reduce redundancy with rpc.rs

core/gui/src/editor/input.rs

@@ -11,15 +11,15 @@ use compiler::compile::{
 use geometry::transform::TransformationMatrix;
 use gpui::*;
 use indexmap::{IndexMap, IndexSet};
-use lsp_server::rpc::GuiToLspAction;
+use lang_server::rpc::LangServerAction;
 use rgb::Rgb;
 use toolbars::{HierarchySideBar, LayerSideBar, TitleBar, ToolBar};
 use tower_lsp::lsp_types::MessageType;
 
 use crate::{
     actions::{Redo, Undo},
     editor::{canvas::ToolState, input::TextInput},
-    rpc::SyncGuiToLspClient,
+    rpc::SyncLangServerClient,
     theme::{DARK_THEME, LIGHT_THEME, Theme},
 };
 
@@ -74,7 +74,7 @@ pub struct EditorState {
     pub solved_cell: Entity<Option<CompileOutputState>>,
     pub hide_external_geometry: bool,
     pub layers: Entity<Layers>,
-    pub lsp_client: SyncGuiToLspClient,
+    pub lang_server_client: SyncLangServerClient,
     pub subscriptions: Vec<Subscription>,
     pub(crate) tool: Entity<ToolState>,
 }
@@ -234,7 +234,7 @@ impl EditorState {
                     .iter()
                     .any(|e| matches!(e.kind, ExecErrorKind::InvalidCell))
                 {
-                    self.lsp_client
+                    self.lang_server_client
                         .show_message(MessageType::ERROR, "Open cell is invalid");
                     return;
                 }
@@ -311,8 +311,8 @@ impl EditorState {
 }
 
 impl Editor {
-    pub fn new(cx: &mut Context<Self>, window: &mut Window, lsp_addr: SocketAddr) -> Self {
-        let lsp_client = SyncGuiToLspClient::new(cx.to_async(), lsp_addr);
+    pub fn new(cx: &mut Context<Self>, window: &mut Window, lang_server_addr: SocketAddr) -> Self {
+        let lang_server_client = SyncLangServerClient::new(cx.to_async(), lang_server_addr);
         let solved_cell = cx.new(|_cx| None);
         let tool = cx.new(|_cx| ToolState::default());
         let layers = cx.new(|_cx| Layers {
@@ -332,7 +332,7 @@ impl Editor {
                 tool,
                 layers,
                 subscriptions,
-                lsp_client: lsp_client.clone(),
+                lang_server_client: lang_server_client.clone(),
             }
         });
         let title_bar = cx.new(|_cx| TitleBar::new(&state));
@@ -362,7 +362,7 @@ impl Editor {
             canvas,
             text_input,
         };
-        lsp_client.register_server(editor.clone());
+        lang_server_client.register_server(editor.clone());
 
         editor
     }
@@ -425,15 +425,15 @@ impl Editor {
     fn on_undo(&mut self, _: &Undo, _window: &mut Window, cx: &mut Context<Self>) {
         self.state
             .read(cx)
-            .lsp_client
-            .dispatch_action(GuiToLspAction::Undo);
+            .lang_server_client
+            .dispatch_action(LangServerAction::Undo);
     }
 
     fn on_redo(&mut self, _: &Redo, _window: &mut Window, cx: &mut Context<Self>) {
         self.state
             .read(cx)
-            .lsp_client
-            .dispatch_action(GuiToLspAction::Redo);
+            .lang_server_client
+            .dispatch_action(LangServerAction::Redo);
     }
 
     fn theme(&self, cx: &mut Context<Self>) -> &'static Theme {

core/gui/src/editor/mod.rs

@@ -5,7 +5,7 @@ use gpui::prelude::*;
 use gpui::*;
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
-use lsp_server::rpc::GuiToLspAction;
+use lang_server::rpc::LangServerAction;
 
 use crate::{
     actions::{DrawDim, DrawRect, SelectMode},
@@ -83,8 +83,8 @@ impl Render for ToolBar {
                         Arc::new(|state, cx| {
                             state
                                 .read(cx)
-                                .lsp_client
-                                .dispatch_action(GuiToLspAction::Undo);
+                                .lang_server_client
+                                .dispatch_action(LangServerAction::Undo);
                         }),
                     )),
                     Some((
@@ -94,8 +94,8 @@ impl Render for ToolBar {
                         Arc::new(|state, cx| {
                             state
                                 .read(cx)
-                                .lsp_client
-                                .dispatch_action(GuiToLspAction::Redo);
+                                .lang_server_client
+                                .dispatch_action(LangServerAction::Redo);
                         }),
                     )),
                     None,