Merge pull request #16 from 1c-syntax/fix/addhandler

FIX #15 addHandler
1c-syntax · Feb 17, 2019 · aaf6875 · aaf6875
2 parents 59200c2 + 2e2e895
commit aaf6875
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/main/antlr/BSLParser.g4 b/src/main/antlr/BSLParser.g4
@@ -174,10 +174,10 @@ handler
     : expression
     ;
 addHandlerStatement
-    : ADDHANDLER_KEYWORD event handler
+    : ADDHANDLER_KEYWORD event COMMA handler
     ;
 removeHandlerStatement
-    : REMOVEHANDLER_KEYWORD event handler
+    : REMOVEHANDLER_KEYWORD event COMMA handler
     ;
 
 ternaryOperator   : QUESTION LPAREN expression COMMA expression COMMA expression RPAREN;

diff --git a/src/test/java/org/github/_1c_syntax/bsl/parser/BSLLexerTest.java b/src/test/java/org/github/_1c_syntax/bsl/parser/BSLLexerTest.java
@@ -221,4 +221,12 @@ void testMark() {
     assertMatch("~Выполнить", BSLLexer.TILDA, BSLLexer.IDENTIFIER);
   }
 
+  @Test
+  void testHandlers() {
+    assertMatch("ДобавитьОбработчик", BSLLexer.ADDHANDLER_KEYWORD);
+    assertMatch("AddHandler", BSLLexer.ADDHANDLER_KEYWORD);
+    assertMatch("УдалитьОбработчик", BSLLexer.REMOVEHANDLER_KEYWORD);
+    assertMatch("RemoveHandler", BSLLexer.REMOVEHANDLER_KEYWORD);
+  }
+
 }
diff --git a/src/test/java/org/github/_1c_syntax/bsl/parser/BSLParserTest.java b/src/test/java/org/github/_1c_syntax/bsl/parser/BSLParserTest.java
@@ -312,4 +312,15 @@ void tesLabel() {
 
   }
 
+  @Test
+  void testHandler() {
+    setInput("ДобавитьОбработчик Событие, Тест2;");
+    assertMatches(parser.addHandlerStatement());
+    setInput("ДобавитьОбработчик Параметр.Событие, Тест2;");
+    assertMatches(parser.addHandlerStatement());
+    setInput("УдалитьОбработчик Событие, Тест2;");
+    assertMatches(parser.removeHandlerStatement());
+
+  }
+
 }