From 2624f049cc89052970e5268e85ac118224938c7c Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Sat, 2 Feb 2019 04:37:58 +0100
Subject: [PATCH] fix upstram, auto indent broken after ENTER

---
 src/u_dlang.pas   | 29 +++++++++++++++++++++++++++++
 src/u_synmemo.pas | 30 ++++--------------------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/u_dlang.pas b/src/u_dlang.pas
index fca55ead..8b9311e0 100644
--- a/src/u_dlang.pas
+++ b/src/u_dlang.pas
@@ -148,6 +148,11 @@ function getModuleName(list: TLexTokenList): string;
  *)
 procedure getImports(list: TLexTokenList; imports: TStrings);
 
+(**
+ * Get The index of the tokens at the left of the caret position
+ *)
+function getIndexOfTokenLeftTo(tokens: TLexTokenList; caretPos: TPoint): integer;
+
 (**
  * Compares two TPoints.
  *)
@@ -994,6 +999,30 @@ end;
 {$ENDREGION}
 
 {$REGION Utils}
+function getIndexOfTokenLeftTo(tokens: TLexTokenList; caretPos: TPoint): integer;
+var
+  i: integer;
+  x: integer;
+  y: integer;
+  t: PLexToken;
+begin
+  result := -1;
+  for i := tokens.Count-1 downto 0 do
+  begin
+    t := tokens[i];
+    x := caretPos.x;
+    y := caretPos.y;
+    if t^.position.y > y then
+      continue;
+    if ((t^.position.y = y) and (t^.position.x <= x))
+      or (t^.position.y < y) then
+    begin
+      result := i;
+      break;
+    end;
+  end;
+end;
+
 function TLexErrorList.getError(index: integer): TLexError;
 begin
   Result := PLexError(Items[index])^;
diff --git a/src/u_synmemo.pas b/src/u_synmemo.pas
index ce0b8fec..871b8b68 100644
--- a/src/u_synmemo.pas
+++ b/src/u_synmemo.pas
@@ -1692,33 +1692,15 @@ var
   i: integer = 0;
   j: integer = 0;
   s: integer = $7FFFFFFF;
-  b: boolean = false;
-  x,y: integer;
 begin
   if not fIsDSource and not alwaysAdvancedFeatures or
     not (eoAutoIndent in Options) then
     exit(0);
 
-  // locate the token at the left of the caret
-  for i := fLexToks.Count-1 downto 0 do
-  begin
-    t := fLexToks[i];
-    x := CaretX ;
-    y := CaretY ;
-    if fLexToks[i]^.position.y > y then
-      continue;
-    if ((fLexToks[i]^.position.y = y) and (fLexToks[i]^.position.x <= x))
-      or (fLexToks[i]^.position.y < y) then
-    begin
-      leftTokIndex := i;
-      break;
-    end;
-  end;
-
+  leftTokIndex := getIndexOfTokenLeftTo(fLexToks, CaretXY);
   if leftTokIndex = -1 then
     exit(0);
 
-  // compute indentation
   for i := leftTokIndex downto 0 do
   begin
     t := fLexToks[i];
@@ -1727,17 +1709,13 @@ begin
     case t^.Data[1] of
       '{':
         begin
-          b := true;
           j += 1;
+          if t^.position.x > s then
+            break;
+          s := min(s, t^.position.x);
         end;
       '}': j -= 1;
     end;
-    if t^.position.x > s then
-      break;
-    if b then
-      s := min(s, t^.position.x)
-    else
-      s := 0;
   end;
   // note: the leftmost openening brace might be on a column <> 0
   // but the fix breaks the K&R brace style...