take token kind from the tree in case if token kind from scanner is diff...

...erent. This might happen if parser decide to interpret token differently - i.e. treat keyword as identifier. This fixes #1320 
Could you also have a `shouldRescanIdentifier`?