From 825b8852ea2f8555ccced9cf15fae8935cfe7b7a Mon Sep 17 00:00:00 2001
From: Brett Saviano <bsaviano@intersystems.com>
Date: Mon, 13 May 2024 09:54:24 -0400
Subject: [PATCH] Fixes #328

---
 CHANGELOG.md                       | 1 +
 server/src/providers/diagnostic.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e89f42..ca80640 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## [2.5.1] - 2024-XX-XX
+- Fix issue [#328](https://github.com/intersystems/language-server/issues/328): Fix namespace detection for Diagnostic computation
 - Parser changes:
   - DP-430950: Support new `Requires` Query keyword
 
diff --git a/server/src/providers/diagnostic.ts b/server/src/providers/diagnostic.ts
index 78e583b..609d3d6 100644
--- a/server/src/providers/diagnostic.ts
+++ b/server/src/providers/diagnostic.ts
@@ -1101,7 +1101,7 @@ export async function onDiagnostics(params: DocumentDiagnosticParams): Promise<D
 						// Ran off the end of the implementation
 						(parsed[i][j].l == ld.cls_langindex) ||
 						// Ran off the end of the method
-						(/^objectscript(-int)?$/.test(doc.languageId) && parsed[i][j].l == ld.cos_langindex && parsed[i][j].s == ld.cos_label_attrindex) ||
+						(/^objectscript(-int)?$/.test(doc.languageId) && j == 0 && parsed[i][j].l == ld.cos_langindex && parsed[i][j].s == ld.cos_label_attrindex) ||
 						// Exited the script
 						(doc.languageId == "objectscript-csp" && parsed[i][j].l == ld.html_langindex)
 					) {