From f8ce6dad8f3c2477b3e63ad240c90dcb2b70c966 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Thu, 12 Feb 2015 11:13:52 +0300
Subject: [PATCH] fixes in brackets matching

---
 src/dlangide/ui/dsourceedit.d | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d
index 312d559..cf67271 100644
--- a/src/dlangide/ui/dsourceedit.d
+++ b/src/dlangide/ui/dsourceedit.d
@@ -637,14 +637,13 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
                     //Log.d("Null token returned");
                     break;
                 }
-                if (token.type == TokenType.EOF) {
-                    //Log.d("EOF token");
-                    break;
-                }
                 uint newPos = token.pos - 1;
                 uint newLine = token.line - 1;
 
-                //Log.d("", token.line, ":", token.pos, "\t", tokenLine + 1, ":", tokenPos + 1, "\t", token.toString);
+                //Log.d("", tokenLine + 1, ":", tokenPos + 1, "  \t", token.line, ":", token.pos, "\t", token.toString);
+                if (token.type == TokenType.EOF) {
+                    //Log.d("EOF token");
+                }
 
                 // fill with category
                 for (int i = tokenLine; i <= newLine; i++) {
@@ -691,6 +690,9 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
                             case TokenType.COMMENT:
                                 category = TokenCategory.Error_InvalidComment;
                                 break;
+                            case TokenType.OP:
+                                category = TokenCategory.Error_InvalidOp;
+                                break;
                             case TokenType.FLOAT:
                             case TokenType.INTEGER:
                                 category = TokenCategory.Error_InvalidNumber;
@@ -707,6 +709,10 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
                 tokenPos = newPos;
                 tokenLine= newLine;
 
+                if (token.type == TokenType.EOF) {
+                    //Log.d("EOF token");
+                    break;
+                }
             }
         } catch (Exception e) {
             Log.e("exception while trying to parse D source", e);
@@ -718,4 +724,3 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
 			Log.d("updateHighlight took ", elapsed, "ms");
     }
 }
-