Переход на EDT 2023.3

.gitignore

@@ -11,4 +11,6 @@ target/
 */reports
 #Mac-specific directory that no other operating system needs.
 .DS_Store
-.m2/
+.m2/
+
+org.sonarlint.eclipse.core.prefs

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ## 0.7.0
 
+Выпуск бета-версии для 1C:EDT 2023.3
 
 ### Новые проверки
 
@@ -20,6 +21,7 @@
 
 - Проверка на уникальность имени поля в doc-comment-field-name #1392
 - Проверка модификации ключей структуры вне функции-конструктора #1054
+- По умолчанию проверка "Код не должен следовать за асинхронным вызовом" (code-after-async-call) выключена. См. обсуждение в https://github.com/1C-Company/v8-code-style/pull/1408
 
 
 #### Запросы

bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF

@@ -24,17 +24,21 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0
  com._1c.g5.v8.dt.bsl.documentation.comment;version="[4.0.0,5.0.0)",
  com._1c.g5.v8.dt.bsl.formatting;version="[3.0.0,4.0.0)",
  com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)",
+ com._1c.g5.v8.dt.bsl.model.util;version="[4.7.0,5.0.0)",
+ com._1c.g5.v8.dt.bsl.resource.owner;version="[2.0.0,3.0.0)",
  com._1c.g5.v8.dt.bsl.services;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.bsl.ui;version="[9.0.0,10.0.0)",
  com._1c.g5.v8.dt.bsl.ui.contentassist;version="[8.0.0,9.0.0)",
  com._1c.g5.v8.dt.bsl.ui.editor;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.bsl.ui.event;version="[5.0.0,6.0.0)",
  com._1c.g5.v8.dt.bsl.ui.menu;version="[6.0.0,7.0.0)",
  com._1c.g5.v8.dt.bsl.ui.quickfix;version="[4.1.0,5.0.0)",
  com._1c.g5.v8.dt.bsl.util;version="[8.0.0,9.0.0)",
  com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)",
  com._1c.g5.v8.dt.core.filesystem;version="[6.0.0,7.0.0)",
  com._1c.g5.v8.dt.core.model;version="[6.0.0,7.0.0)",
  com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
+ com._1c.g5.v8.dt.form.model;version="[11.1.0,12.0.0)",
  com._1c.g5.v8.dt.lcore.nodemodel.util;version="[1.0.0,2.0.0)",
  com._1c.g5.v8.dt.lcore.ui.texteditor;version="[1.1.0,2.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",

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

@@ -390,5 +390,11 @@
           class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.bsl.ui.qfix.ServerExecutionSafeModeFix">
     </fix>
  </extension>
+ <extension
+       point="com._1c.g5.v8.dt.bsl.ui.bslModuleTextInsertInfoService">
+    <bslModuleTextInsertInfoService
+          class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.internal.bsl.ui.services.BslModuleRegionsInfoService">
+    </bslModuleTextInsertInfoService>
+ </extension>
 
 </plugin>

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

@@ -81,9 +81,6 @@ protected void configureFix(FixConfigurer configurer)
     @Override
     protected TextEdit fixIssue(XtextResource state, IXtextBslModuleFixModel model) throws BadLocationException
     {
-        IXtextInteractiveBslModuleFixModel interactiveModel = (IXtextInteractiveBslModuleFixModel)model;
-
-        Integer offset = model.getIssue().getOffset() + 1;
         Display display = PlatformUI.getWorkbench().getDisplay();
         if (display.isDisposed())
         {
@@ -101,13 +98,18 @@ protected TextEdit fixIssue(XtextResource state, IXtextBslModuleFixModel model)
             }
         });
 
+        IXtextInteractiveBslModuleFixModel interactiveModel = (IXtextInteractiveBslModuleFixModel)model;
+        Integer offset = model.getIssue().getOffset() + 1;
         ITextViewer viewer = BslQuickFixUtil.getTextViewer(interactiveModel.getModificationContext());
         if (viewer != null && !display.isDisposed())
         {
             display.asyncExec(() -> {
-                viewer.revealRange(offset, 1);
-                viewer.getTextWidget().setFocus();
-                viewer.setSelectedRange(offset, 1);
+                if (viewer.getDocument() != null)
+                {
+                    viewer.revealRange(offset, 1);
+                    viewer.getTextWidget().setFocus();
+                    viewer.setSelectedRange(offset, 1);
+                }
             });
         }
         return null;

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleOffsets.java

