fix identifiers containing end

ionide · Sep 9, 2024 · 6e080c3 · 6e080c3
1 parent 33b584d
commit 6e080c3
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 10 deletions.
diff --git a/common/scanner.h b/common/scanner.h
@@ -512,16 +512,17 @@ static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols) {
       advance(lexer);
       if (lexer->lookahead == 'd') {
         advance(lexer);
-        if (valid_symbols[END]) {
-          lexer->mark_end(lexer);
-          lexer->result_symbol = END;
-          return true;
-        } else if (valid_symbols[DEDENT] && scanner->indents.size > 0) {
-          array_pop(&scanner->indents);
-          lexer->result_symbol = DEDENT;
-          return true;
-        } else {
-          return false;
+        if (lexer->lookahead == ' ' || lexer->lookahead == '\n' ||
+            lexer->eof(lexer)) {
+          if (valid_symbols[END]) {
+            lexer->mark_end(lexer);
+            lexer->result_symbol = END;
+            return true;
+          } else if (valid_symbols[DEDENT] && scanner->indents.size > 0) {
+            array_pop(&scanner->indents);
+            lexer->result_symbol = DEDENT;
+            return true;
+          }
         }
       }
     }

diff --git a/test/corpus/expr.txt b/test/corpus/expr.txt
@@ -3616,3 +3616,57 @@ let implementer() =
                 (unit))
               (const
                 (unit)))))))))
+
+================================================================================
+scoping issues with end indentifier
+================================================================================
+
+let f x =
+    x
+    |> List.map (fun endpoint ->
+        match endpoint with
+        | A -> f endpoints)
+    |> g
+
+--------------------------------------------------------------------------------
+
+(file
+  (value_declaration
+    (function_or_value_defn
+      (function_declaration_left
+        (identifier)
+        (argument_patterns
+          (long_identifier
+            (identifier))))
+      (infix_expression
+        (application_expression
+          (infix_expression
+            (long_identifier_or_op
+              (identifier))
+            (infix_op)
+            (long_identifier_or_op
+              (long_identifier
+                (identifier)
+                (identifier))))
+          (paren_expression
+            (fun_expression
+              (argument_patterns
+                (long_identifier
+                  (identifier)))
+              (match_expression
+                (long_identifier_or_op
+                  (identifier))
+                (rules
+                  (rule
+                    (identifier_pattern
+                      (long_identifier_or_op
+                        (identifier)))
+                    (application_expression
+                      (long_identifier_or_op
+                        (identifier))
+                      (long_identifier_or_op
+                        (identifier)))))))))
+        (infix_op)
+        (long_identifier_or_op
+          (long_identifier
+            (identifier)))))))