Merge branch 'main' into solver-improvements

s-n-sharma · web-flow · commit 1928e0a22e74 · 2025-11-17T19:28:27.000-08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,11 +1,6 @@
 name: ci
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-
 env:
   CARGO_TERM_COLOR: always
 
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # Argon
 
-[![ci](https://github.com/ucb-substrate/argon/actions/workflows/ci.yml/badge.svg)](https://github.com/ucb-substrate/argon/actions/workflows/ci.yml)
 [![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 Argon is a programming language for writing constraint-based integrated circuit layout generators.
@@ -34,7 +33,7 @@ Future versions of Argon will hopefully support:
 
 To use Argon, you will need:
 - [Rust (tested on 1.90.0)](https://www.rust-lang.org/tools/install)
-- One of [Neovim](https://github.com/neovim/neovim/blob/master/INSTALL.md) or [VS Code](https://code.visualstudio.com/download)
+- One of [Neovim (version 0.11.0 or above)](https://github.com/neovim/neovim/blob/master/INSTALL.md) or [VS Code (version 1.100.0 or above)](https://code.visualstudio.com/download)
 
 Begin by cloning and compiling the Argon source code:
 
@@ -81,6 +80,15 @@ Add the following key:
 }
 ```
 
+Compile the VS Code extension by running the following from the root directory of your Argon clone:
+
+```bash
+cd plugins/vscode
+npm install
+npm run compile
+cd ../..
+```
+
 To open an example Argon workspace, run the following from the root directory of your Argon clone:
 
 ```bash
@@ -91,11 +99,19 @@ We recommend defining an alias in your shell configuration to simplify future co
 
 ```bash
 alias codear="code --extensionDevelopmentPath=<absolute_path_to_argon_repo>/plugins/vscode"
+```
+
+With this alias defined, you can now run:
+
+```bash
 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.
 
+> [!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.
+
 From within the GUI, type `:openCell test()` to open the `test` cell. You should now be able to edit layouts 
 in both VS Code and the GUI.
 
@@ -133,10 +149,11 @@ Hit `d` to use the Dimension tool and click on the top edge of each rectangle. C
 The dimension should now be highlighted yellow, indicating that you are editing that dimension. Type `5.` and hit enter to set the value
 of the dimension (the decimal point is important, since just `5` is considered an integer literal rather than a float).
 
-Double check that there are no errors in your code editor, or the GUI will not be able to
-display the updated cell. If you make a mistake, 
-you can undo and redo changes from the GUI using `u` and `Ctrl + r`,
-respectively, or manually modify the code in the text editor if needed.
+> [!WARNING]
+> Double check that there are no errors in your code editor, or the GUI will not be able to
+> display the updated cell. If you make a mistake, 
+> you can undo and redo changes from the GUI using `u` and `Ctrl + r`,
+> respectively, or manually modify the code in the text editor if needed.
 
 Repeat for the other 3 sides of the rectangle.
 
diff --git a/core/compiler/build/linear_constraints_solved_correctly/layout.gds b/core/compiler/build/linear_constraints_solved_correctly/layout.gds
diff --git a/core/compiler/examples/sky130_inverter/lib.ar b/core/compiler/examples/sky130_inverter/lib.ar
@@ -1,5 +1,5 @@
 cell inverter(nw: Float, pw: Float) {
-    let ndiff = rect("diff.drawing", x0=0., y0=0., y1=nw + nw);
+    let ndiff = rect("diff.drawing", x0=0., y0=0., y1=nw);
     let poly = rect("poly.drawing", y0=ndiff.y0-130.);
     eq(poly.x0 + poly.x1, ndiff.x0 + ndiff.x1);
     eq(poly.x1 - poly.x0, 150.);
@@ -55,7 +55,7 @@ cell inverter(nw: Float, pw: Float) {
 
     let nwell = rect("nwell.drawing", x0=ntap.x0-180., x1=ntap.x1+180., y0=pdiff.y0-180., y1=ntap.y1+180.);
 
-    let licon = rect("licon1.drawing", x0=0., x1=170., y0=0., y1=170.);
+    let licon = crect(layer="licon1.drawing", x0=0., x1=170., y0=0., y1=170.);
     let cons = crect(x0=vdd_s.x0, x1=vdd_s.x1, y0=pdiff.y0+40., y1=pdiff.y1-40.);
     #scope1 std::center_rects(cons, #scope0 std::max_array(licon, cons.w, cons.h, 340., 340.));
     let cons = crect(x0=vout.x0, x1=vout.x1, y0=pdiff.y0+40., y1=pdiff.y1-40.);
diff --git a/core/compiler/src/lib.rs b/core/compiler/src/lib.rs
@@ -473,6 +473,9 @@ mod tests {
             })
             .collect::<IndexMap<_, _>>();
         for rect in cell.objects.iter().filter_map(|obj| obj.1.get_rect()) {
+            if rect.construction {
+                continue;
+            }
             if let Some(layer) = &rect.layer {
                 let (layer, datatype) = layers[&layer.as_str()];
                 let x0 = rect.x0.0 as i32;
diff --git a/core/gui/src/editor/canvas.rs b/core/gui/src/editor/canvas.rs
@@ -1498,7 +1498,6 @@ impl LayoutCanvas {
                     } else {
                         true
                     };
-                    // TODO: add dimension constraint to code here instead of in input.rs
                     let state = self.state.read(cx);
 
                     if enter_entry_mode && let Some(cell) = state.solved_cell.read(cx) {
@@ -1724,7 +1723,6 @@ impl LayoutCanvas {
         }
     }
 
-    #[allow(dead_code)]
     fn layout_to_px(&self, pt: Point<f32>) -> Point<Pixels> {
         Point::new(self.scale * Pixels(pt.x), self.scale * Pixels(-pt.y))
             + self.offset
@@ -1842,7 +1840,6 @@ impl LayoutCanvas {
         });
     }
 
-    #[allow(unused)]
     pub(crate) fn on_mouse_down(
         &mut self,
         event: &MouseDownEvent,
@@ -1867,7 +1864,6 @@ impl LayoutCanvas {
         cx.notify();
     }
 
-    #[allow(unused)]
     pub(crate) fn on_drag_move(
         &mut self,
         _event: &DragMoveEvent<()>,
@@ -1877,7 +1873,6 @@ impl LayoutCanvas {
         self.is_dragging = false;
     }
 
-    #[allow(unused)]
     pub(crate) fn on_mouse_up(
         &mut self,
         _event: &MouseUpEvent,
diff --git a/core/gui/src/editor/toolbars.rs b/core/gui/src/editor/toolbars.rs
@@ -178,7 +178,8 @@ impl Render for LayerSideBar {
                             .filter(|layer| {
                                 layer
                                     .name
-                                    .contains(self.name_filter.read(cx).content.as_ref())
+                                    .to_lowercase()
+                                    .contains(&self.name_filter.read(cx).content.to_lowercase())
                                     && (!self.state.read(cx).used_filter || layer.used)
                             })
                             .map(|layer| {
@@ -284,7 +285,8 @@ impl HierarchySideBar {
         let expanded = self.expanded_scopes.contains(&scope_path);
         if scope_state
             .name
-            .contains(self.name_filter.read(cx).content.as_ref())
+            .to_lowercase()
+            .contains(&self.name_filter.read(cx).content.to_lowercase())
         {
             scopes.push(
                 div()
diff --git a/core/gui/src/rpc.rs b/core/gui/src/rpc.rs
@@ -49,9 +49,16 @@ impl SyncGuiToLspClient {
         let (tx, mut rx) = mpsc::channel(1);
         let mut listener = self.app.background_executor().block(
             async {
-                tarpc::serde_transport::tcp::listen((Ipv4Addr::LOCALHOST, 0), Json::default)
-                    .await
-                    .unwrap()
+                if let Ok(listener) =
+                    tarpc::serde_transport::tcp::listen((Ipv4Addr::LOCALHOST, 12346), Json::default)
+                        .await
+                {
+                    listener
+                } else {
+                    tarpc::serde_transport::tcp::listen((Ipv4Addr::LOCALHOST, 0), Json::default)
+                        .await
+                        .unwrap()
+                }
             }
             .compat(),
         );
diff --git a/core/lsp-server/src/document.rs b/core/lsp-server/src/document.rs
@@ -36,7 +36,6 @@ impl Document {
         pos2position(self.contents.offset_to_pos(offset).unwrap())
     }
 
-    #[allow(dead_code)]
     pub(crate) fn substr(&self, range: std::ops::Range<Position>) -> &str {
         self.contents
             .substr(position2pos(range.start)..position2pos(range.end))
diff --git a/core/lsp-server/src/lib.rs b/core/lsp-server/src/lib.rs
@@ -105,7 +105,6 @@ impl StateMut {
     }
 
     async fn compile(&mut self, client: &Client, update: bool) {
-        // TODO: un-hardcode this.
         if let Some(root_dir) = &self.root_dir {
             self.config = parse_config(root_dir.join("Argon.toml")).ok();
             let lyp = self
diff --git a/core/lsp-server/src/rpc.rs b/core/lsp-server/src/rpc.rs
@@ -97,7 +97,6 @@ impl GuiToLsp for LspServer {
         var_name: String,
         rect: BasicRect<f64>,
     ) -> Option<Span> {
-        // TODO: check if editor file is up to date with ast.
         let state_mut = self.state.state_mut.lock().await;
         let url = Url::from_file_path(&scope_span.path).unwrap();
         if let Some(ast) = state_mut
@@ -224,7 +223,6 @@ impl GuiToLsp for LspServer {
         scope_span: Span,
         params: DimensionParams,
     ) -> Option<Span> {
-        // TODO: check if editor file is up to date with ast.
         let state_mut = self.state.state_mut.lock().await;
         let url = Url::from_file_path(&scope_span.path).unwrap();
         if let Some(ast) = state_mut
@@ -347,7 +345,6 @@ impl GuiToLsp for LspServer {
         span: Span,
         value: String,
     ) -> Option<Span> {
-        // TODO: check if editor file is up to date with ast.
         let state_mut = self.state.state_mut.lock().await;
         let url = Url::from_file_path(&span.path).unwrap();
         if let Some(ast) = state_mut.ast.values().find(|ast| ast.path == span.path)
@@ -420,7 +417,6 @@ impl GuiToLsp for LspServer {
         lhs: String,
         rhs: String,
     ) {
-        // TODO: check if editor file is up to date with ast.
         let state_mut = self.state.state_mut.lock().await;
         let url = Url::from_file_path(&scope_span.path).unwrap();
         if let Some(ast) = state_mut
diff --git a/plugins/nvim/lua/argon_lsp/client.lua b/plugins/nvim/lua/argon_lsp/client.lua
@@ -3,11 +3,8 @@
 ---@class argon_lsp.client.ClientAdapter
 local M = {}
 
----@class argon_lsp.lsp.get_clients.Filter: vim.lsp.get_clients.Filter
----@field exclude_rustc_target? string Cargo target triple (e.g., 'x86_64-unknown-linux-gnu') to filter rust-analyzer clients
-
 ---@param bufnr number | nil 0 for the current buffer, `nil` for no buffer filter
----@param filter? argon_lsp.lsp.get_clients.Filter
+---@param filter? vim.lsp.get_clients.Filter
 ---@return vim.lsp.Client[]
 M.get_active_argon_lsp_clients = function(bufnr, filter)
   ---@type vim.lsp.get_clients.Filter
diff --git a/plugins/nvim/lua/argon_lsp/init.lua b/plugins/nvim/lua/argon_lsp/init.lua
@@ -6,7 +6,7 @@ local commands = require('argon_lsp.commands')
 
 ---LSP restart internal implementations
 ---@param bufnr? number The buffer number, defaults to the current buffer
----@param filter? rustaceanvim.lsp.get_clients.Filter
+---@param filter? vim.lsp.get_clients.Filter
 ---@param callback? fun(client: vim.lsp.Client) Optional callback to run for each client before restarting.
 ---@return number|nil client_id
 local function restart(bufnr, filter, callback)
diff --git a/plugins/vscode/package-lock.json b/plugins/vscode/package-lock.json
diff --git a/plugins/vscode/package.json b/plugins/vscode/package.json
@@ -49,8 +49,7 @@
         "compile": "tsc -b",
         "watch": "tsc -b -w",
         "lint": "eslint",
-        "postinstall": "cd client && npm install && cd ..",
-        "test": "sh ./scripts/e2e.sh"
+        "postinstall": "cd client && npm install && cd .."
     },
     "devDependencies": {
         "@eslint/js": "^9.13.0",

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ impl Document {`
`36`	`36`	`pos2position(self.contents.offset_to_pos(offset).unwrap())`
`37`	`37`	`}`
`38`	`38`
`39`		`- #[allow(dead_code)]`
`40`	`39`	`pub(crate) fn substr(&self, range: std::ops::Range<Position>) -> &str {`
`41`	`40`	`self.contents`
`42`	`41`	`.substr(position2pos(range.start)..position2pos(range.end))`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@ impl StateMut {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`async fn compile(&mut self, client: &Client, update: bool) {`
`108`		`- // TODO: un-hardcode this.`
`109`	`108`	`if let Some(root_dir) = &self.root_dir {`
`110`	`109`	`self.config = parse_config(root_dir.join("Argon.toml")).ok();`
`111`	`110`	`let lyp = self`