Token manager errors should now be treated correctly.

SkaceKamen · Nov 12, 2016 · c70f884 · c70f884
1 parent 7077016
commit c70f884
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/cz/zipek/sqflint/linter/Linter.java b/src/cz/zipek/sqflint/linter/Linter.java
@@ -65,6 +65,8 @@ public int start() throws IOException {
 			} else {
 				getErrors().add((SQFParseException)e);
 			}
+		} catch (TokenMgrError e) {
+			getErrors().add(new SQFParseException(e));
 		} finally {
 			postParse();
 

diff --git a/src/cz/zipek/sqflint/linter/SQFParseException.java b/src/cz/zipek/sqflint/linter/SQFParseException.java
@@ -2,6 +2,7 @@
 
 import cz.zipek.sqflint.parser.ParseException;
 import cz.zipek.sqflint.parser.Token;
+import cz.zipek.sqflint.parser.TokenMgrError;
 
 /**
  *
@@ -24,6 +25,13 @@ public SQFParseException(ParseException ex) {
 		jsonMessage = buildMessage(ex, false);
 	}
 
+	public SQFParseException(TokenMgrError ex) {
+		super(ex.getMessage());
+
+		currentToken = null;
+		jsonMessage = ex.getMessage();
+	}
+
 	public String getJSONMessage() {
 		return jsonMessage;
 	}