Merge branch 'master' into acvm-struct

.gitignore

@@ -20,3 +20,5 @@ result
 *.vk
 **/Verifier.toml
 **/target
+!crates/nargo_cli/tests/test_data/*/target
+!crates/nargo_cli/tests/test_data/*/target/witness.tr

Cargo.toml

@@ -24,7 +24,7 @@ edition = "2021"
 rust-version = "1.66"
 
 [workspace.dependencies]
-acvm = "0.17.0"
+acvm = "0.19.0"
 arena = { path = "crates/arena" }
 fm = { path = "crates/fm" }
 iter-extended = { path = "crates/iter-extended" }
@@ -40,7 +40,7 @@ noir_wasm = { path = "crates/wasm" }
 
 cfg-if = "1.0.0"
 clap = { version = "4.1.4", features = ["derive"] }
-codespan = "0.11.1"
+codespan = {version = "0.11.1", features = ["serialization"]}
 codespan-lsp = "0.11.1"
 codespan-reporting = "0.11.1"
 chumsky = { git = "https://github.com/jfecher/chumsky", rev = "ad9d312" }
@@ -57,6 +57,6 @@ wasm-bindgen = { version = "=0.2.86", features = ["serde-serialize"] }
 wasm-bindgen-test = "0.3.33"
 
 [patch.crates-io]
-acvm = { git = "https://github.com/noir-lang/acvm", rev = "9810b460dba878204e2ed3d4795b940883c2031b" }
-acvm-backend-barretenberg = { git = "https://github.com/noir-lang/acvm-backend-barretenberg", rev = "bf8aa668d96b8f19301fb6af34a6a1e3172499d4" }
+acvm = { git = "https://github.com/noir-lang/acvm", rev = "cf9597e6469e065dd45872ea122051c2a68bc554" }
+acvm-backend-barretenberg = { git = "https://github.com/noir-lang/acvm-backend-barretenberg", rev = "ad43d655735ab23423ba59b8725a738c936ad0bc" }
 async-lsp = { git = "https://github.com/oxalica/async-lsp", rev = "09dbcc11046f7a188a80137f8d36484d86c78c78" }

crates/fm/Cargo.toml

@@ -10,6 +10,7 @@ edition.workspace = true
 codespan-reporting.workspace = true
 cfg-if.workspace = true
 rust-embed = "6.6.0"
+serde.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen.workspace = true

crates/fm/src/file_map.rs

@@ -1,8 +1,8 @@
+use crate::FileManager;
 use codespan_reporting::files::{SimpleFile, SimpleFiles};
+use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
-use crate::FileManager;
-
 // XXX: File and FileMap serve as opaque types, so that the rest of the library does not need to import the dependency
 // or worry about when we change the dep
 
@@ -34,7 +34,7 @@ impl From<&PathBuf> for PathString {
 pub struct FileMap(SimpleFiles<PathString, String>);
 
 // XXX: Note that we derive Default here due to ModuleOrigin requiring us to set a FileId
-#[derive(Default, Debug, Clone, PartialEq, Eq, Copy, Hash)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, Copy, Hash, Serialize, Deserialize)]
 pub struct FileId(usize);
 
 impl FileId {

crates/fm/src/lib.rs

@@ -60,7 +60,7 @@ impl FileManager {
         // Unwrap as we ensure that all file_id's map to a corresponding file in the file map
         self.file_map.get_file(file_id).unwrap()
     }
-    pub fn path(&mut self, file_id: FileId) -> &Path {
+    pub fn path(&self, file_id: FileId) -> &Path {
         // Unwrap as we ensure that all file_ids are created by the file manager
         // So all file_ids will points to a corresponding path
         self.id_to_path.get(&file_id).unwrap().0.as_path()

crates/lsp/Cargo.toml

@@ -16,6 +16,7 @@ noirc_driver.workspace = true
 noirc_errors.workspace = true
 noirc_frontend.workspace = true
 serde_json.workspace = true
+toml.workspace = true
 tower.workspace = true
 async-lsp = { version = "0.0.4", default-features = false, features = ["omni-trait"] }
 

crates/lsp/src/lib.rs

@@ -1,3 +1,6 @@
+mod lib_hacky;
+use std::env;
+
 use std::{
     future::Future,
     ops::{self, ControlFlow},
@@ -27,7 +30,7 @@ const TEST_COMMAND: &str = "nargo.test";
 const TEST_CODELENS_TITLE: &str = "▶\u{fe0e} Run Test";
 
 // State for the LSP gets implemented on this struct and is internal to the implementation
-struct LspState {
+pub struct LspState {
     client: ClientSocket,
 }
 
@@ -43,6 +46,35 @@ pub struct NargoLspService {
 
 impl NargoLspService {
     pub fn new(client: &ClientSocket) -> Self {
+        // Using conditional running with lib_hacky to prevent non-hacky code from being identified as dead code
+        // Secondarily, provides a runtime way to stress the non-hacky code.
+        if env::var("NOIR_LSP_NO_HACK").is_err() {
+            let state = LspState::new(client);
+            let mut router = Router::new(state);
+            router
+                .request::<request::Initialize, _>(lib_hacky::on_initialize)
+                .request::<request::Shutdown, _>(lib_hacky::on_shutdown)
+                .request::<request::CodeLensRequest, _>(lib_hacky::on_code_lens_request)
+                .notification::<notification::Initialized>(lib_hacky::on_initialized)
+                .notification::<notification::DidChangeConfiguration>(
+                    lib_hacky::on_did_change_configuration,
+                )
+                .notification::<notification::DidOpenTextDocument>(
+                    lib_hacky::on_did_open_text_document,
+                )
+                .notification::<notification::DidChangeTextDocument>(
+                    lib_hacky::on_did_change_text_document,
+                )
+                .notification::<notification::DidCloseTextDocument>(
+                    lib_hacky::on_did_close_text_document,
+                )
+                .notification::<notification::DidSaveTextDocument>(
+                    lib_hacky::on_did_save_text_document,
+                )
+                .notification::<notification::Exit>(lib_hacky::on_exit);
+            return Self { router };
+        }
+
         let state = LspState::new(client);
         let mut router = Router::new(state);
         router