Merge pull request #77 from SSlinky/hotfix

SSlinky · web-flow · commit 5f2fb322d071 · 2025-04-26T15:00:21.000+09:00
Hotfix error reset
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
 	"icon": "images/vba-lsp-icon.png",
 	"author": "SSlinky",
 	"license": "MIT",
-	"version": "1.5.10",
+	"version": "1.5.11",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SSlinky/VBA-LanguageServer"
diff --git a/server/src/antlr/vba.g4 b/server/src/antlr/vba.g4
@@ -42,7 +42,10 @@ classBeginBlock
     ;
 
 beginBlockConfigElement
-    : endOfLine+ (OBJECT '.')? '_'? ambiguousIdentifier WS? eqOperator WS? (expression | FILEOFFSET)
+    : endOfLine+ (OBJECT '.')? '_'? ambiguousIdentifier WS? eqOperator WS? (
+        expression
+        | FILEOFFSET
+    )
     | formBeginBlock
     | beginPropertyBlock
     ;
@@ -858,6 +861,10 @@ identifierStatementLabel
     : ambiguousIdentifier
     ;
 
+resetNumberLable
+    : MINUS INTEGERLITERAL
+    ;
+
 lineNumberLabel
     : INTEGERLITERAL
     ;
@@ -1305,6 +1312,7 @@ onErrorStatement
 errorBehavior
     : RESUME wsc NEXT
     | GOTO wsc? statementLabel
+    | GOTO wsc? resetNumberLable
     ;
 
 // 5.4.4.2 Resume Statement

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,10 @@ classBeginBlock`
`42`	`42`	`;`
`43`	`43`
`44`	`44`	`beginBlockConfigElement`
`45`		`- : endOfLine+ (OBJECT '.')? '_'? ambiguousIdentifier WS? eqOperator WS? (expression \| FILEOFFSET)`
	`45`	`+ : endOfLine+ (OBJECT '.')? '_'? ambiguousIdentifier WS? eqOperator WS? (`
	`46`	`+ expression`
	`47`	`+ \| FILEOFFSET`
	`48`	`+ )`
`46`	`49`	`\| formBeginBlock`
`47`	`50`	`\| beginPropertyBlock`
`48`	`51`	`;`
`@@ -858,6 +861,10 @@ identifierStatementLabel`
`858`	`861`	`: ambiguousIdentifier`
`859`	`862`	`;`
`860`	`863`
	`864`	`+resetNumberLable`
	`865`	`+ : MINUS INTEGERLITERAL`
	`866`	`+ ;`
	`867`	`+`
`861`	`868`	`lineNumberLabel`
`862`	`869`	`: INTEGERLITERAL`
`863`	`870`	`;`
`@@ -1305,6 +1312,7 @@ onErrorStatement`
`1305`	`1312`	`errorBehavior`
`1306`	`1313`	`: RESUME wsc NEXT`
`1307`	`1314`	`\| GOTO wsc? statementLabel`
	`1315`	`+ \| GOTO wsc? resetNumberLable`
`1308`	`1316`	`;`
`1309`	`1317`
`1310`	`1318`	`// 5.4.4.2 Resume Statement`