big heckin reworkerino to use the standard #line directive as per spec

Author: Strum355

server/Cargo.lock

@@ -1,40 +1,6 @@
-[package]
-name = "mcshader-lsp"
-version = "0.9.5"
-authors = ["Noah Santschi-Cooney <noah@santschi-cooney.ch>"]
-edition = "2021"
-
-[dependencies]
-rust_lsp = { git = "https://github.com/Strum355/RustLSP", branch = "master" }
-serde_json = "1.0"
-serde = "1.0"
-walkdir = "2.3"
-petgraph = "0.6"
-lazy_static = "1.4"
-regex = "1.4"
-chan = "0.1"
-url = "2.2"
-percent-encoding = "2.1"
-anyhow = "1.0"
-bit-set = "0.5"
-thiserror = "1.0"
-glutin = "0.28"
-gl = "0.14"
-ctor = "0.1"
-mockall = "0.11"
-path-slash = "0.1"
-slog = { version = "2.7", features = [ "max_level_trace", "release_max_level_trace" ] }
-slog-term = "2.9"
-slog-scope = "4.4"
-slog-atomic = "3.1"
-once_cell = "1.7"
-rand = "0.8"
-arc-swap = "1.5.0"
-tree-sitter = "0.20.6"
-tree-sitter-glsl = "0.1.2"
-
-[dev-dependencies]
-tempdir = "0.3"
-fs_extra = "1.2"
-hamcrest2 = "*"
-pretty_assertions = "1.1"
+[workspace]
+members = [
+    "main",
+    "logging",
+    "logging_macro"
+]

server/Cargo.toml

@@ -4,7 +4,7 @@ watchtest:
 	RUST_BACKTRACE=0 cargo watch -x test -i Makefile
 
 test:
-	RUST_LIB_BACKTRACE=0 RUST_BACKTRACE=0 cargo test
+	RUST_LIB_BACKTRACE=0 RUST_BACKTRACE=0 cargo test -- --nocapture --color always
 
 build:
 	cargo build

server/Makefile

@@ -0,0 +1,13 @@
+[package]
+name = "logging"
+version = "0.9.5"
+authors = ["Noah Santschi-Cooney <noah@santschi-cooney.ch>"]
+edition = "2021"
+
+[dependencies]
+slog = { version = "2.7", features = [ "max_level_trace", "release_max_level_trace" ] }
+slog-term = "2.9"
+slog-scope = "4.4"
+slog-atomic = "3.1"
+rand = "0.8"
+lazy_static = "1.4"

server/logging/Cargo.toml

@@ -2,7 +2,10 @@ use rand::{rngs, Rng};
 use slog::slog_o;
 use slog_scope::GlobalLoggerGuard;
 use slog_term::{FullFormat, PlainSyncDecorator};
-use std::{cell::RefCell, io::Stderr, sync::Arc};
+use std::{cell::RefCell, sync::Arc};
+
+use std::io::Stderr;
+
 use lazy_static::lazy_static;
 use slog::*;
 use slog_atomic::*;
@@ -13,9 +16,7 @@ fn new_trace_id() -> String {
 }
 
 pub fn slog_with_trace_id<F: FnOnce()>(f: F) {
-    slog_scope::scope(&slog_scope::logger().new(slog_o!("trace" => new_trace_id())), || {
-        f()
-    })
+    slog_scope::scope(&slog_scope::logger().new(slog_o!("trace" => new_trace_id())), f)
 }
 
 pub fn set_logger_with_level(level: Level) -> GlobalLoggerGuard {
@@ -39,4 +40,4 @@ lazy_static! {
         let logger = logger_base(Level::Info).fuse();
         AtomicSwitch::new(logger)
     };
-}
+}

server/src/logging.rs server/logging/src/lib.rsserver/src/logging.rs renamed to server/logging/src/lib.rs

@@ -0,0 +1,12 @@
+[package]
+name = "logging_macro"
+version = "0.9.5"
+authors = ["Noah Santschi-Cooney <noah@santschi-cooney.ch>"]
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+quote = "1.0"
+syn = { version = "1.0", features = [ "full" ] }

server/logging_macro/Cargo.toml

@@ -0,0 +1,24 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{parse_macro_input, parse_quote, ItemFn};
+
+#[proc_macro_attribute]
+pub fn log_scope(_args: TokenStream, function: TokenStream) -> TokenStream {
+    let mut function = parse_macro_input!(function as ItemFn);
+
+    let function_name = function.sig.ident.to_string();
+
+    let stmts = function.block.stmts;
+
+    function.block = Box::new(parse_quote!({
+        use slog::{slog_o, FnValue, Level};
+        use std::thread::current;
+
+        let _guard = logging::set_logger_with_level(Level::Trace);
+        slog_scope::scope(&slog_scope::logger().new(slog_o!("test_name" => #function_name, "thread_num" => FnValue(|_| format!("{:?}", current().id())))), || {
+            #(#stmts)*
+        });
+    }));
+
+    TokenStream::from(quote!(#function))
+}

server/logging_macro/src/lib.rs

@@ -0,0 +1,35 @@
+[package]
+name = "mcshader-lsp"
+version = "0.9.5"
+authors = ["Noah Santschi-Cooney <noah@santschi-cooney.ch>"]
+edition = "2021"
+
+[dependencies]
+rust_lsp = { git = "https://github.com/Strum355/RustLSP", branch = "master" }
+serde_json = "1.0"
+serde = "1.0"
+walkdir = "2.3"
+petgraph = "0.6"
+lazy_static = "1.4"
+regex = "1.4"
+url = "2.2"
+percent-encoding = "2.1"
+anyhow = "1.0"
+thiserror = "1.0"
+glutin = "0.28"
+gl = "0.14"
+mockall = "0.11"
+path-slash = "0.1"
+slog = { version = "2.7", features = [ "max_level_trace", "release_max_level_trace" ] }
+slog-scope = "4.4"
+once_cell = "1.7"
+tree-sitter = "0.20.6"
+tree-sitter-glsl = "0.1.2"
+logging = { path = "../logging" }
+logging_macro = { path = "../logging_macro" }
+
+[dev-dependencies]
+tempdir = "0.3"
+fs_extra = "1.2"
+hamcrest2 = "*"
+pretty_assertions = "1.1"

server/main/Cargo.toml

@@ -15,6 +15,7 @@ use std::fs;
 
 use crate::dfs;
 use crate::merge_views::FilialTuple;
+use crate::source_mapper::SourceMapper;
 use crate::{graph::CachedStableGraph, merge_views, url_norm::FromJson};
 
 use super::Invokeable;
@@ -100,8 +101,9 @@ impl Invokeable for VirtualMergedDocument {
             };
             all_sources.extend(sources);
 
+            let mut source_mapper = SourceMapper::new(all_sources.len());
             let graph = self.graph.borrow();
-            let view = merge_views::generate_merge_list(&tree, &all_sources, &graph);
+            let view = merge_views::generate_merge_list(&tree, &all_sources, &graph, &mut source_mapper);
             return Ok(serde_json::value::Value::String(view));
         }
         return Err(format_err!(