Move project loading into qsc_project

Author: idavis

Cargo.lock

@@ -19,6 +19,7 @@ async-trait = { workspace = true }
 qsc_linter = { path = "../qsc_linter" }
 qsc_circuit = { path = "../qsc_circuit" }
 qsc_data_structures = { path = "../qsc_data_structures" }
+qsc_qasm = { path = "../qsc_qasm" }
 rustc-hash = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true }

compiler/qsc_project/Cargo.toml

@@ -13,6 +13,7 @@ mod error;
 mod fs;
 mod js;
 mod manifest;
+pub mod openqasm;
 mod project;
 
 pub use error::StdFsError;

compiler/qsc_project/src/lib.rs

@@ -3,8 +3,8 @@
 
 use std::{path::Path, sync::Arc};
 
-use qsc::qasm::parser::ast::StmtKind;
-use qsc_project::{FileSystemAsync, Project};
+use super::{FileSystemAsync, Project};
+use qsc_qasm::parser::ast::StmtKind;
 use rustc_hash::FxHashMap;
 
 pub async fn load_project<T>(project_host: &T, doc_uri: &Arc<str>) -> Project
@@ -34,7 +34,7 @@ where
             Ok((file, source)) => {
                 loaded_files.insert(file, source.clone());
 
-                let (program, _errors) = qsc::qasm::parser::parse(source.as_ref());
+                let (program, _errors) = qsc_qasm::parser::parse(source.as_ref());
 
                 let includes: Vec<Arc<str>> = program
                     .statements
@@ -62,7 +62,7 @@ where
                 }
             }
             Err(e) => {
-                errors.push(qsc::project::Error::FileSystem {
+                errors.push(super::project::Error::FileSystem {
                     about_path: doc_uri.to_string(),
                     error: e.to_string(),
                 });
@@ -77,7 +77,7 @@ where
         name: get_file_name_from_uri(doc_uri),
         lints: Vec::default(),
         errors,
-        project_type: qsc_project::ProjectType::OpenQASM(sources),
+        project_type: super::ProjectType::OpenQASM(sources),
     }
 }
 

language_service/src/openqasm.rs renamed to compiler/qsc_project/src/openqasm.rs

@@ -9,7 +9,6 @@ pub mod definition;
 pub mod format;
 pub mod hover;
 mod name_locator;
-pub mod openqasm;
 pub mod protocol;
 mod qsc_utils;
 pub mod references;

language_service/src/lib.rs

@@ -210,7 +210,7 @@ impl<'a> CompilationStateUpdater<'a> {
     ) -> Result<Option<Project>, Vec<project::Error>> {
         if is_openqasm_file(doc_uri) {
             return Ok(Some(
-                crate::openqasm::load_project(&*self.project_host, doc_uri).await,
+                qsc_project::openqasm::load_project(&*self.project_host, doc_uri).await,
             ));
         }
         self.load_manifest(doc_uri).await

language_service/src/state.rs

@@ -200,7 +200,8 @@ impl ProjectLoader {
     }
 
     pub async fn load_openqasm_project(&self, file_path: String) -> Result<IProjectConfig, String> {
-        let project_config = qsls::openqasm::load_project(&self.0, &file_path.clone().into()).await;
+        let project_config =
+            qsc_project::openqasm::load_project(&self.0, &file_path.clone().into()).await;
         // Will return error if project has errors
         project_config.try_into()
     }