DRAFT Feature/ls core v7

build.gradle.kts

@@ -14,13 +14,14 @@ plugins {
     id("me.qoomon.git-versioning") version "3.0.0"
     id("com.github.ben-manes.versions") version "0.31.0"
     id("io.freefair.javadoc-links") version "5.2.1"
-    id("org.springframework.boot") version "2.3.3.RELEASE"
+    id("org.springframework.boot") version "2.3.4.RELEASE"
     id("com.github.1c-syntax.bslls-dev-tools") version "0.3.1"
 }
 
 apply(plugin = "io.spring.dependency-management")
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven(url = "https://jitpack.io")
 }
@@ -68,6 +69,8 @@ dependencies {
     }
     api("com.github.1c-syntax", "utils", "0.3.1")
     api("com.github.1c-syntax", "mdclasses", "0.6.1")
+    // ls-core
+    api("com.github.1c-syntax", "ls-core-lib", "feature-first_step-c57a90d-DIRTY")
 
     // JLanguageTool
     implementation("org.languagetool", "languagetool-core", "5.0.2")
@@ -127,14 +130,15 @@ tasks.withType<JavaCompile> {
 
 tasks.jar {
     manifest {
-        attributes["Main-Class"] = "com.github._1c_syntax.bsl.languageserver.BSLLSPLauncher"
+        attributes["Main-Class"] = "com.github._1c_syntax.ls_core.LSLauncher"
         attributes["Implementation-Version"] = archiveVersion.get()
     }
     enabled = true
 }
 
 tasks.bootJar {
     manifest {
+        attributes["Start-Class"] = "com.github._1c_syntax.ls_core.LSLauncher"
         attributes["Implementation-Version"] = archiveVersion.get()
     }
     archiveClassifier.set("exec")

docs/contributing/DiagnosticStructure.md

@@ -233,7 +233,7 @@ _**<В разработке>**_
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
 import org.eclipse.lsp4j.Diagnostic;
-import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import com.github._1c_syntax.bsl.languageserver.utils.BSLRanges;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;

src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSBinding.java

@@ -21,9 +21,9 @@
  */
 package com.github._1c_syntax.bsl.languageserver;
 
-import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
-import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
-import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
+import com.github._1c_syntax.bsl.languageserver.configuration.BSLLanguageServerConfiguration;
+import com.github._1c_syntax.bsl.languageserver.context.BSLServerContext;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.BSLDiagnosticInfo;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.springframework.boot.Banner;
@@ -61,16 +61,16 @@ public static ConfigurableApplicationContext getApplicationContext() {
   }
 
   @SuppressWarnings("unchecked")
-  public static Collection<DiagnosticInfo> getDiagnosticInfos() {
+  public static Collection<BSLDiagnosticInfo> getDiagnosticInfos() {
     return getApplicationContext().getBean("diagnosticInfos", Collection.class);
   }
 
-  public static LanguageServerConfiguration getLanguageServerConfiguration() {
-    return getApplicationContext().getBean(LanguageServerConfiguration.class);
+  public static BSLLanguageServerConfiguration getLanguageServerConfiguration() {
+    return getApplicationContext().getBean(BSLLanguageServerConfiguration.class);
   }
 
-  public static ServerContext getServerContext() {
-    return getApplicationContext().getBean(ServerContext.class);
+  public static BSLServerContext getServerContext() {
+    return getApplicationContext().getBean(BSLServerContext.class);
   }
 
   private static SpringApplication createApplication() {

src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSConfiguration.java

@@ -0,0 +1,12 @@
+package com.github._1c_syntax.bsl.languageserver;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * Данный класс необходим spring boot'у для инжекта реализации ls-core
+ */
+@SpringBootApplication
+@ComponentScan("com.github._1c_syntax.ls_core")
+public class BSLLSConfiguration {
+}