Feature/issue 1508 semicolon extra and missing

bundles/com.e1c.v8codestyle.bsl.ui/plugin.xml

@@ -374,6 +374,8 @@
     <fix class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.bsl.ui.qfix.SelfAssignFix"/>
     <fix class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.bsl.ui.qfix.UndefinedFunctionFix"/>
     <fix class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.bsl.ui.qfix.UndefinedVariableFix"/>
+    <fix class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.bsl.ui.qfix.MethodSemicolonExtraFix"/>
+    <fix class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.bsl.ui.qfix.SemicolonMissingFix"/>
     <fix
           class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.bsl.ui.qfix.SelfReferenceFix">
     </fix>

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/Messages.java

@@ -44,6 +44,12 @@ final class Messages
 
     public static String OpenBslDocCommentViewFix_Details;
 
+    public static String MethodSemicolonExtraFix_Details;
+    public static String MethodSemicolonExtraFix_Description;
+
+    public static String SemicolonMissngFix_Details;
+    public static String SemicolonMissingFix_Description;
+
     public static String SelfReferenceFix_description;
 
     public static String SelfReferenceFix_details;

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/MethodSemicolonExtraFix.java

@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (C) 2025, 1C-Soft LLC and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     1C-Soft LLC - initial API and implementation
+ *******************************************************************************/
+package com.e1c.v8codestyle.bsl.ui.qfix;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.text.edits.DeleteEdit;
+import org.eclipse.text.edits.TextEdit;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.resource.XtextResource;
+
+import com._1c.g5.v8.dt.bsl.model.EmptyStatement;
+import com.e1c.g5.v8.dt.bsl.check.qfix.IXtextBslModuleFixModel;
+import com.e1c.g5.v8.dt.bsl.check.qfix.SingleVariantXtextBslModuleFix;
+import com.e1c.g5.v8.dt.check.qfix.components.QuickFix;
+
+/**
+ * Removes extra semicolon
+ *
+ *  @author Ivan Sergeev
+ */
+@QuickFix(checkId = "method-semicolon-extra", supplierId = "com.e1c.v8codestyle.bsl")
+public class MethodSemicolonExtraFix
+    extends SingleVariantXtextBslModuleFix
+{
+
+    @Override
+    protected void configureFix(FixConfigurer configurer)
+    {
+        configurer.interactive(true)
+            .description(Messages.MethodSemicolonExtraFix_Description)
+            .details(Messages.MethodSemicolonExtraFix_Description);
+    }
+
+    @Override
+    protected TextEdit fixIssue(XtextResource state, IXtextBslModuleFixModel model) throws BadLocationException
+    {
+        EObject eobject = model.getElement();
+
+        if (!(eobject instanceof EmptyStatement))
+        {
+            return null;
+        }
+
+        INode node = NodeModelUtils.findActualNodeFor(eobject);
+
+        if (node == null)
+        {
+            return null;
+        }
+        INode checkNode = node.getNextSibling();
+        if (checkNode == null)
+        {
+            return null;
+        }
+        String checkText = checkNode.getText();
+        INode checkNextNode = checkNode.getNextSibling();
+        if (checkText.contains(";")) //$NON-NLS-1$
+        {
+            return new DeleteEdit(checkNode.getTotalOffset(), checkNode.getTotalLength());
+        }
+        else if (checkNextNode.getText().contains(";") && !(checkNextNode == null)) //$NON-NLS-1$
+        {
+            return new DeleteEdit(checkNextNode.getTotalOffset(), checkNextNode.getTotalLength());
+        }
+        return null;
+    }
+}

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/SemicolonMissingFix.java

@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (C) 2025, 1C-Soft LLC and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     1C-Soft LLC - initial API and implementation
+ *******************************************************************************/
+package com.e1c.v8codestyle.bsl.ui.qfix;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.text.edits.InsertEdit;
+import org.eclipse.text.edits.TextEdit;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.eclipse.xtext.resource.XtextResource;
+
+import com._1c.g5.v8.dt.bsl.model.Conditional;
+import com._1c.g5.v8.dt.bsl.model.Statement;
+import com.e1c.g5.v8.dt.bsl.check.qfix.IXtextBslModuleFixModel;
+import com.e1c.g5.v8.dt.bsl.check.qfix.SingleVariantXtextBslModuleFix;
+import com.e1c.g5.v8.dt.check.qfix.components.QuickFix;
+
+/**
+ * Add missing semicolon
+ *
+ *  @author Ivan Sergeev
+ */
+@QuickFix(checkId = "semicolon-missing", supplierId = "com.e1c.v8codestyle.bsl")
+public class SemicolonMissingFix
+    extends SingleVariantXtextBslModuleFix
+{
+
+    @Override
+    protected void configureFix(FixConfigurer configurer)
+    {
+        configurer.interactive(true)
+            .description(Messages.SemicolonMissingFix_Description)
+            .details(Messages.SemicolonMissngFix_Details);
+    }
+
+    @Override
+    protected TextEdit fixIssue(XtextResource state, IXtextBslModuleFixModel model) throws BadLocationException
+    {
+        EObject eobject = model.getElement();
+        if (!(eobject instanceof Statement) & !(eobject instanceof Conditional))
+        {
+            return null;
+        }
+
+        INode node = NodeModelUtils.findActualNodeFor(eobject);
+        if (node == null)
+        {
+            return null;
+        }
+        return new InsertEdit(node.getEndOffset(), ";"); //$NON-NLS-1$
+    }
+}

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/messages.properties

@@ -23,6 +23,10 @@ ManagerModuleNamedSelfReferenceFix_description=Remove excessive named self refer
 ManagerModuleNamedSelfReferenceFix_details=Remove excessive named self reference from manager module
 OpenBslDocCommentViewFix_Details=Open documentation comment data structure view and show current probleme object.
 OpenBslDocCommentViewFix_Description=Open documentation comment structure view
+MethodSemicolonExtraFix_Details = Remove extra semicolon
+MethodSemicolonExtraFix_Description = Remove extra semicolon
+SemicolonMissingFix_Details = Add missing semicolon
+SemicolonMissingFix_Description = Add missing semicolon
 SelfReferenceFix_description=Remove excessive self reference
 SelfReferenceFix_details=Remove excessive self reference
 SelfAssignFix_Description = Remove self-assign variable

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/messages_ru.properties

@@ -41,6 +41,14 @@ ServerExecutionSafeModeFix_description = Включить безопасный 
 
 ServerExecutionSafeModeFix_details = Добавить включение безопасного режима перед вызовом метода "Выполнить" или "Вычислить"
 
+MethodSemicolonExtraFix_Details = Удалить лишнюю точку с запятой
+
+MethodSemicolonExtraFix_Description = Удалить лишнюю точку с запятой
+
+SemicolonMissingFix_Details = Добавить пропущенную точку с запятой
+
+SemicolonMissingFix_Description = Добавить пропущенную точку с запятой
+
 UndefinedMethodFix_func_desc = Создать новую функцию в модуле
 
 UndefinedMethodFix_func_title = Создать функцию

bundles/com.e1c.v8codestyle.bsl/markdown/method-semicolon-extra.md

@@ -0,0 +1,19 @@
+# Exta semicolon at the end of method declaration
+
+A semicolon at the end of a method declaration is not an error, but its absence is preferable.
+
+## Noncompliant Code Example
+
+Procedure procedureName(Parameters);
+
+    A = 1;
+
+EndProcedure
+
+## Compliant Solution
+
+Procedure procedureName(Parameters)
+
+    A = 1;
+
+EndProcedure

bundles/com.e1c.v8codestyle.bsl/markdown/ru/method-semicolon-extra.md

@@ -0,0 +1,23 @@
+# Лишняя точка с запятой в конце объявления метода
+
+Точка с запятой в конце объявления метода не является ошибкой но предпочтительно отсутствие.
+
+## Неправильно
+
+Например, неправильно:
+
+Процедура Ааааa();
+
+    А = 1;
+
+КонецПроцедуры
+
+## Правильно
+
+Например, правельно:
+
+Процедура Ааааa()
+
+    А = 1;
+
+КонецПроцедуры

bundles/com.e1c.v8codestyle.bsl/markdown/ru/semicolon-missing.md

@@ -0,0 +1,23 @@
+# Отсутствие точки с запятой в конце оператора
+
+Точка с запятой в конце последнего оператора блока не являеться обязательной, предпочтительно наличие.
+
+## Неправильно
+
+Например, неправильно:
+
+Процедура Ааааa()
+
+    А = 1
+
+КонецПроцедуры
+
+## Правильно
+
+Например, правельно:
+
+Процедура Ааааa()
+
+    А = 1;
+
+КонецПроцедуры

bundles/com.e1c.v8codestyle.bsl/markdown/semicolon-missing.md

@@ -0,0 +1,19 @@
+# Missing semicolon at the end of statement
+
+The semicolon at the end of the last statement is not required, but is preferred.
+
+## Noncompliant Code Example
+
+Procedure procedureName(Parameters)
+
+    A = 1
+
+EndProcedure
+
+## Compliant Solution
+
+Procedure procedureName(Parameters)
+
+    A = 1;
+
+EndProcedure

bundles/com.e1c.v8codestyle.bsl/plugin.xml

@@ -393,7 +393,11 @@
       </check>
       <check
             category="com.e1c.v8codestyle.bsl"
-            class="com.e1c.v8codestyle.internal.bsl.ExecutableExtensionFactory:com.e1c.v8codestyle.bsl.check.NotSupportGotoOperatorWebCheck">
+            class="com.e1c.v8codestyle.bsl.check.MethodSemicolonExtraCheck">
+      </check>
+      <check
+            category="com.e1c.v8codestyle.bsl"
+            class="com.e1c.v8codestyle.bsl.check.SemicolonMissingCheck">
       </check>
       <check
             category="com.e1c.v8codestyle.bsl"

bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/Messages.java

@@ -289,9 +289,11 @@ final class Messages
     public static String QueryInLoop_Loop_has_query;
     public static String QueryInLoop_title;
 
-    public static String SelfAssignCheck_Title;
-    public static String SelfAssignCheck_Description;
-    public static String SelfAssignCheck_Self_assign_issue;
+    public static String SemicolonMissingCheck_Description;
+
+    public static String SemicolonMissingCheck_Title;
+
+    public static String SemicolonMissingCheck_Issue;
 
     public static String SelfReferenceCheck_check_object_module;
 
@@ -402,6 +404,12 @@ final class Messages
 
     public static String MethodTooManyPramsCheck_title;
 
+    public static String MethodSemicolonExtraCheck_Description;
+
+    public static String MethodSemicolonExtraCheck_Title;
+
+    public static String MethodSemicolonExtraCheck_Issue;
+
     public static String MissingTemporaryFileDeletionCheck_Delete_File_Methods;
 
     public static String MissingTemporaryFileDeletionCheck_description;