josh/django-language-server
1
0
Fork 0
mirror of https://github.com/joshuadavidthomas/django-language-server.git synced 2025-08-04 01:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor some small session fields
Some checks are pending
lint / cargo-check (push) Waiting to run
Details
lint / clippy (push) Waiting to run
Details
lint / pre-commit (push) Waiting to run
Details
lint / rustfmt (push) Waiting to run
Details
release / build (push) Waiting to run
Details
release / test (push) Waiting to run
Details
release / release (push) Blocked by required conditions
Details
test / generate-matrix (push) Waiting to run
Details
test / Python , Django () (push) Blocked by required conditions
Details
test / tests (push) Blocked by required conditions
Details
zizmor 🌈 / zizmor latest via PyPI (push) Waiting to run
Details

Browse source
This commit is contained in:
Josh Thomas 2025-05-17 23:24:14 -05:00
parent 9e13422245
commit de5e65c10d
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/djls-server/src/server.rs
View file

@ -61,7 +61,7 @@ impl LanguageServer for DjangoLanguageServer {
client::log_message(MessageType::INFO, "Initializing server..."); client::log_message(MessageType::INFO, "Initializing server...");
self.with_session_mut(|session| { self.with_session_mut(|session| {
*session.client_capabilities_mut() = Some(params.capabilities); session.set_client_capabilities(params.capabilities);
}) })
.await; .await;
@ -121,9 +121,11 @@ impl LanguageServer for DjangoLanguageServer {
self.with_session_mut(|session| { self.with_session_mut(|session| {
let settings = djls_conf::Settings::new(&project_path) let settings = djls_conf::Settings::new(&project_path)
.unwrap_or_else(|_| djls_conf::Settings::default()); .unwrap_or_else(|_| djls_conf::Settings::default());
*session.settings_mut() = settings; session.set_settings(settings);
let project = djls_project::DjangoProject::new(project_path);
session.set_project(project);
*session.project_mut() = Some(djls_project::DjangoProject::new(project_path));
true true
}) })
.await .await
@ -298,7 +300,7 @@ impl LanguageServer for DjangoLanguageServer {
if let Some(path) = project_path { if let Some(path) = project_path {
self.with_session_mut(|session| match djls_conf::Settings::new(path.as_path()) { self.with_session_mut(|session| match djls_conf::Settings::new(path.as_path()) {
Ok(new_settings) => { Ok(new_settings) => {
*session.settings_mut() = new_settings; session.set_settings(new_settings);
} }
Err(e) => { Err(e) => {
client::log_message(MessageType::ERROR, format!("Error loading settings: {e}")); client::log_message(MessageType::ERROR, format!("Error loading settings: {e}"));

11
crates/djls-server/src/session.rs
View file

@ -45,8 +45,8 @@ pub struct Session {
} }
impl Session { impl Session {
pub fn client_capabilities_mut(&mut self) -> &mut Option<ClientCapabilities> { pub fn set_client_capabilities(&mut self, client_capabilities: ClientCapabilities) {
&mut self.client_capabilities self.client_capabilities = Some(client_capabilities);
} }
pub fn project(&self) -> Option<&DjangoProject> { pub fn project(&self) -> Option<&DjangoProject> {
@ -56,6 +56,9 @@ impl Session {
pub fn project_mut(&mut self) -> &mut Option<DjangoProject> { pub fn project_mut(&mut self) -> &mut Option<DjangoProject> {
&mut self.project &mut self.project
} }
pub fn set_project(&mut self, project: DjangoProject) {
self.project = Some(project);
}
pub fn documents(&self) -> &Store { pub fn documents(&self) -> &Store {
&self.documents &self.documents
@ -69,8 +72,8 @@ impl Session {
&self.settings &self.settings
} }
pub fn settings_mut(&mut self) -> &mut Settings { pub fn set_settings(&mut self, settings: Settings) {
&mut self.settings self.settings = settings;
} }
/// Get a database instance directly from the session /// Get a database instance directly from the session