TypeName в документКонтекст

Author: asosnoviy

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java

@@ -114,6 +114,7 @@ public class DocumentContext {
 
   private final Lazy<String[]> contentList = new Lazy<>(this::computeContentList, computeLock);
   private final Lazy<ModuleType> moduleType = new Lazy<>(this::computeModuleType, computeLock);
+  private final Lazy<String> typeName = new Lazy<>(this::computeTypeName, computeLock);
   private final Lazy<Map<SupportConfiguration, SupportVariant>> supportVariants
     = new Lazy<>(this::computeSupportVariants, computeLock);
   private final Lazy<ComplexityData> cognitiveComplexityData
@@ -234,6 +235,10 @@ public ModuleType getModuleType() {
     return moduleType.getOrCompute();
   }
 
+  public String getTypeName() {
+    return typeName.getOrCompute();
+  }
+
   public Map<SupportConfiguration, SupportVariant> getSupportVariants() {
     return supportVariants.getOrCompute();
   }
@@ -342,12 +347,16 @@ private SymbolTree computeSymbolTree() {
     return new SymbolTreeComputer(this).compute();
   }
 
-
   private ModuleType computeModuleType() {
 
     return new ModuleTypeComputer(this).computeModuleType();
   }
 
+  private String computeTypeName() {
+
+    return new ModuleTypeComputer(this).computeTypeName();
+  }
+
   private Map<SupportConfiguration, SupportVariant> computeSupportVariants() {
     return context.getConfiguration().getModuleSupport(uri);
   }

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ModuleTypeComputer.java

@@ -24,6 +24,9 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.FileType;
 import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
+import org.apache.commons.io.FilenameUtils;
+
+import java.nio.file.Paths;
 
 public class ModuleTypeComputer {
 
@@ -62,5 +65,14 @@ private ModuleType computeOS() {
       return ModuleType.UNKNOWN;
     }
   }
+
+  public String computeTypeName() {
+    if (documentContext.getModuleType() == ModuleType.Module
+      || documentContext.getModuleType() == ModuleType.Class) {
+      // to do убрать FilenameUtils
+      return FilenameUtils.getBaseName(Paths.get(documentContext.getUri()).toString());
+    }
+    return "";
+  }
 }
 

src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java

@@ -239,4 +239,17 @@ void testEOF() {
     assertThat(lastToken.getType()).isEqualTo(Lexer.EOF);
     assertThat(lastToken.getChannel()).isEqualTo(Lexer.HIDDEN);
   }
+
+  @Test
+  void testOSTypes(){
+
+    // given
+    var documentContext = getDocumentContext("./src/test/resources/metadata/oscript/Классы/ТестовыйКласс.os");
+    // when
+    var typeName = documentContext.getTypeName();
+    // then
+    assertThat(typeName).isEqualTo("ТестовыйКласс");
+
+  }
+
 }

src/test/resources/metadata/oscript/main.os

@@ -0,0 +1,4 @@
+
+Переменная = Новый ТестовыйКласс;
+
+Другая = 1 + Переменная;