From 8bfa7ffd52ea5b2d5209e26899094ce125597443 Mon Sep 17 00:00:00 2001
From: Rio Sanjaya <oisanjaya@gmail.com>
Date: Wed, 30 Sep 2026 01:08:27 +0700
Subject: [PATCH 1/2] Ignore "In front of code" codetool errors and add units

---
 src/serverprotocol/PasLS.Diagnostics.pas | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/serverprotocol/PasLS.Diagnostics.pas b/src/serverprotocol/PasLS.Diagnostics.pas
index 83e48dd..b59bde5 100644
--- a/src/serverprotocol/PasLS.Diagnostics.pas
+++ b/src/serverprotocol/PasLS.Diagnostics.pas
@@ -25,7 +25,11 @@ interface
 
 uses
   { RTL }
+<<<<<<< Updated upstream
   Classes, Types,
+=======
+  Classes, Types, fgl, StrUtils,
+>>>>>>> Stashed changes
   { Code Tools }
   CodeToolManager, CodeCache,
   { Protocol }
@@ -120,6 +124,8 @@ procedure PublishCodeToolsError(aTransport: TMessageTransport;
   aCol:=CodeToolBoss.ErrorColumn;
   if CodeToolBoss.ErrorCode<> nil then
     begin
+    if StartsStr('In front of code.',  aErrorMessage) then
+      Exit;
     aFileName:=CodeToolBoss.ErrorCode.FileName;
     MessageString:=aFileName+': ';
     end

From 7e8d2f2a3c7b6e8e804b1223c70f8bb272a97054 Mon Sep 17 00:00:00 2001
From: Rio Sanjaya <oisanjaya@gmail.com>
Date: Wed, 30 Sep 2026 01:10:46 +0700
Subject: [PATCH 2/2] Resolve git merge conflict in diagnostics unit

---
 src/serverprotocol/PasLS.Diagnostics.pas | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/serverprotocol/PasLS.Diagnostics.pas b/src/serverprotocol/PasLS.Diagnostics.pas
index b59bde5..586e376 100644
--- a/src/serverprotocol/PasLS.Diagnostics.pas
+++ b/src/serverprotocol/PasLS.Diagnostics.pas
@@ -25,11 +25,7 @@ interface
 
 uses
   { RTL }
-<<<<<<< Updated upstream
-  Classes, Types,
-=======
   Classes, Types, fgl, StrUtils,
->>>>>>> Stashed changes
   { Code Tools }
   CodeToolManager, CodeCache,
   { Protocol }