Visual Brace Matching - handle < > #283

cshnik · cshnik · commit 208f7ab4c401 · 2020-03-06T02:45:56.000+07:00
diff --git a/src/Notepad2.c b/src/Notepad2.c
@@ -3656,14 +3656,14 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
         int iBrace2 = -1;
         int iPos = (int)SendMessage(hwndEdit, SCI_GETCURRENTPOS, 0, 0);
         char c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);
-        if (StrChrA("()[]{}", c))
+        if (StrChrA("()[]{}<>", c))
           iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);
         // Try one before
         else
         {
           iPos = (int)SendMessage(hwndEdit, SCI_POSITIONBEFORE, iPos, 0);
           c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);
-          if (StrChrA("()[]{}", c))
+          if (StrChrA("()[]{}<>", c))
             iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);
         }
         if (iBrace2 != -1)
@@ -3676,7 +3676,7 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
         int iBrace2 = -1;
         int iPos = (int)SendMessage(hwndEdit, SCI_GETCURRENTPOS, 0, 0);
         char c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);
-        if (StrChrA("()[]{}", c))
+        if (StrChrA("()[]{}<>", c))
         {
           iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);
         }
@@ -3685,7 +3685,7 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
         {
           iPos = (int)SendMessage(hwndEdit, SCI_POSITIONBEFORE, iPos, 0);
           c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);
-          if (StrChrA("()[]{}", c))
+          if (StrChrA("()[]{}<>", c))
             iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);
         }
         if (iBrace2 != -1)
@@ -5349,7 +5349,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
               {
                 iPos = (int)SendMessage(hwndEdit, SCI_POSITIONBEFORE, iPos, 0);
                 c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);
-                if (StrChrA("()[]{}", c))
+                if (StrChrA("()[]{}<>", c))
                 {
                   int iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);
                   if (iBrace2 != -1)

Original file line number	Diff line number	Diff line change
`@@ -3656,14 +3656,14 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)`
`3656`	`3656`	`int iBrace2 = -1;`
`3657`	`3657`	`int iPos = (int)SendMessage(hwndEdit, SCI_GETCURRENTPOS, 0, 0);`
`3658`	`3658`	`char c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);`
`3659`		`- if (StrChrA("()[]{}", c))`
	`3659`	`+ if (StrChrA("()[]{}<>", c))`
`3660`	`3660`	`iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);`
`3661`	`3661`	`// Try one before`
`3662`	`3662`	`else`
`3663`	`3663`	`{`
`3664`	`3664`	`iPos = (int)SendMessage(hwndEdit, SCI_POSITIONBEFORE, iPos, 0);`
`3665`	`3665`	`c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);`
`3666`		`- if (StrChrA("()[]{}", c))`
	`3666`	`+ if (StrChrA("()[]{}<>", c))`
`3667`	`3667`	`iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);`
`3668`	`3668`	`}`
`3669`	`3669`	`if (iBrace2 != -1)`
`@@ -3676,7 +3676,7 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)`
`3676`	`3676`	`int iBrace2 = -1;`
`3677`	`3677`	`int iPos = (int)SendMessage(hwndEdit, SCI_GETCURRENTPOS, 0, 0);`
`3678`	`3678`	`char c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);`
`3679`		`- if (StrChrA("()[]{}", c))`
	`3679`	`+ if (StrChrA("()[]{}<>", c))`
`3680`	`3680`	`{`
`3681`	`3681`	`iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);`
`3682`	`3682`	`}`
`@@ -3685,7 +3685,7 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)`
`3685`	`3685`	`{`
`3686`	`3686`	`iPos = (int)SendMessage(hwndEdit, SCI_POSITIONBEFORE, iPos, 0);`
`3687`	`3687`	`c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);`
`3688`		`- if (StrChrA("()[]{}", c))`
	`3688`	`+ if (StrChrA("()[]{}<>", c))`
`3689`	`3689`	`iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);`
`3690`	`3690`	`}`
`3691`	`3691`	`if (iBrace2 != -1)`
`@@ -5349,7 +5349,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)`
`5349`	`5349`	`{`
`5350`	`5350`	`iPos = (int)SendMessage(hwndEdit, SCI_POSITIONBEFORE, iPos, 0);`
`5351`	`5351`	`c = (char)SendMessage(hwndEdit, SCI_GETCHARAT, iPos, 0);`
`5352`		`- if (StrChrA("()[]{}", c))`
	`5352`	`+ if (StrChrA("()[]{}<>", c))`
`5353`	`5353`	`{`
`5354`	`5354`	`int iBrace2 = (int)SendMessage(hwndEdit, SCI_BRACEMATCH, iPos, 0);`
`5355`	`5355`	`if (iBrace2 != -1)`