Merge pull request #3256 from 1c-syntax/feature/optimize240312

фиксы для оптимизации выполнения
1c-syntax · Mar 25, 2024 · 17aeb72 · 17aeb72
2 parents 0d3db6e + 4fa773a
commit 17aeb72
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,5 @@ public/
 bsl-language-server/
 bsl-language-server_*.zip
 /.idea/misc.xml
+*.log
+*.hprof
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -81,10 +81,10 @@ dependencies {
         exclude("org.abego.treelayout", "org.abego.treelayout.core")
         exclude("org.antlr", "antlr-runtime")
     }
-    api("com.github.1c-syntax", "utils", "0.5.2")
-    api("io.github.1c-syntax", "mdclasses", "0.13.0-rc.1")
+    api("io.github.1c-syntax", "utils", "0.6.0")
+    api("io.github.1c-syntax", "mdclasses", "0.13.0-rc.2")
     api("io.github.1c-syntax", "bsl-common-library", "0.5.1")
-    api("io.github.1c-syntax", "supportconf", "0.13.1")
+    api("io.github.1c-syntax", "supportconf", "0.14.0")
     api("io.github.1c-syntax", "bsl-parser-core", "0.1.0")
 
     // JLanguageTool

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
@@ -34,7 +34,6 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.SymbolTree;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.mdo.MD;
-import com.github._1c_syntax.bsl.mdo.Module;
 import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
@@ -366,10 +365,7 @@ private SymbolTree computeSymbolTree() {
 
 
   private ModuleType computeModuleType() {
-    return context.getConfiguration()
-      .getModuleByUri(uri)
-      .map(Module::getModuleType)
-      .orElse(ModuleType.UNKNOWN);
+    return context.getConfiguration().getModuleTypeByURI(uri);
   }
 
   private ComplexityData computeCognitiveComplexity() {

diff --git a/...com/github/_1c_syntax/bsl/languageserver/diagnostics/ForbiddenMetadataNameDiagnostic.java b/...com/github/_1c_syntax/bsl/languageserver/diagnostics/ForbiddenMetadataNameDiagnostic.java
@@ -28,6 +28,7 @@
 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.mdo.AttributeOwner;
 import com.github._1c_syntax.bsl.mdo.ChildrenOwner;
 import com.github._1c_syntax.bsl.mdo.MD;
 import com.github._1c_syntax.bsl.types.MdoReference;
@@ -136,8 +137,8 @@ protected void checkMetadata(MD mdo) {
     checkName(mdo.getName(), mdo.getMdoReference());
 
     // проверка имен реквизитов и табличных частей
-    if (mdo instanceof ChildrenOwner childrenOwner) {
-      childrenOwner.getMDOPlainChildren()
+    if (mdo instanceof AttributeOwner childrenOwner) {
+      childrenOwner.getPlainStorageFields()
         .forEach(child -> checkName(child.getName(), child.getMdoReference()));
     }
   }

diff --git a/...github/_1c_syntax/bsl/languageserver/diagnostics/ForbiddenMetadataNameDiagnosticTest.java b/...github/_1c_syntax/bsl/languageserver/diagnostics/ForbiddenMetadataNameDiagnosticTest.java
@@ -62,7 +62,7 @@ void testCatalog() {
     when(spyCatalog.getName()).thenReturn("Справочник");
 
     List<MD> children = new ArrayList<>();
-    spyCatalog.getMDOPlainChildren()
+    spyCatalog.getPlainStorageFields()
       .forEach(mdo -> {
         var spyMDO = spy(mdo);
         when(spyMDO.getName()).thenReturn("РегистрСведений");
@@ -74,7 +74,7 @@ void testCatalog() {
         children.add(spyMDO);
       });
 
-    when(spyCatalog.getMDOPlainChildren()).thenReturn(children);
+    when(spyCatalog.getPlainStorageFields()).thenReturn(children);
     when(documentContext.getMdObject()).thenReturn(Optional.of(spyCatalog));
 
     List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);