language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 22:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Assert new column calculation is correct

Browse source
This commit is contained in:
Joshua Warner 2021-12-24 07:58:33 -08:00
parent 422cdea112
commit 2901549422
3 changed files with 64 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/parse/src/blankspace.rs
View file

@ -210,7 +210,7 @@ where
}
Good {
xyzcol: pos,
state: new_state,
state: mut new_state,
multiline,
comments_and_newlines,
} => {
@ -219,21 +219,23 @@ where
} else if multiline {
// we parsed at least one newline
state.indent_column = pos.column;
new_state.indent_column = pos.column;
if pos.column >= min_indent {
state.xyzlcol = pos;
state = state.advance(state.bytes().len() - new_state.bytes().len());
new_state.xyzlcol = pos;
// state = state.advance(state.bytes().len() - new_state.bytes().len());
// assert_eq!(state.bytes().len(), new_state.bytes().len());
Ok((MadeProgress, comments_and_newlines.into_bump_slice(), state))
Ok((MadeProgress, comments_and_newlines.into_bump_slice(), new_state))
} else {
Err((MadeProgress, indent_problem(state.pos()), state))
}
} else {
state.xyzlcol.column = pos.column;
state = state.advance(state.bytes().len() - new_state.bytes().len());
new_state.xyzlcol.column = pos.column;
// state = state.advance(state.bytes().len() - new_state.bytes().len());
// assert_eq!(state.bytes().len(), new_state.bytes().len());
Ok((MadeProgress, comments_and_newlines.into_bump_slice(), state))
Ok((MadeProgress, comments_and_newlines.into_bump_slice(), new_state))
}
}
}