language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-12-23 08:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #8353 from FabHof/dollar-fix

Browse source 
Fix $if is not if, but a LowerIdent
This commit is contained in:
Anton-4 2025-11-07 10:46:13 +01:00 • committed by GitHub
commit c4148bbf96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/parse/tokenize.zig
View file

@ -688,7 +688,7 @@ pub const Cursor = struct {
/// Returns either the original token hypothesis, or a malformed token tag.
pub fn chompNumberSuffix(self: *Cursor, hypothesis: Token.Tag) Token.Tag {
if (self.peek()) |c| {
const is_ident_char = (c >= 'a' and c <= 'z') or (c >= 'A' and c <= 'Z') or (c >= '0' and c <= '9') or c == '_' or c >= 0x80;
const is_ident_char = (c >= 'a' and c <= 'z') or (c >= 'A' and c <= 'Z') or (c >= '0' and c <= '9') or c == '_' or c == '$' or c >= 0x80;
if (!is_ident_char) {
return hypothesis;
}
@ -1465,13 +1465,12 @@ pub const Tokenizer = struct {
if (next) |n| {
if (n >= 'a' and n <= 'z') {
// Dollar sign followed by lowercase letter - reusable identifier
var tag: Token.Tag = .LowerIdent;
self.cursor.pos += 1;
const tag = self.cursor.chompIdentLower();
if (tag == .LowerIdent or tag == .MalformedUnicodeIdent) {
try self.pushTokenInternedHere(gpa, tag, start, start);
} else {
try self.pushTokenNormalHere(gpa, tag, start);
if (!self.cursor.chompIdentGeneral()) {
tag = .MalformedUnicodeIdent;
}
try self.pushTokenInternedHere(gpa, tag, start, start);
} else if (n >= 'A' and n <= 'Z') {
// Dollar sign followed by uppercase letter - reusable identifier
var tag: Token.Tag = .UpperIdent;