Skip to content

Recover unfinished binary expressions #13459

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

Closed
wants to merge 2 commits into from
Closed

Recover unfinished binary expressions #13459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a571e6e
Recover unfinished binary expressions
auduchinok Jul 7, 2022
4bce688
Tmp
auduchinok Jul 7, 2022
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
48 changes: 46 additions & 2 deletions src/Compiler/SyntaxTree/LexFilter.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,50 @@ let infixTokenLength token =
| INFIX_STAR_STAR_OP d -> d.Length
| COLON_QMARK_GREATER -> 3
| _ -> assert false; 1


let canFollowInfixToken token =
match token with
| ABSTRACT
| AND
| AND_BANG _
// | AS
| DONE
| DOWNTO
| ELIF
| ELSE
| END
| EXCEPTION
| EXTERN
| FINALLY
| IN
| INHERIT
| INLINE
| INTERFACE
| INTERNAL
| MEMBER
| MODULE
| MUTABLE
| NAMESPACE
| OF
| OPEN
| OR
| OVERRIDE
| PRIVATE
| PUBLIC
| REC
| STATIC
| THEN
| TO
| TYPE
| VAL
| VOID
| WHEN
| WITH

// | LBRACK_LESS
-> false
| _ -> true

/// Matches against a left-parenthesis-like token that is valid in expressions.
//
// LBRACK_LESS and GREATER_RBRACK are not here because adding them in these active patterns
Expand Down Expand Up @@ -2118,7 +2161,8 @@ type LexFilterImpl (

// The r.h.s. of an infix token begins a new block.
| _, ctxts when (isInfix token &&
not (isSameLine()) &&
not (isSameLine()) &&
canFollowInfixToken (peekNextToken()) &&
// This doesn't apply to the use of any infix tokens in a pattern match or 'when' block
// For example
//
Expand Down
40 changes: 20 additions & 20 deletions src/Compiler/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3906,85 +3906,85 @@ declExpr:
| declExpr INFIX_STAR_STAR_OP declExpr
{ mkSynInfix (rhs parseState 2) $1 $2 $3 }

| declExpr JOIN_IN OBLOCKEND_COMING_SOON
| declExpr JOIN_IN ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("in"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "@in" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr BAR_BAR OBLOCKEND_COMING_SOON
| declExpr BAR_BAR ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("||"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "||" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr INFIX_BAR_OP OBLOCKEND_COMING_SOON
| declExpr INFIX_BAR_OP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression($2))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 $2 (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr OR OBLOCKEND_COMING_SOON
| declExpr OR ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("or"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "or" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr AMP OBLOCKEND_COMING_SOON
| declExpr AMP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("&"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "&" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr AMP_AMP OBLOCKEND_COMING_SOON
| declExpr AMP_AMP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("&&"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "&&" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr INFIX_AMP_OP OBLOCKEND_COMING_SOON
| declExpr INFIX_AMP_OP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression($2))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 $2 (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr EQUALS OBLOCKEND_COMING_SOON
| declExpr EQUALS ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("="))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "=" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr INFIX_COMPARE_OP OBLOCKEND_COMING_SOON
| declExpr INFIX_COMPARE_OP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression($2))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 $2 (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr DOLLAR OBLOCKEND_COMING_SOON
| declExpr DOLLAR ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("$"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "$" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr LESS OBLOCKEND_COMING_SOON
| declExpr LESS ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("<"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "<" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr GREATER OBLOCKEND_COMING_SOON
| declExpr GREATER ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression(">"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 ">" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr INFIX_AT_HAT_OP OBLOCKEND_COMING_SOON
| declExpr INFIX_AT_HAT_OP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression($2))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 $2 (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr PERCENT_OP OBLOCKEND_COMING_SOON
| declExpr PERCENT_OP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression($2))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 $2 (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr COLON_COLON OBLOCKEND_COMING_SOON
| declExpr COLON_COLON ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("::"))
let identExpr = mkSynOperator (rhs parseState 2) "::"
let tupExpr = SynExpr.Tuple (false, [$1;(arbExpr("declExprInfix", (rhs parseState 3).StartRange))], [rhs parseState 2], unionRanges $1.Range (rhs parseState 3).StartRange)
SynExpr.App (ExprAtomicFlag.NonAtomic, true, identExpr, tupExpr, unionRanges $1.Range (rhs parseState 3).StartRange) }

| declExpr PLUS_MINUS_OP OBLOCKEND_COMING_SOON
| declExpr PLUS_MINUS_OP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression($2))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 $2 (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr MINUS OBLOCKEND_COMING_SOON
| declExpr MINUS ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("-"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "-" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr STAR OBLOCKEND_COMING_SOON
| declExpr STAR ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression("*"))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 "*" (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr INFIX_STAR_DIV_MOD_OP OBLOCKEND_COMING_SOON
| declExpr INFIX_STAR_DIV_MOD_OP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression($2))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 $2 (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

| declExpr INFIX_STAR_STAR_OP OBLOCKEND_COMING_SOON
| declExpr INFIX_STAR_STAR_OP ends_coming_soon_or_recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnfinishedExpression($2))
exprFromParseError(mkSynInfix (rhs parseState 2) $1 $2 (arbExpr("declExprInfix", (rhs parseState 3).StartRange))) }

Expand Down