Errortokens should also make the parser fail in the normal parser.

jedi/parser/__init__.py

@@ -156,7 +156,9 @@ class Parser(object):
 
     def _tokenize(self, tokenizer):
         for typ, value, start_pos, prefix in tokenizer:
-            if typ == OP:
+            if typ == ERRORTOKEN:
+                raise Parser.ParserError
+            elif typ == OP:
                 typ = token.opmap[value]
             yield typ, value, prefix, start_pos
 

jedi/parser/tokenize.py

@@ -286,7 +286,7 @@ def generate_tokens(readline):
     if new_line:
         end_pos = lnum + 1, 0
     else:
-        end_pos = lnum, max - 1
+        end_pos = lnum, max
     # As the last position we just take the maximally possible position. We
     # remove -1 for the last new line.
     for indent in indents[1:]: