Skip to content

feat: compile-time fallback include path #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asharkhan3101 merged 4 commits into from
Dec 3, 2025
Merged

feat: compile-time fallback include path #98

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4646fe
feat: compile-time fallback include path
komar007 Dec 1, 2025
98f1e64
docs: update README.md about well-known types, their detection and fa…
komar007 Dec 2, 2025
66d7762
feat: verify FALLBACK_INCLUDE_PATH in build.rs
komar007 Dec 2, 2025
27c6f44
feat!: print fallback include path in --version
komar007 Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ serde_json = "1.0"
basic-toml = "0.1"
pkg-config = "0.3"
clap = { version = "4.5", features = ["derive"] }
const_format = "0.2"

[dev-dependencies]
insta = { version = "1.43", features = ["yaml", "redactions"] }
24 changes: 22 additions & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use async_lsp::panic::CatchUnwindLayer;
use async_lsp::server::LifecycleLayer;
use async_lsp::tracing::TracingLayer;
use clap::Parser;
use const_format::concatcp;
use server::{ProtoLanguageServer, TickEvent};
use tower::ServiceBuilder;
use tracing::Level;
Expand All @@ -25,13 +26,32 @@ mod workspace;

/// Language server for proto3 files
#[derive(Parser, Debug)]
#[command(author, version, about, long_about = None, ignore_errors(true))]
#[command(
author,
version = concatcp!(
env!("CARGO_PKG_VERSION"),
"\n",
BUILD_INFO
),
about,
long_about = None,
ignore_errors(true)
)]
struct Cli {
/// Include paths for proto files
#[arg(short, long, value_delimiter = ',')]
include_paths: Option<Vec<String>>,
}

const FALLBACK_INCLUDE_PATH: Option<&str> = option_env!("FALLBACK_INCLUDE_PATH");
const BUILD_INFO: &str = concatcp!(
"fallback include path: ",
match FALLBACK_INCLUDE_PATH {
Some(path) => path,
None => "not set",
}
);

#[tokio::main(flavor = "current_thread")]
async fn main() {
let cli = Cli::parse();
Expand All @@ -48,7 +68,7 @@ async fn main() {
.with_writer(file_appender.0)
.init();

let fallback_include_path = option_env!("FALLBACK_INCLUDE_PATH").map(Into::into);
let fallback_include_path = FALLBACK_INCLUDE_PATH.map(Into::into);

tracing::info!("server version: {}", env!("CARGO_PKG_VERSION"));
let (server, _) = async_lsp::MainLoop::new_server(|client| {
Expand Down