closes #1469 Некорректный парсинг Асинх и Ждать в обычном контексте

EvilBeaver · Jan 27, 2025 · 12bca1e · 12bca1e
1 parent fb12d30
commit 12bca1e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs b/src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs
@@ -659,6 +659,11 @@ private void DefineLabel(Lexem label)
 
         private void BuildStatement()
         {
+            if (!_isInAsyncMethod && (_lastExtractedLexem.Token == Token.Async || _lastExtractedLexem.Token == Token.Await))
+            {
+                _lastExtractedLexem.Token = Token.NotAToken;
+            }
+
             if (_lastExtractedLexem.Token == Token.NotAToken)
             {
                 BuildSimpleStatement();

diff --git a/src/Tests/OneScript.Language.Tests/ParserTests.cs b/src/Tests/OneScript.Language.Tests/ParserTests.cs
@@ -1262,7 +1262,7 @@ public void TestAwaitMustBeInAsyncOnly()
 
             CatchParsingError(code, errors =>
             {
-                errors.Single().Description.Should().Contain("Await");
+                errors.Single().ErrorId.Should().Be("ExpressionSyntax");
             });
         }
 
@@ -1398,6 +1398,27 @@ public void Goto_Can_Appear_In_CodeBlocks()
             validator.NextChildIs(NodeKind.Goto);
             validator.NextChildIs(NodeKind.Assignment);
         }
+
+        [Fact]
+        public void Async_And_Await_Are_Ordinary_Identifiers_In_NonAsync_Scope()
+        {
+            var code = @"
+                Ждать = ""МояПеременная"";
+                Асинх = ""МояПеременная2"";
+                ";
+
+            var validator = ParseBatchAndGetValidator(code);
+
+            validator.Is(NodeKind.CodeBatch);
+
+            var awaitNode = validator.NextChild().Is(NodeKind.Assignment)
+                .NextChildIs(NodeKind.Identifier)
+                .ChildItself().Value.Should().Be("Ждать");
+
+            var asyncNode = validator.NextChild().Is(NodeKind.Assignment)
+                .NextChildIs(NodeKind.Identifier)
+                .ChildItself().Value.Should().Be("Асинх");
+        }
 
         private static void CatchParsingError(string code)
         {