fi range

Author: juleswritescode

crates/pgt_query_ext/src/diagnostics.rs

@@ -23,6 +23,11 @@ impl SyntaxDiagnostic {
             message: MessageAndDescription::from(message.into()),
         }
     }
+
+    pub fn span(mut self, span: TextRange) -> Self {
+        self.span = Some(span);
+        self
+    }
 }
 
 impl From<pg_query::Error> for SyntaxDiagnostic {

crates/pgt_workspace/src/workspace/server/document.rs

@@ -252,7 +252,9 @@ impl<'a> StatementMapper<'a> for AnalyserDiagnosticsMapper {
             Ok(node) => {
                 let plpgsql_result = parser.ast_db.get_or_cache_plpgsql_parse(&id);
                 if let Some(Err(diag)) = plpgsql_result {
-                    (Some(node.clone()), Some(diag.clone()))
+                    // offset the pgpsql diagnostic from the parent statement start
+                    let span = diag.location().span.map(|sp| sp + range.start());
+                    (Some(node.clone()), Some(diag.span(span.unwrap_or(range))))
                 } else {
                     (Some(node.clone()), None)
                 }