Skip to content

Expose a token's underlying input range #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose a token's underlying input range #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions javalang/test/test_tokenizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,15 @@ def test_inline_comment_position(self):

self.assertEqual(int_token.position.line, 1)
self.assertEqual(int_token.position.column, 1)
self.assertEqual(code[int_token.position.range], 'int')

self.assertEqual(j_token.position.line, 1)
self.assertEqual(j_token.position.column, 19)
self.assertEqual(code[j_token.position.range], 'j')

self.assertEqual(semi_token.position.line, 1)
self.assertEqual(semi_token.position.column, 20)
self.assertEqual(code[semi_token.position.range], ';')

def test_multiline_inline_comment(self):
code = """int /*
Expand All @@ -167,6 +170,8 @@ def test_multiline_inline_comment(self):

self.assertEqual(token_j.position.line, 4)
self.assertEqual(token_j.position.column, 4)
self.assertEqual(token_j.position.range, slice(22, 23))
self.assertEqual(code[token_j.position.range], 'j')

def test_multiline_inline_comment_end_of_input(self):
code = """int /*
Expand All @@ -180,6 +185,8 @@ def test_multiline_inline_comment_end_of_input(self):
self.assertEqual(token_int.position.line, 1)
self.assertEqual(token_int.position.column, 1)

self.assertEqual(token_int.position.range, slice(0, 3))

def test_column_starts_at_one(self):
code = """int j;
int k;
Expand All @@ -188,5 +195,11 @@ def test_column_starts_at_one(self):
self.assertEqual(token[0].position.column, 1)
self.assertEqual(token[3].position.column, 1)

self.assertEqual(token[0].position.range, slice(0, 3))
self.assertEqual(token[3].position.range, slice(7, 10))

self.assertEqual(code[token[0].position.range], "int")
self.assertEqual(code[token[3].position.range], "int")

if __name__=="__main__":
unittest.main()
4 changes: 2 additions & 2 deletions javalang/tokenizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class LexerError(Exception):
pass

Position = namedtuple('Position', ['line', 'column'])
Position = namedtuple('Position', ['line', 'column', 'range'])

class JavaToken(object):
def __init__(self, value, position=None, javadoc=None):
Expand Down Expand Up @@ -548,7 +548,7 @@ def tokenize(self):
self.i = self.i + 1
continue

position = Position(self.current_line, self.i - self.start_of_line)
position = Position(self.current_line, self.i - self.start_of_line, slice(self.i, self.j))
token = token_type(self.data[self.i:self.j], position, self.javadoc)
yield token

Expand Down