language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Make Position::{line, column} fields private

Browse source
This commit is contained in:
Joshua Warner 2021-12-23 20:44:43 -08:00
parent fae1bb4458
commit 443d738f9b
5 changed files with 115 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/fmt/src/expr.rs
View file

@ -514,11 +514,10 @@ fn fmt_when<'a, 'buf>(
let patterns = &branch.patterns;
let expr = &branch.value;
let (first_pattern, rest) = patterns.split_first().unwrap();
let is_multiline = match rest.last() {
None => false,
Some(last_pattern) => {
first_pattern.region.start().line != last_pattern.region.end().line
}
let is_multiline = if rest.is_empty() {
false
} else {
patterns.iter().any(|p| p.is_multiline())
};
fmt_pattern(

13
compiler/parse/src/state.rs
View file

@ -40,10 +40,7 @@ impl<'a> State<'a> {
/// Returns the current position
pub const fn pos(&self) -> Position {
Position {
line: self.xyzlcol.line,
column: self.xyzlcol.column,
}
Position::new(self.xyzlcol.line, self.xyzlcol.column)
}
/// Returns whether the parser has reached the end of the input
@ -97,14 +94,14 @@ impl<'a> State<'a> {
pub fn len_region(&self, length: u16) -> Region {
Region::new(
self.pos(),
Position {
line: self.xyzlcol.line,
column: self
Position::new(
self.xyzlcol.line,
self
.xyzlcol
.column
.checked_add(length)
.unwrap_or_else(|| panic!("len_region overflowed")),
},
),
)
}

38
compiler/region/src/all.rs
View file

@ -154,8 +154,8 @@ impl fmt::Debug for Region {
#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash, Default)]
pub struct Position {
pub line: u32,
pub column: u16,
line: u32,
column: u16,
}
impl Position {
@ -163,12 +163,12 @@ impl Position {
Position { line: 0, column: 0 }
}
pub fn new(line: u32, column: u16) -> Position {
pub const fn new(line: u32, column: u16) -> Position {
Position { line, column }
}
#[must_use]
pub fn bump_column(self, count: u16) -> Self {
pub const fn bump_column(self, count: u16) -> Self {
Self {
line: self.line,
column: self.column + count,
@ -191,6 +191,14 @@ impl Position {
column: 0,
}
}
#[must_use]
pub const fn sub(self, count: u16) -> Self {
Self {
line: self.line,
column: self.column - count,
}
}
}
impl Debug for Position {
@ -212,6 +220,14 @@ impl LineColumn {
column: 0,
}
}
#[must_use]
pub const fn bump_column(self, count: u16) -> Self {
Self {
line: self.line,
column: self.column + count,
}
}
}
#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash, Default)]
@ -221,6 +237,13 @@ pub struct LineColumnRegion {
}
impl LineColumnRegion {
pub const fn new(start: LineColumn, end: LineColumn) -> Self {
LineColumnRegion {
start,
end,
}
}
pub const fn zero() -> Self {
LineColumnRegion {
start: LineColumn::zero(),
@ -245,6 +268,13 @@ impl LineColumnRegion {
}
}
pub const fn from_pos(pos: LineColumn) -> Self {
Self {
start: pos,
end: pos.bump_column(1),
}
}
pub fn is_empty(&self) -> bool {
self.end.line == self.start.line && self.start.column == self.end.column
}

11
reporting/src/error/canonicalize.rs
View file

@ -2,7 +2,7 @@ use roc_collections::all::MutSet;
use roc_module::ident::{Ident, Lowercase, ModuleName};
use roc_problem::can::PrecedenceProblem::BothNonAssociative;
use roc_problem::can::{BadPattern, FloatErrorKind, IntErrorKind, Problem, RuntimeError};
use roc_region::all::{Loc, Position, Region, LineInfo};
use roc_region::all::{Loc, Region, LineInfo, LineColumn};
use std::path::PathBuf;
use crate::error::r#type::suggest;
@ -570,7 +570,7 @@ fn to_bad_ident_expr_report<'b>(
BadPrivateTag(pos) => {
use BadIdentNext::*;
match what_is_next(alloc.src_lines, pos) {
match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
LowercaseAccess(width) => {
let region = Region::new(pos, pos.bump_column(width));
alloc.stack(vec![
@ -694,10 +694,7 @@ fn to_bad_ident_pattern_report<'b>(
}
Underscore(pos) => {
let region = Region::from_pos(Position {
line: pos.line,
column: pos.column - 1,
});
let region = Region::from_pos(pos.sub(1));
alloc.stack(vec![
alloc.reflow("I am trying to parse an identifier here:"),
@ -722,7 +719,7 @@ enum BadIdentNext<'a> {
Other(Option<char>),
}
fn what_is_next<'a>(source_lines: &'a [&'a str], pos: Position) -> BadIdentNext<'a> {
fn what_is_next<'a>(source_lines: &'a [&'a str], pos: LineColumn) -> BadIdentNext<'a> {
let row_index = pos.line as usize;
let col_index = pos.column as usize;
match source_lines.get(row_index) {

132
reporting/src/error/parse.rs
View file

@ -1,5 +1,5 @@
use roc_parse::parser::{ParseProblem, SyntaxError};
use roc_region::all::{Position, Region, LineInfo};
use roc_region::all::{Position, Region, LineInfo, LineColumn, LineColumnRegion};
use std::path::PathBuf;
use crate::report::{Report, RocDocAllocator, RocDocBuilder, Severity};
@ -102,9 +102,10 @@ fn to_syntax_report<'a>(
severity: Severity::RuntimeError,
}
}
Unexpected(mut region) => {
Unexpected(region) => {
let mut region = lines.convert_region(*region);
if region.start().column == region.end().column {
region = Region::new(region.start(), region.end().bump_column(1));
region = LineColumnRegion::new(region.start(), region.end().bump_column(1));
}
let doc = alloc.stack(vec![
@ -113,7 +114,7 @@ fn to_syntax_report<'a>(
// context(alloc, &parse_problem.context_stack, "here"),
alloc.text(":"),
]),
alloc.region(lines.convert_region(region)),
alloc.region(region),
]);
report(doc)
@ -537,7 +538,7 @@ fn to_lambda_report<'a>(
use roc_parse::parser::ELambda;
match *parse_problem {
ELambda::Arrow(pos) => match what_is_next(alloc.src_lines, pos) {
ELambda::Arrow(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Token("=>") => {
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
@ -584,7 +585,7 @@ fn to_lambda_report<'a>(
}
},
ELambda::Comma(pos) => match what_is_next(alloc.src_lines, pos) {
ELambda::Comma(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Token("=>") => {
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
@ -631,7 +632,7 @@ fn to_lambda_report<'a>(
}
},
ELambda::Arg(pos) => match what_is_next(alloc.src_lines, pos) {
ELambda::Arg(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Other(Some(',')) => {
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
@ -1005,7 +1006,7 @@ fn to_list_report<'a>(
pos,
),
EList::Open(pos) | EList::End(pos) => match what_is_next(alloc.src_lines, pos) {
EList::Open(pos) | EList::End(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Other(Some(',')) => {
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
@ -1217,7 +1218,7 @@ fn to_when_report<'a>(
use roc_parse::parser::EWhen;
match *parse_problem {
EWhen::IfGuard(nested, pos) => match what_is_next(alloc.src_lines, pos) {
EWhen::IfGuard(nested, pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Token("->") => {
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
@ -1402,7 +1403,7 @@ fn to_unfinished_when_report<'a>(
start: Position,
message: RocDocBuilder<'a>,
) -> Report<'a> {
match what_is_next(alloc.src_lines, pos) {
match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Token("->") => to_unexpected_arrow_report(alloc, lines, filename, pos, start),
_ => {
@ -1558,14 +1559,14 @@ fn to_precord_report<'a>(
use roc_parse::parser::PRecord;
match *parse_problem {
PRecord::Open(pos) => match what_is_next(alloc.src_lines, pos) {
PRecord::Open(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Keyword(keyword) => {
let surroundings = Region::new(start, pos);
let region = to_keyword_region(pos, keyword);
let region = to_keyword_region(lines.convert_pos(pos), keyword);
let doc = alloc.stack(vec![
alloc.reflow(r"I just started parsing a record pattern, but I got stuck on this field name:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow(r"Looks like you are trying to use "),
alloc.keyword(keyword),
@ -1603,7 +1604,7 @@ fn to_precord_report<'a>(
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
match what_is_next(alloc.src_lines, pos) {
match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Other(Some(c)) if c.is_alphabetic() => {
let doc = alloc.stack(vec![
alloc.reflow(r"I am partway through parsing a record pattern, but I got stuck here:"),
@ -1645,14 +1646,14 @@ fn to_precord_report<'a>(
}
}
PRecord::Field(pos) => match what_is_next(alloc.src_lines, pos) {
PRecord::Field(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Keyword(keyword) => {
let surroundings = Region::new(start, pos);
let region = to_keyword_region(pos, keyword);
let region = to_keyword_region(lines.convert_pos(pos), keyword);
let doc = alloc.stack(vec![
alloc.reflow(r"I just started parsing a record pattern, but I got stuck on this field name:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow(r"Looks like you are trying to use "),
alloc.keyword(keyword),
@ -1735,16 +1736,16 @@ fn to_precord_report<'a>(
}
}
PRecord::IndentEnd(pos) => match next_line_starts_with_close_curly(alloc.src_lines, pos) {
PRecord::IndentEnd(pos) => match next_line_starts_with_close_curly(alloc.src_lines, lines.convert_pos(pos)) {
Some(curly_pos) => {
let surroundings = Region::new(start, curly_pos);
let region = Region::from_pos(curly_pos);
let surroundings = LineColumnRegion::new(lines.convert_pos(start), curly_pos);
let region = LineColumnRegion::from_pos(curly_pos);
let doc = alloc.stack(vec![
alloc.reflow(
"I am partway through parsing a record pattern, but I got stuck here:",
),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(surroundings, region),
alloc.concat(vec![
alloc.reflow("I need this curly brace to be indented more. Try adding more spaces before it!"),
]),
@ -1881,16 +1882,16 @@ fn to_pattern_in_parens_report<'a>(
}
PInParens::IndentEnd(pos) => {
match next_line_starts_with_close_parenthesis(alloc.src_lines, pos) {
match next_line_starts_with_close_parenthesis(alloc.src_lines, lines.convert_pos(pos)) {
Some(curly_pos) => {
let surroundings = Region::new(start, curly_pos);
let region = Region::from_pos(curly_pos);
let surroundings = LineColumnRegion::new(lines.convert_pos(start), curly_pos);
let region = LineColumnRegion::from_pos(curly_pos);
let doc = alloc.stack(vec![
alloc.reflow(
"I am partway through parsing a pattern in parentheses, but I got stuck here:",
),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(surroundings, region),
alloc.concat(vec![
alloc.reflow("I need this parenthesis to be indented more. Try adding more spaces before it!"),
]),
@ -1951,7 +1952,7 @@ fn to_type_report<'a>(
EType::TApply(tapply, pos) => to_tapply_report(alloc, lines, filename, tapply, *pos),
EType::TInlineAlias(talias, _) => to_talias_report(alloc, lines, filename, talias),
EType::TFunctionArgument(pos) => match what_is_next(alloc.src_lines, *pos) {
EType::TFunctionArgument(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(*pos)) {
Next::Other(Some(',')) => {
let surroundings = Region::new(start, *pos);
let region = Region::from_pos(*pos);
@ -2081,14 +2082,14 @@ fn to_trecord_report<'a>(
use roc_parse::parser::ETypeRecord;
match *parse_problem {
ETypeRecord::Open(pos) => match what_is_next(alloc.src_lines, pos) {
ETypeRecord::Open(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Keyword(keyword) => {
let surroundings = Region::new(start, pos);
let region = to_keyword_region(pos, keyword);
let region = to_keyword_region(lines.convert_pos(pos), keyword);
let doc = alloc.stack(vec![
alloc.reflow(r"I just started parsing a record type, but I got stuck on this field name:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow(r"Looks like you are trying to use "),
alloc.keyword(keyword),
@ -2130,7 +2131,7 @@ fn to_trecord_report<'a>(
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
match what_is_next(alloc.src_lines, pos) {
match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Other(Some(c)) if c.is_alphabetic() => {
let doc = alloc.stack(vec![
alloc.reflow(r"I am partway through parsing a record type, but I got stuck here:"),
@ -2172,14 +2173,14 @@ fn to_trecord_report<'a>(
}
}
ETypeRecord::Field(pos) => match what_is_next(alloc.src_lines, pos) {
ETypeRecord::Field(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Keyword(keyword) => {
let surroundings = Region::new(start, pos);
let region = to_keyword_region(pos, keyword);
let region = to_keyword_region(lines.convert_pos(pos), keyword);
let doc = alloc.stack(vec![
alloc.reflow(r"I just started parsing a record type, but I got stuck on this field name:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow(r"Looks like you are trying to use "),
alloc.keyword(keyword),
@ -2254,16 +2255,16 @@ fn to_trecord_report<'a>(
}
ETypeRecord::IndentEnd(pos) => {
match next_line_starts_with_close_curly(alloc.src_lines, pos) {
match next_line_starts_with_close_curly(alloc.src_lines, lines.convert_pos(pos)) {
Some(curly_pos) => {
let surroundings = Region::new(start, curly_pos);
let region = Region::from_pos(curly_pos);
let surroundings = LineColumnRegion::new(lines.convert_pos(start), curly_pos);
let region = LineColumnRegion::from_pos(curly_pos);
let doc = alloc.stack(vec![
alloc.reflow(
"I am partway through parsing a record type, but I got stuck here:",
),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(surroundings, region),
alloc.concat(vec![
alloc.reflow("I need this curly brace to be indented more. Try adding more spaces before it!"),
]),
@ -2326,14 +2327,14 @@ fn to_ttag_union_report<'a>(
use roc_parse::parser::ETypeTagUnion;
match *parse_problem {
ETypeTagUnion::Open(pos) => match what_is_next(alloc.src_lines, pos) {
ETypeTagUnion::Open(pos) => match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Keyword(keyword) => {
let surroundings = Region::new(start, pos);
let region = to_keyword_region(pos, keyword);
let region = to_keyword_region(lines.convert_pos(pos), keyword);
let doc = alloc.stack(vec![
alloc.reflow(r"I just started parsing a tag union, but I got stuck on this field name:"),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow(r"Looks like you are trying to use "),
alloc.keyword(keyword),
@ -2397,7 +2398,7 @@ fn to_ttag_union_report<'a>(
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
match what_is_next(alloc.src_lines, pos) {
match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Other(Some(c)) if c.is_alphabetic() => {
debug_assert!(c.is_lowercase());
@ -2483,16 +2484,16 @@ fn to_ttag_union_report<'a>(
}
ETypeTagUnion::IndentEnd(pos) => {
match next_line_starts_with_close_square_bracket(alloc.src_lines, pos) {
match next_line_starts_with_close_square_bracket(alloc.src_lines, lines.convert_pos(pos)) {
Some(curly_pos) => {
let surroundings = Region::new(start, curly_pos);
let region = Region::from_pos(curly_pos);
let surroundings = LineColumnRegion::new(lines.convert_pos(start), curly_pos);
let region = LineColumnRegion::from_pos(curly_pos);
let doc = alloc.stack(vec![
alloc.reflow(
"I am partway through parsing a tag union type, but I got stuck here:",
),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(surroundings, region),
alloc.concat(vec![
alloc.reflow("I need this square bracket to be indented more. Try adding more spaces before it!"),
]),
@ -2548,14 +2549,14 @@ fn to_tinparens_report<'a>(
match *parse_problem {
ETypeInParens::Open(pos) => {
match what_is_next(alloc.src_lines, pos) {
match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Keyword(keyword) => {
let surroundings = Region::new(start, pos);
let region = to_keyword_region(pos, keyword);
let region = to_keyword_region(lines.convert_pos(pos), keyword);
let doc = alloc.stack(vec![
alloc.reflow(r"I just saw an open parenthesis, so I was expecting to see a type next."),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(lines.convert_region(surroundings), region),
alloc.concat(vec![
alloc.reflow(r"Something like "),
alloc.parser_suggestion("(List Person)"),
@ -2623,7 +2624,7 @@ fn to_tinparens_report<'a>(
let surroundings = Region::new(start, pos);
let region = Region::from_pos(pos);
match what_is_next(alloc.src_lines, pos) {
match what_is_next(alloc.src_lines, lines.convert_pos(pos)) {
Next::Other(Some(c)) if c.is_alphabetic() => {
debug_assert!(c.is_lowercase());
@ -2694,16 +2695,16 @@ fn to_tinparens_report<'a>(
}
ETypeInParens::IndentEnd(pos) => {
match next_line_starts_with_close_parenthesis(alloc.src_lines, pos) {
match next_line_starts_with_close_parenthesis(alloc.src_lines, lines.convert_pos(pos)) {
Some(curly_pos) => {
let surroundings = Region::new(start, curly_pos);
let region = Region::from_pos(curly_pos);
let surroundings = LineColumnRegion::new(lines.convert_pos(start), curly_pos);
let region = LineColumnRegion::from_pos(curly_pos);
let doc = alloc.stack(vec![
alloc.reflow(
"I am partway through parsing a type in parentheses, but I got stuck here:",
),
alloc.region_with_subregion(lines.convert_region(surroundings), lines.convert_region(region)),
alloc.region_with_subregion(surroundings, region),
alloc.concat(vec![
alloc.reflow("I need this parenthesis to be indented more. Try adding more spaces before it!"),
]),
@ -3505,7 +3506,7 @@ enum Next<'a> {
Other(Option<char>),
}
fn what_is_next<'a>(source_lines: &'a [&'a str], pos: Position) -> Next<'a> {
fn what_is_next<'a>(source_lines: &'a [&'a str], pos: LineColumn) -> Next<'a> {
let row_index = pos.line as usize;
let col_index = pos.column as usize;
match source_lines.get(row_index) {
@ -3547,36 +3548,36 @@ pub fn starts_with_keyword(rest_of_line: &str, keyword: &str) -> bool {
}
}
fn next_line_starts_with_close_curly(source_lines: &[&str], pos: Position) -> Option<Position> {
fn next_line_starts_with_close_curly(source_lines: &[&str], pos: LineColumn) -> Option<LineColumn> {
next_line_starts_with_char(source_lines, pos, '}')
}
fn next_line_starts_with_close_parenthesis(
source_lines: &[&str],
pos: Position,
) -> Option<Position> {
pos: LineColumn,
) -> Option<LineColumn> {
next_line_starts_with_char(source_lines, pos, ')')
}
fn next_line_starts_with_close_square_bracket(
source_lines: &[&str],
pos: Position,
) -> Option<Position> {
pos: LineColumn,
) -> Option<LineColumn> {
next_line_starts_with_char(source_lines, pos, ']')
}
fn next_line_starts_with_char(
source_lines: &[&str],
pos: Position,
pos: LineColumn,
character: char,
) -> Option<Position> {
) -> Option<LineColumn> {
match source_lines.get(pos.line as usize + 1) {
None => None,
Some(line) => {
let spaces_dropped = line.trim_start_matches(' ');
match spaces_dropped.chars().next() {
Some(c) if c == character => Some(Position {
Some(c) if c == character => Some(LineColumn {
line: pos.line + 1,
column: (line.len() - spaces_dropped.len()) as u16,
}),
@ -3586,6 +3587,9 @@ fn next_line_starts_with_char(
}
}
fn to_keyword_region(pos: Position, keyword: &str) -> Region {
Region::new(pos, pos.bump_column(keyword.len() as u16))
fn to_keyword_region(pos: LineColumn, keyword: &str) -> LineColumnRegion {
LineColumnRegion {
start: pos,
end: pos.bump_column(keyword.len() as u16)
}
}