修复代码诊断bug, 修复签名问题, 修复空工作区问题

Author: CppCXY

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

@@ -53,8 +53,10 @@ class LuaLanguageServer : LanguageServer, LanguageClientAware {
     }
 
     override fun initialize(params: InitializeParams): CompletableFuture<InitializeResult> {
-        for (workspace in params.workspaceFolders) {
-            workspaceService.addRoot(workspace.uri)
+        if (params.workspaceFolders != null) {
+            for (workspace in params.workspaceFolders) {
+                workspaceService.addRoot(workspace.uri)
+            }
         }
         initIntellijEnv()
 
@@ -107,7 +109,7 @@ class LuaLanguageServer : LanguageServer, LanguageClientAware {
         inlayHintOptions.resolveProvider = true
         capabilities.inlayHintProvider = Either.forRight(inlayHintOptions)
 
-        capabilities.diagnosticProvider = DiagnosticRegistrationOptions(false, true)
+        capabilities.diagnosticProvider = DiagnosticRegistrationOptions(false, false)
 
 //        capabilities.semanticTokensProvider = SemanticTokensWithRegistrationOptions(
 //            SemanticTokensLegend(

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

@@ -20,6 +20,7 @@ import com.tang.intellij.lua.stubs.index.LuaClassMemberIndex
 import com.tang.intellij.lua.ty.*
 import com.tang.lsp.*
 import com.tang.vscode.api.impl.LuaFile
+import com.tang.vscode.diagnostics.DiagnosticsService
 //import com.tang.vscode.color.ColorService
 import com.tang.vscode.documentation.LuaDocumentationProvider
 import com.tang.vscode.extendApi.ExtendApiService
@@ -485,10 +486,27 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         } else if (file is LuaFile) {
             file.text = params.textDocument.text
         }
+        if (file is ILuaFile) {
+            val diagnosticList = mutableListOf<Diagnostic>()
+            DiagnosticsService.inspectFile(file, diagnosticList)
+            this.client?.publishDiagnostics(PublishDiagnosticsParams(
+                uri, diagnosticList
+            ))
+        }
     }
 
     override fun didSave(params: DidSaveTextDocumentParams) {
-
+        val uri = params.textDocument.uri
+        val file = workspace.findFile(uri)
+        if (file is ILuaFile) {
+            val diagnosticList = mutableListOf<Diagnostic>()
+            DiagnosticsService.inspectFile(file, diagnosticList)
+            this.client?.publishDiagnostics(
+                PublishDiagnosticsParams(
+                uri, diagnosticList
+            )
+            )
+        }
     }
 
     override fun signatureHelp(params: SignatureHelpParams?): CompletableFuture<SignatureHelp?> {

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

@@ -41,7 +41,6 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
     private val schemeMap = mutableMapOf<String, IFolder>()
     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()
@@ -86,7 +85,6 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
     override fun didChangeConfiguration(params: DidChangeConfigurationParams) {
         val settings = params.settings as? JsonObject ?: return
         val ret = VSCodeSettings.update(settings)
-        ++configVersion
         if (ret.associationChanged || initWorkspace) {
             initWorkspace = false
             loadWorkspace()
@@ -116,7 +114,6 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
 
     @JsonRequest("emmy/updateConfig")
     fun updateConfig(params: UpdateConfigParams): CompletableFuture<Void> {
-        ++configVersion
         configurationManager.updateConfiguration(params)
         loadWorkspace()
         refreshWorkspace()
@@ -161,64 +158,57 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
         }
     }
 
-    override fun diagnostic(params: WorkspaceDiagnosticParams): CompletableFuture<WorkspaceDiagnosticReport> {
-        for (prev in params.previousResultIds) {
-            val file = findFile(prev.uri)
-            if (file is LuaFile) {
-                file.workspaceDiagnosticResultId = prev.value
-            }
-        }
-
-        val files = mutableListOf<LuaFile>()
-        project.process {
-            val file = it.virtualFile
-            if (file is LuaFile) {
-                files.add(file)
-            }
-            true
-        }
-
-        val workspaceConfigVersion = configVersion
-
-        return computeAsync { checker ->
-            for (luaFile in files) {
-                luaFile.lock {
-                    val documentReport = diagnoseFile(luaFile, luaFile.workspaceDiagnosticResultId, checker)
-                    if (documentReport.isRelatedFullDocumentDiagnosticReport) {
-                        val workspaceItemReport = WorkspaceFullDocumentDiagnosticReport(
-                            documentReport.relatedFullDocumentDiagnosticReport.items,
-                            luaFile.uri.toString(),
-                            null
-                        )
-
-                        workspaceItemReport.resultId = documentReport.relatedFullDocumentDiagnosticReport.resultId
-                        val report = WorkspaceDiagnosticReportPartialResult(
-                            listOf(WorkspaceDocumentDiagnosticReport(workspaceItemReport))
-                        )
-                        client?.notifyProgress(ProgressParams(params.partialResultToken, Either.forRight(report)))
-                    } else if (documentReport.isRelatedUnchangedDocumentDiagnosticReport) {
-                        val workspaceItemReport = WorkspaceUnchangedDocumentDiagnosticReport(
-                            documentReport.relatedUnchangedDocumentDiagnosticReport.resultId,
-                            luaFile.uri.toString(),
-                            null
-                        )
-                        val report = WorkspaceDiagnosticReportPartialResult(
-                            listOf(WorkspaceDocumentDiagnosticReport(workspaceItemReport))
-                        )
-                        client?.notifyProgress(ProgressParams(params.partialResultToken, Either.forRight(report)))
-                    }
-                }
-            }
-
-            // 如果配置版本发生变更则中断无限循环
-            while (workspaceConfigVersion == configVersion) {
-                Thread.sleep(1000)
-            }
-
-            val empty = WorkspaceDiagnosticReport(emptyList())
-            empty
-        }
-    }
+//    override fun diagnostic(params: WorkspaceDiagnosticParams): CompletableFuture<WorkspaceDiagnosticReport> {
+//        for (prev in params.previousResultIds) {
+//            val file = findFile(prev.uri)
+//            if (file is LuaFile) {
+//                file.workspaceDiagnosticResultId = prev.value
+//            }
+//        }
+//
+//        val files = mutableListOf<LuaFile>()
+//        project.process {
+//            val file = it.virtualFile
+//            if (file is LuaFile) {
+//                files.add(file)
+//            }
+//            true
+//        }
+//
+//        return computeAsync { checker ->
+//            for (luaFile in files) {
+//                luaFile.lock {
+//                    val documentReport = diagnoseFile(luaFile, luaFile.workspaceDiagnosticResultId, checker)
+//                    if (documentReport.isRelatedFullDocumentDiagnosticReport) {
+//                        val workspaceItemReport = WorkspaceFullDocumentDiagnosticReport(
+//                            documentReport.relatedFullDocumentDiagnosticReport.items,
+//                            luaFile.uri.toString(),
+//                            null
+//                        )
+//
+//                        workspaceItemReport.resultId = documentReport.relatedFullDocumentDiagnosticReport.resultId
+//                        val report = WorkspaceDiagnosticReportPartialResult(
+//                            listOf(WorkspaceDocumentDiagnosticReport(workspaceItemReport))
+//                        )
+//                        client?.notifyProgress(ProgressParams(params.partialResultToken, Either.forRight(report)))
+//                    } else if (documentReport.isRelatedUnchangedDocumentDiagnosticReport) {
+//                        val workspaceItemReport = WorkspaceUnchangedDocumentDiagnosticReport(
+//                            documentReport.relatedUnchangedDocumentDiagnosticReport.resultId,
+//                            luaFile.uri.toString(),
+//                            null
+//                        )
+//                        val report = WorkspaceDiagnosticReportPartialResult(
+//                            listOf(WorkspaceDocumentDiagnosticReport(workspaceItemReport))
+//                        )
+//                        client?.notifyProgress(ProgressParams(params.partialResultToken, Either.forRight(report)))
+//                    }
+//                }
+//            }
+//
+//            val empty = WorkspaceDiagnosticReport(emptyList())
+//            empty
+//        }
+//    }
 
     private fun getSchemeFolder(path: FileURI, autoCreate: Boolean): IFolder? {
         var folder: IFolder? = schemeMap[path.scheme]
@@ -317,21 +307,13 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
     }
 
     fun diagnoseFile(file: ILuaFile, previousId: String?, checker: CancelChecker?): DocumentDiagnosticReport {
-        val fileVersion = file.getVersion()
-        val resultId = "$fileVersion|$configVersion"
-        if (previousId != null && resultId == previousId) {
-            return DocumentDiagnosticReport(RelatedUnchangedDocumentDiagnosticReport(resultId))
-        }
-
         val diagnostics = mutableListOf<Diagnostic>()
 
         if (file is LuaFile) {
             file.diagnostic(diagnostics, checker)
         }
 
-        val report = DocumentDiagnosticReport(RelatedFullDocumentDiagnosticReport(diagnostics))
-        report.relatedFullDocumentDiagnosticReport.resultId = resultId
-        return report
+        return DocumentDiagnosticReport(RelatedFullDocumentDiagnosticReport(diagnostics))
     }
 
     private fun loadWorkspace(monitor: IProgressMonitor) {

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

@@ -36,32 +36,34 @@ object DiagnosticsService {
                         diagnostics.add(diagnostic)
                     }
                 }
+            }
+            true
+        }
+    }
+
+    fun inspectFile(file: ILuaFile, diagnostics: MutableList<Diagnostic>) {
+        PsiTreeUtil.processElements(file.psi) {
+            when (it) {
                 is LuaIndexExpr -> {
-                    checker?.checkCanceled()
                     DeprecatedInspection.indexDeprecatedInspections(it, file, diagnostics)
                     FieldValidInspection.fieldValidationInspections(it, file, diagnostics)
                 }
                 is LuaCallExpr -> {
-                    checker?.checkCanceled()
                     FunctionInspection.callExprInspections(it, file, diagnostics)
                 }
                 is LuaAssignStat -> {
-                    checker?.checkCanceled()
                     AssignInspection.assignInspections(it, file, diagnostics)
                 }
                 is LuaNameExpr -> {
-                    checker?.checkCanceled()
                     DeprecatedInspection.nameExprDeprecatedInspections(it, file, diagnostics)
                     UndeclaredVariableInspection.undeclaredVariableInspections(it, file, diagnostics)
                 }
                 is LuaDocTagClass -> {
-                    checker?.checkCanceled()
                     InheritInspection.inheritInspections(it, file, diagnostics)
                 }
             }
             true
         }
     }
 
-
 }