Оптимизировано (и местами исправлено) формирование ссылки на объекты MD

theshadowco · theshadowco · commit 21034584e66d · 2025-11-12T14:32:34.000+03:00
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -26,8 +26,6 @@
 import com.github._1c_syntax.bsl.languageserver.reporters.ReportersAggregator;
 import com.github._1c_syntax.bsl.languageserver.reporters.data.AnalysisInfo;
 import com.github._1c_syntax.bsl.languageserver.reporters.data.FileInfo;
-import com.github._1c_syntax.bsl.mdo.MD;
-import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.utils.Absolute;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -203,10 +201,7 @@ private FileInfo getFileInfoFromFile(Path srcDir, File file) {
     var filePath = srcDir.relativize(Absolute.path(file));
     var diagnostics = documentContext.getDiagnostics();
     var metrics = documentContext.getMetrics();
-    var mdoRef = documentContext.getMdObject()
-      .map(MD::getMdoReference)
-      .map(MdoReference::getMdoRef)
-      .orElse("");
+    var mdoRef = documentContext.getMdoRef();
 
     var fileInfo = new FileInfo(filePath, mdoRef, diagnostics, metrics);
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -32,6 +32,7 @@
 import com.github._1c_syntax.bsl.languageserver.context.computer.SymbolTreeComputer;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.SymbolTree;
+import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.mdo.MD;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
@@ -261,6 +262,16 @@ public Optional<MD> getMdObject() {
     return getServerContext().getConfiguration().findChild(getUri());
   }
 
+  /**
+   * Возвращает строковое представление ссылки связанного с объектом объекта метаданных 1С либо строку URI для
+   * остальных случаев
+   *
+   * @return Строковое представление ссылки
+   */
+  public String getMdoRef() {
+    return MdoRefBuilder.getMdoRef(this);
+  }
+
   public List<SDBLTokenizer> getQueries() {
     return queries.getOrCompute();
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -23,7 +23,6 @@
 
 import com.github._1c_syntax.bsl.languageserver.WorkDoneProgressHelper;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
-import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.bsl.languageserver.utils.NamedForkJoinWorkerThreadFactory;
 import com.github._1c_syntax.bsl.languageserver.utils.Resources;
 import com.github._1c_syntax.bsl.mdclasses.CF;
@@ -320,7 +319,7 @@ private CF computeConfigurationMetadata() {
   }
 
   private void addMdoRefByUri(URI uri, DocumentContext documentContext) {
-    String mdoRef = MdoRefBuilder.getMdoRef(documentContext);
+    var mdoRef = documentContext.getMdoRef();
 
     mdoRefs.put(uri, mdoRef);
     documentsByMDORef.computeIfAbsent(
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ModuleSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ModuleSymbolComputer.java
@@ -23,7 +23,6 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.ModuleSymbol;
-import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.types.ModuleType;
@@ -69,7 +68,7 @@ public ModuleSymbol compute() {
   }
 
   private static String getName(DocumentContext documentContext) {
-    String name = MdoRefBuilder.getMdoRef(documentContext);
+    var name = documentContext.getMdoRef();
     var moduleType = documentContext.getModuleType();
     if (MODULE_TYPES_TO_APPEND_NAME.contains(moduleType)) {
       name += "." + moduleType.name();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractMetadataDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractMetadataDiagnostic.java
@@ -121,6 +121,10 @@ protected void addDiagnostic(String message) {
     diagnosticStorage.addDiagnostic(diagnosticRange, message);
   }
 
+  protected String getMdoRefLocal(MD mdo) {
+    return documentContext.getServerContext().getConfiguration().getMdoRefLocal(mdo);
+  }
+
   /**
    * Проверить объект метаданных.
    *
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DenyIncompleteValuesDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DenyIncompleteValuesDiagnostic.java
@@ -26,7 +26,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticSeverity;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticTag;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
-import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.bsl.mdo.MD;
 import com.github._1c_syntax.bsl.mdo.Register;
 import com.github._1c_syntax.bsl.mdo.children.Dimension;
@@ -59,11 +58,11 @@ public DenyIncompleteValuesDiagnostic() {
   @Override
   protected void checkMetadata(MD mdo) {
     if (mdo instanceof Register register) {
+      var mdoRefLocal = getMdoRefLocal(mdo);
       register.getDimensions().stream()
         .filter(dimension -> !dimension.isDenyIncompleteValues())
         .forEach((Dimension dimension) -> {
-          var ownerMDOName = MdoRefBuilder.getLocaleOwnerMdoName(documentContext, mdo);
-          addDiagnostic(info.getMessage(dimension.getName(), ownerMDOName));
+          addDiagnostic(info.getMessage(dimension.getName(), mdoRefLocal));
         });
     }
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ForbiddenMetadataNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ForbiddenMetadataNameDiagnostic.java
@@ -29,7 +29,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.mdo.AttributeOwner;
 import com.github._1c_syntax.bsl.mdo.MD;
-import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.ModuleType;
 import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import lombok.RequiredArgsConstructor;
@@ -132,20 +131,18 @@ public class ForbiddenMetadataNameDiagnostic extends AbstractMetadataDiagnostic
   protected void checkMetadata(MD mdo) {
 
     // проверка имени метаданного
-    checkName(mdo.getName(), mdo.getMdoReference());
+    checkName(mdo.getName(), mdo);
 
     // проверка имен реквизитов и табличных частей
     if (mdo instanceof AttributeOwner childrenOwner) {
       childrenOwner.getPlainStorageFields()
-        .forEach(child -> checkName(child.getName(), child.getMdoReference()));
+        .forEach(child -> checkName(child.getName(), child));
     }
   }
 
-  private void checkName(String name, MdoReference mdoReference) {
+  private void checkName(String name, MD md) {
     if (FORBIDDEN_NAMES_PATTERN.matcher(name).matches()) {
-      var mdoRef = mdoReference.getMdoRef(
-        documentContext.getServerContext().getConfiguration().getScriptVariant());
-      addDiagnostic(info.getMessage(name, mdoRef));
+      addDiagnostic(info.getMessage(name, getMdoRefLocal(md)));
     }
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataObjectNameLengthDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataObjectNameLengthDiagnostic.java
@@ -60,7 +60,7 @@ public class MetadataObjectNameLengthDiagnostic extends AbstractMetadataDiagnost
   @Override
   protected void checkMetadata(MD mdo) {
     if (mdo.getName().length() > maxMetadataObjectNameLength) {
-      addAttributeDiagnostic(mdo);
+      addDiagnostic(info.getMessage(getMdoRefLocal(mdo), maxMetadataObjectNameLength));
     }
   }
 
@@ -76,10 +76,4 @@ protected void check() {
       super.check();
     }
   }
-
-  private void addAttributeDiagnostic(MD attribute) {
-    var mdoRef = attribute.getMdoReference().getMdoRef(
-      documentContext.getServerContext().getConfiguration().getScriptVariant());
-    addDiagnostic(info.getMessage(mdoRef, maxMetadataObjectNameLength));
-  }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingEventSubscriptionHandlerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingEventSubscriptionHandlerDiagnostic.java
@@ -109,7 +109,7 @@ protected void check() {
 
   private void checkMethod(EventSubscription eventSubs, String methodName, CommonModule commonModule) {
     documentContext.getServerContext()
-      .getDocument(commonModule.getMdoReference().getMdoRef(), ModuleType.CommonModule)
+      .getDocument(commonModule.getMdoRef(), ModuleType.CommonModule)
       .ifPresent((DocumentContext commonModuleContext) -> {
         var method = commonModuleContext.getSymbolTree().getMethods().stream()
           .filter(methodSymbol -> methodSymbol.getName().equalsIgnoreCase(methodName))
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PrivilegedModuleMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PrivilegedModuleMethodCallDiagnostic.java
@@ -85,8 +85,7 @@ private List<ModuleSymbol> getPrivilegedModuleSymbols() {
   }
 
   private Optional<ModuleSymbol> getPrivilegedModuleSymbol(CommonModule mdCommonModule) {
-    return documentContext.getServerContext().getDocument(
-        mdCommonModule.getMdoReference().getMdoRef(), ModuleType.CommonModule)
+    return documentContext.getServerContext().getDocument(mdCommonModule.getMdoRef(), ModuleType.CommonModule)
       .map(documentContext1 -> documentContext1.getSymbolTree().getModule());
   }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ProtectedModuleDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ProtectedModuleDiagnostic.java
@@ -27,7 +27,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticSeverity;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticTag;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
-import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.mdo.Module;
 import com.github._1c_syntax.bsl.mdo.ModuleOwner;
@@ -79,13 +78,8 @@ protected void check() {
           .filter(Module::isProtected)
           .findAny();
         if (hasProtected.isPresent()) {
-          addDiagnostic(moduleOwner);
+          diagnosticStorage.addDiagnostic(diagnosticRange, info.getMessage(configuration.getMdoRefLocal(moduleOwner)));
         }
       });
   }
-
-  private void addDiagnostic(ModuleOwner moduleOwner) {
-    var ownerMDOName = MdoRefBuilder.getLocaleOwnerMdoName(documentContext, moduleOwner);
-    diagnosticStorage.addDiagnostic(diagnosticRange, info.getMessage(ownerMDOName));
-  }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SameMetadataObjectAndChildNamesDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SameMetadataObjectAndChildNamesDiagnostic.java
@@ -99,12 +99,6 @@ protected void checkMetadata(MD mdo) {
   private void checkAttributes(List<Attribute> attributeOwner, String mdoName) {
     attributeOwner.stream()
       .filter(attribute -> mdoName.equalsIgnoreCase(attribute.getName()))
-      .forEach(attribute -> addAttributeDiagnostic(attribute, mdoName));
-  }
-
-  private void addAttributeDiagnostic(Attribute attribute, String mdoName) {
-    var mdoRef = attribute.getMdoReference().getMdoRef(
-      documentContext.getServerContext().getConfiguration().getScriptVariant());
-    addDiagnostic(info.getMessage(mdoRef, mdoName));
+      .forEach(attribute -> addDiagnostic(info.getMessage(getMdoRefLocal(attribute), mdoName)));
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ScheduledJobHandlerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ScheduledJobHandlerDiagnostic.java
@@ -134,8 +134,7 @@ private void checkMethod(ScheduledJob scheduleJob, CommonModule mdCommonModule,
     final var fullName = getFullName(mdCommonModule, methodName);
     scheduledJobHandlers.computeIfAbsent(fullName, k -> new ArrayList<>()).add(scheduleJob);
 
-    documentContext.getServerContext().getDocument(
-        mdCommonModule.getMdoReference().getMdoRef(), ModuleType.CommonModule)
+    documentContext.getServerContext().getDocument(mdCommonModule.getMdoRef(), ModuleType.CommonModule)
       .ifPresent((DocumentContext commonModuleContext) -> {
         var method = commonModuleContext.getSymbolTree().getMethods().stream()
           .filter(methodSymbol -> methodSymbol.getName().equalsIgnoreCase(methodName))
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongDataPathForFormElementsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongDataPathForFormElementsDiagnostic.java
@@ -107,6 +107,6 @@ private void checkForm(Form form) {
   }
 
   private String getMdoRef(Form form) {
-    return form.getMdoReference().getMdoRef(documentContext.getServerContext().getConfiguration().getScriptVariant());
+    return documentContext.getServerContext().getConfiguration().getMdoRefLocal(form);
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongHttpServiceHandlerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongHttpServiceHandlerDiagnostic.java
@@ -73,7 +73,7 @@ private void checkService(HTTPService httpService) {
     httpService.getUrlTemplates().stream()
       .flatMap(httpServiceURLTemplate -> httpServiceURLTemplate.getMethods().stream())
       .forEach((HTTPServiceMethod service) -> {
-        final var serviceName = service.getMdoReference().getMdoRef();
+        final var serviceName = service.getMdoRef();
         if (service.getHandler().isEmpty()) {
           addMissingHandlerDiagnostic(serviceName);
           return;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/hover/DescriptionFormatter.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/hover/DescriptionFormatter.java
@@ -25,11 +25,9 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.ParameterDefinition;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.VariableSymbol;
-import com.github._1c_syntax.bsl.languageserver.context.symbol.annotations.Annotation;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.description.MethodDescription;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.description.ParameterDescription;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.description.TypeDescription;
-import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.bsl.languageserver.utils.Resources;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.lsp4j.SymbolKind;
@@ -86,7 +84,7 @@ public String getParametersSection(MethodSymbol methodSymbol) {
 
     if (!parameters.isBlank()) {
       var parametersSection = new StringJoiner("\n");
-      String header = "**" + getResourceString(PARAMETERS_KEY) + ":**";
+      var header = "**" + getResourceString(PARAMETERS_KEY) + ":**";
       parametersSection.add(header);
       parametersSection.add("");
       parametersSection.add(parameters);
@@ -127,7 +125,7 @@ public String getCallOptionsSection(MethodSymbol methodSymbol) {
   }
 
   public String getSectionWithCodeFences(Collection<String> codeBlocks, String resourceKey) {
-    String codeFences = codeBlocks
+    var codeFences = codeBlocks
       .stream()
       .map(codeBlock -> "```bsl\n" + codeBlock + "\n```")
       .collect(Collectors.joining("\n"));
@@ -142,7 +140,7 @@ public String getSectionWithCodeFences(Collection<String> codeBlocks, String res
   public String getLocation(MethodSymbol symbol) {
     var documentContext = symbol.getOwner();
     var startPosition = symbol.getSelectionRange().getStart();
-    String mdoRef = MdoRefBuilder.getMdoRef(documentContext);
+    var mdoRef = documentContext.getMdoRef();
 
     return String.format(
       "[%s](%s#%d)",
@@ -155,9 +153,9 @@ public String getLocation(MethodSymbol symbol) {
   public String getLocation(VariableSymbol symbol) {
     var documentContext = symbol.getOwner();
     var startPosition = symbol.getSelectionRange().getStart();
-    String mdoRef = MdoRefBuilder.getMdoRef(documentContext);
+    var mdoRef = documentContext.getMdoRef();
 
-    String parentPostfix = symbol.getRootParent(SymbolKind.Method)
+    var parentPostfix = symbol.getRootParent(SymbolKind.Method)
       .map(sourceDefinedSymbol -> "." + sourceDefinedSymbol.getName())
       .orElse("");
     mdoRef += parentPostfix;
@@ -179,11 +177,11 @@ public String getSignature(MethodSymbol methodSymbol) {
     } else {
       methodKind = getResourceString(PROCEDURE_KEY);
     }
-    String methodName = methodSymbol.getName();
+    var methodName = methodSymbol.getName();
 
     var parameters = getParametersSignatureDescription(methodSymbol);
     var returnedValueType = getReturnedValueTypeDescriptionPart(methodSymbol);
-    String export = methodSymbol.isExport() ? (" " + getResourceString(EXPORT_KEY)) : "";
+    var export = methodSymbol.isExport() ? (" " + getResourceString(EXPORT_KEY)) : "";
 
     return String.format(
       signatureTemplate,
@@ -260,15 +258,15 @@ public String getParametersSignatureDescription(MethodSymbol methodSymbol) {
 
   private static String getAnnotationsDescriptionPart(ParameterDefinition parameterDefinition) {
     var description = new StringBuilder();
-    for (Annotation annotation : parameterDefinition.getAnnotations()) {
+    for (var annotation : parameterDefinition.getAnnotations()) {
       description.append("&").append(annotation.getName()).append(" ");
     }
 
     return description.toString();
   }
 
   private static String getReturnedValueTypeDescriptionPart(MethodSymbol methodSymbol) {
-    String returnedValueType = methodSymbol.getDescription()
+    var returnedValueType = methodSymbol.getDescription()
       .map(MethodDescription::getReturnedValue)
       .map(DescriptionFormatter::getTypes)
       .orElse("");
@@ -288,7 +286,7 @@ private static String getTypes(List<TypeDescription> typeDescriptions) {
 
   public String parameterToString(ParameterDescription parameterDescription, int level) {
     var result = new StringJoiner("  \n"); // два пробела
-    Map<String, String> typesMap = typesToMap(parameterDescription.types(), level);
+    var typesMap = typesToMap(parameterDescription.types(), level);
     var parameterTemplate = "  ".repeat(level) + PARAMETER_TEMPLATE;
 
     if (typesMap.size() == 1) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CallHierarchyProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CallHierarchyProvider.java
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndex.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndex.java
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFiller.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFiller.java
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/reporters/data/FileInfo.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/reporters/data/FileInfo.java
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ModuleSymbolComputerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ModuleSymbolComputerTest.java

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,10 @@ protected void addDiagnostic(String message) {`
`121`	`121`	`diagnosticStorage.addDiagnostic(diagnosticRange, message);`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ protected String getMdoRefLocal(MD mdo) {`
	`125`	`+ return documentContext.getServerContext().getConfiguration().getMdoRefLocal(mdo);`
	`126`	`+ }`
	`127`	`+`
`124`	`128`	`/**`
`125`	`129`	`* Проверить объект метаданных.`
`126`	`130`	`*`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@`
`29`	`29`	`import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;`
`30`	`30`	`import com.github._1c_syntax.bsl.mdo.AttributeOwner;`
`31`	`31`	`import com.github._1c_syntax.bsl.mdo.MD;`
`32`		`-import com.github._1c_syntax.bsl.types.MdoReference;`
`33`	`32`	`import com.github._1c_syntax.bsl.types.ModuleType;`
`34`	`33`	`import com.github._1c_syntax.utils.CaseInsensitivePattern;`
`35`	`34`	`import lombok.RequiredArgsConstructor;`
`@@ -132,20 +131,18 @@ public class ForbiddenMetadataNameDiagnostic extends AbstractMetadataDiagnostic`
`132`	`131`	`protected void checkMetadata(MD mdo) {`
`133`	`132`
`134`	`133`	`// проверка имени метаданного`
`135`		`- checkName(mdo.getName(), mdo.getMdoReference());`
	`134`	`+ checkName(mdo.getName(), mdo);`
`136`	`135`
`137`	`136`	`// проверка имен реквизитов и табличных частей`
`138`	`137`	`if (mdo instanceof AttributeOwner childrenOwner) {`
`139`	`138`	`childrenOwner.getPlainStorageFields()`
`140`		`- .forEach(child -> checkName(child.getName(), child.getMdoReference()));`
	`139`	`+ .forEach(child -> checkName(child.getName(), child));`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`
`144`		`- private void checkName(String name, MdoReference mdoReference) {`
	`143`	`+ private void checkName(String name, MD md) {`
`145`	`144`	`if (FORBIDDEN_NAMES_PATTERN.matcher(name).matches()) {`
`146`		`- var mdoRef = mdoReference.getMdoRef(`
`147`		`- documentContext.getServerContext().getConfiguration().getScriptVariant());`
`148`		`- addDiagnostic(info.getMessage(name, mdoRef));`
	`145`	`+ addDiagnostic(info.getMessage(name, getMdoRefLocal(md)));`
`149`	`146`	`}`
`150`	`147`	`}`
`151`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public class MetadataObjectNameLengthDiagnostic extends AbstractMetadataDiagnost`
`60`	`60`	`@Override`
`61`	`61`	`protected void checkMetadata(MD mdo) {`
`62`	`62`	`if (mdo.getName().length() > maxMetadataObjectNameLength) {`
`63`		`- addAttributeDiagnostic(mdo);`
	`63`	`+ addDiagnostic(info.getMessage(getMdoRefLocal(mdo), maxMetadataObjectNameLength));`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`@@ -76,10 +76,4 @@ protected void check() {`
`76`	`76`	`super.check();`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`-`
`80`		`- private void addAttributeDiagnostic(MD attribute) {`
`81`		`- var mdoRef = attribute.getMdoReference().getMdoRef(`
`82`		`- documentContext.getServerContext().getConfiguration().getScriptVariant());`
`83`		`- addDiagnostic(info.getMessage(mdoRef, maxMetadataObjectNameLength));`
`84`		`- }`
`85`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,7 @@ private List<ModuleSymbol> getPrivilegedModuleSymbols() {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`private Optional<ModuleSymbol> getPrivilegedModuleSymbol(CommonModule mdCommonModule) {`
`88`		`- return documentContext.getServerContext().getDocument(`
`89`		`- mdCommonModule.getMdoReference().getMdoRef(), ModuleType.CommonModule)`
	`88`	`+ return documentContext.getServerContext().getDocument(mdCommonModule.getMdoRef(), ModuleType.CommonModule)`
`90`	`89`	`.map(documentContext1 -> documentContext1.getSymbolTree().getModule());`
`91`	`90`	`}`
`92`	`91`