@@ -0,0 +1,156 @@
+/*******************************************************************************
+ * Copyright (C) 2023, 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.internal.bsl.ui.services;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.xtext.nodemodel.INode;
+
+import com.e1c.v8codestyle.internal.bsl.ui.UiPlugin;
+
+/**
+ * Provides offset and suffixes information of module region
+ *
+ * @author Kuznetsov Nikita
+ */
+public final class BslModuleOffsets
+{
+    private int startOffset;
+    private int endOffset;
+    private int insertOffset;
+
+    private Map<String, BslModuleOffsets> suffixes;
+
+    /**
+     * Create and calculate module region offsets
+     *
+     * @param document actual {@link IDocument} to get offsets from, can't be {@code null}
+     * @param node {@link INode} to get offsets from, can't be {@code null}
+     * @param nodeAfter {@link INode} to get offsets from, can't be {@code null}
+     * @return module region information with calculated region offsets or {@code null}
+     */
+    public static BslModuleOffsets create(IDocument document, INode node, INode nodeAfter)
+    {
+        try
+        {
+            int startLine = node.getTotalStartLine() - 1;
+            int startOffset = document.getLineOffset((startLine <= 1) ? 0 : startLine);
+            int endOffset = nodeAfter.getTotalOffset();
+            int insertOffset = document.getLineOffset(document.getLineOfOffset(nodeAfter.getTotalOffset()));
+            return new BslModuleOffsets(startOffset, endOffset, insertOffset);
+        }
+        catch (BadLocationException ex)
+        {
+            UiPlugin.log(UiPlugin.createErrorStatus("Can't create module region information", ex)); //$NON-NLS-1$
+        }
+        return null;
+    }
+
+    /**
+     * Returns start offset of module region
+     *
+     * @return offset before region declaration
+     */
+    public int getStartOffset()
+    {
+        return startOffset;
+    }
+
+    /**
+     * Returns end offset of module region
+     *
+     * @return offset after region declaration
+     */
+    public int getEndOffset()
+    {
+        return endOffset;
+    }
+
+    /**
+     * Returns before end offset inside module region
+     *
+     * @return offset before end of region declaration
+     */
+    public int getBeforeEndOffset()
+    {
+        return insertOffset;
+    }
+
+    /**
+     * Add suffix of the name of this module region
+     *
+     * @param suffix to add to suffixes map of this module region
+     * @param document to update offsets, can't be {@code null}
+     * @param node to update offsets, can't be {@code null}
+     * @param nodeAfter to update offsets, can't be {@code null}
+     */
+    public void addSuffix(String suffix, IDocument document, INode node, INode nodeAfter)
+    {
+        if (suffixes == null)
+        {
+            suffixes = new HashMap<>();
+        }
+        BslModuleOffsets suffixRegionInformation = create(document, node, nodeAfter);
+        if (suffixRegionInformation != null)
+        {
+            suffixes.put(suffix, suffixRegionInformation);
+            int suffixStartOffset = suffixRegionInformation.getStartOffset();
+            int suffixEndOffset = suffixRegionInformation.getEndOffset();
+            int suffixInsertOffset = suffixRegionInformation.getBeforeEndOffset();
+            if (insertOffset < suffixInsertOffset)
+            {
+                insertOffset = suffixInsertOffset;
+                endOffset = suffixEndOffset;
+            }
+            if (startOffset > suffixStartOffset)
+            {
+                startOffset = suffixStartOffset;
+            }
+        }
+    }
+
+    /**
+     * Is module region has suffixes
+     *
+     * @return {@code true} if module region has suffixes, {@code false} otherwise
+     */
+    public boolean hasSuffixes()
+    {
+        return suffixes != null;
+    }
+
+    /**
+     * Returns module region information by suffix if exists
+     *
+     * @param suffix {@link String} suffix of declared name module region
+     * @return {@link BslModuleOffsets} if suffix exists, {@code null} otherwise
+     */
+    public BslModuleOffsets getInformationBySuffix(String suffix)
+    {
+        if (hasSuffixes())
+        {
+            return suffixes.get(suffix);
+        }
+        return null;
+    }
+
+    private BslModuleOffsets(int startOffset, int endOffset, int insertOffset)
+    {
+        this.startOffset = startOffset;
+        this.endOffset = endOffset;
+        this.insertOffset = insertOffset;
+    }
+}

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfo.java

@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (C) 2023, 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.internal.bsl.ui.services;
+
+import com._1c.g5.v8.dt.bsl.common.IBslModuleTextInsertInfo;
+import com._1c.g5.v8.dt.bsl.model.Module;
+
+/**
+ * Built-in language module region information with {@link String} region wrap data
+ *
+ * @author Kuznetsov Nikita
+ */
+public class BslModuleRegionsInfo
+    implements IBslModuleTextInsertInfo
+{
+    private final int insertPosition;
+    private final Module module;
+    private final String regionName;
+
+    /**
+     * {@link BslModuleRegionsInfo} constructor
+     *
+     * @param insertPosition <code>int</code> insertion offset, cannot be negative
+     * @param module current {@link Module}, cannot be <code>null</code>
+     * @param regionName {@link String} region name, can be <code>null</code>
+     */
+    public BslModuleRegionsInfo(int insertPosition, Module module, String regionName)
+    {
+        this.insertPosition = insertPosition;
+        this.module = module;
+        this.regionName = regionName;
+    }
+
+    @Override
+    public int getInsertPosition()
+    {
+        return insertPosition;
+    }
+
+    @Override
+    public Module getModule()
+    {
+        return module;
+    }
+
+    /**
+     * Returns region name
+     *
+     * @return {@link String} region name, can be <code>null</code>
+     */
+    public String getRegionName()
+    {
+        return regionName;
+    }
+}