wip

Author: joshuadavidthomas

crates/djls-server/src/server.rs

@@ -287,17 +287,23 @@ impl LanguageServer for DjangoLanguageServer {
     async fn did_change(&self, params: lsp_types::DidChangeTextDocumentParams) {
         tracing::info!("Changed document: {:?}", params.text_document.uri);
 
-        self.with_session_mut(|session| {
+        let url_version = self.with_session_mut(|session| {
             let Some(url) =
                 paths::parse_lsp_uri(&params.text_document.uri, paths::LspContext::DidChange)
             else {
                 return None; // Error parsing uri (unlikely), skip processing this change
             };
 
             session.update_document(&url, params.content_changes, params.text_document.version);
-            Some(url)
+            Some((url, params.text_document.version))
         })
         .await;
+
+        // Publish diagnostics after document change
+        // (analysis already happened in session.update_document)
+        if let Some((url, version)) = url_version {
+            self.publish_diagnostics(&url, Some(version)).await;
+        }
     }
 
     async fn did_close(&self, params: lsp_types::DidCloseTextDocumentParams) {

crates/djls-server/src/session.rs

@@ -12,6 +12,7 @@ use djls_project::Db as ProjectDb;
 use djls_project::Interpreter;
 use djls_workspace::db::SourceFile;
 use djls_workspace::paths;
+use djls_workspace::FileKind;
 use djls_workspace::PositionEncoding;
 use djls_workspace::TextDocument;
 use djls_workspace::Workspace;
@@ -163,12 +164,18 @@ impl Session {
         if let Some(path) = paths::url_to_path(url) {
             // Check if file already exists (was previously read from disk)
             let already_exists = self.db.has_file(&path);
-            let _file = self.db.get_or_create_file(&path);
+            let file = self.db.get_or_create_file(&path);
 
             if already_exists {
                 // File was already read - touch to invalidate cache
                 self.db.touch_file(&path);
             }
+
+            // Trigger template analysis immediately for template files
+            // This accumulates diagnostics right away
+            if FileKind::from_path(&path) == FileKind::Template {
+                let _ = djls_templates::analyze_template(&self.db, file);
+            }
         }
     }
 
@@ -189,18 +196,32 @@ impl Session {
         if let Some(path) = paths::url_to_path(url) {
             if self.db.has_file(&path) {
                 self.db.touch_file(&path);
+                
+                // Trigger template analysis immediately for template files
+                // This accumulates diagnostics right away
+                if FileKind::from_path(&path) == FileKind::Template {
+                    if let Some(file) = self.db.get_file(&path) {
+                        let _ = djls_templates::analyze_template(&self.db, file);
+                    }
+                }
             }
         }
     }
 
     pub fn save_document(&mut self, url: &Url) {
         // Touch file in database to trigger re-analysis
         if let Some(path) = paths::url_to_path(url) {
-            self.with_db_mut(|db| {
-                if db.has_file(&path) {
-                    db.touch_file(&path);
+            if self.db.has_file(&path) {
+                self.db.touch_file(&path);
+                
+                // Trigger template analysis immediately for template files
+                // This accumulates diagnostics right away
+                if FileKind::from_path(&path) == FileKind::Template {
+                    if let Some(file) = self.db.get_file(&path) {
+                        let _ = djls_templates::analyze_template(&self.db, file);
+                    }
                 }
-            });
+            }
         }
     }