修改加载流程

Author: CppCXY

EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaLanguageServer.kt

@@ -129,8 +129,6 @@ class LuaLanguageServer : LanguageServer, LanguageClientAware {
         client?.registerCapability(RegistrationParams(listOf(didChangeWatchedFiles)))
         val didChangeWorkspaceFolders = Registration(WORKSPACE_FOLDERS_CAPABILITY_ID, WORKSPACE_FOLDERS_CAPABILITY_NAME)
         client?.registerCapability(RegistrationParams(listOf(didChangeWorkspaceFolders)))
-
-        workspaceService.loadWorkspace()
     }
 
     override fun getWorkspaceService(): WorkspaceService {

EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaTextDocumentService.kt

@@ -64,11 +64,9 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
 
     @Suppress("unused")
     @JsonRequest("emmy/reportAPI")
-    fun reportAPI(params: LuaReportApiParams): CompletableFuture<Boolean> {
-        return computeAsync { checker ->
-            ExtendApiService.loadApi(workspace.getProject(), params)
-            true
-        }
+    fun reportAPI(params: LuaReportApiParams): CompletableFuture<Void> {
+        ExtendApiService.loadApi(workspace.getProject(), params)
+        return CompletableFuture()
     }
 
     private fun findAnnotators(file: ILuaFile): List<Annotator> {

EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaWorkspaceService.kt

@@ -30,6 +30,7 @@ import org.eclipse.lsp4j.services.WorkspaceService
 import java.io.File
 import java.net.URI
 import java.util.concurrent.CompletableFuture
+import java.util.concurrent.locks.ReentrantReadWriteLock
 
 /**
  * tangzx
@@ -41,6 +42,10 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
     private val configurationManager = ConfigurationManager()
     private var client: LuaLanguageClient? = null
     private var configVersion = 0
+    private val project: Project = WProject()
+    private val fileManager = FileManager(project)
+    private val fileScopeProvider = WorkspaceRootFileScopeProvider()
+    private var initWorkspace = true
 
     inner class WProject : UserDataHolderBase(), Project {
         override fun process(processor: Processor<PsiFile>) {
@@ -56,11 +61,6 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
         }
     }
 
-    private val project: Project = WProject()
-
-    private val fileManager = FileManager(project)
-    private val fileScopeProvider = WorkspaceRootFileScopeProvider()
-
     init {
         project.putUserData(IWorkspace.KEY, this)
         fileManager.addProvider(fileScopeProvider)
@@ -87,11 +87,11 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
         val settings = params.settings as? JsonObject ?: return
         val ret = VSCodeSettings.update(settings)
         ++configVersion
-        if (ret.associationChanged) {
+        if (ret.associationChanged || initWorkspace) {
+            initWorkspace = false
             loadWorkspace()
             refreshWorkspace()
         }
-
     }
 
     fun initConfigFiles(files: Array<EmmyConfigurationSource>) {
@@ -356,7 +356,7 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
                 }
             }
         } catch (e: Exception) {
-            System.err.println("workspace parse error: ${e.toString()}")
+            System.err.println("workspace parse error: $e")
         }
         monitor.done()
     }

EmmyLua-LS/src/main/kotlin/com/tang/vscode/extendApi/ExtendApiService.kt

@@ -16,7 +16,9 @@ object ExtendApiService {
 
     fun loadApi(project: Project, api: LuaReportApiParams) {
         val mgr = PsiManager.getInstance(project)
-        rootNamespaceName = api.root
+        rootNamespaceName = api.root.ifEmpty {
+            "_G"
+        }
         rootNamespace = Namespace(api.root, null, mgr, false)
         namespaceMap.clear()
         classMap.clear()
@@ -87,8 +89,7 @@ object ExtendApiService {
         }
         // generic workaround
         val genericIndex = name.indexOf('<')
-        if(genericIndex != -1)
-        {
+        if (genericIndex != -1) {
             val baseTypeName = name.substring(0, genericIndex)
             return classMap[baseTypeName]
         }

EmmyLua-LS/src/main/kotlin/com/tang/vscode/extendApi/ExtendTy.kt

@@ -227,7 +227,7 @@ class Namespace(
         get() = myType
 
     override fun toString(): String {
-        return "namespace: $fullName"
+        return "namespace $fullName"
     }
 
     override fun getComment(): String {