Skip to content
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

Fix: Error searching for tag containing a colon #765

Merged
merged 2 commits into from
Feb 2, 2025
Merged

Fix: Error searching for tag containing a colon #765

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dec7e6
Refactor allowing colons
SkeleyM Feb 1, 2025
d797e89
fix formatting
SkeleyM Feb 1, 2025
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
25 changes: 13 additions & 12 deletions tagstudio/src/core/query_lang/tokenizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,22 +93,23 @@ def __unquoted_string_or_constraint_type(self) -> Token:

start = self.pos

while self.current_char not in self.NOT_IN_ULITERAL and self.current_char is not None:
while self.current_char is not None:
if self.current_char in self.NOT_IN_ULITERAL:
if self.current_char == ":":
if len(out) == 0:
raise ParsingError(self.pos, self.pos)
constraint_type = ConstraintType.from_string(out)
if constraint_type is not None:
self.__advance()
return Token(TokenType.CONSTRAINTTYPE, constraint_type, start, self.pos)
else:
break

out += self.current_char
self.__advance()

end = self.pos - 1

if self.current_char == ":":
if len(out) == 0:
raise ParsingError(self.pos, self.pos)
self.__advance()
constraint_type = ConstraintType.from_string(out)
if constraint_type is None:
raise ParsingError(start, end, f'Invalid ContraintType "{out}"')
return Token(TokenType.CONSTRAINTTYPE, constraint_type, start, end)
else:
return Token(TokenType.ULITERAL, out, start, end)
return Token(TokenType.ULITERAL, out, start, end)

def __quoted_string(self) -> Token:
start = self.pos
Expand Down