Remove folding range providers for now

gradle · Jul 26, 2024 · 12321ae · 12321ae
1 parent 4e8982e
commit 12321ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/lsp/src/main/kotlin/org/gradle/declarative/lsp/DeclarativeLanguageServer.kt b/lsp/src/main/kotlin/org/gradle/declarative/lsp/DeclarativeLanguageServer.kt
@@ -2,6 +2,7 @@ package org.gradle.declarative.lsp
 
 import org.eclipse.lsp4j.*
 import org.eclipse.lsp4j.services.*
+import org.gradle.declarative.lsp.logging.LoggingUtils
 import org.gradle.declarative.lsp.tapi.ConnectionHandler
 import java.io.File
 import java.net.URI
@@ -33,7 +34,6 @@ class DeclarativeLanguageServer : LanguageServer, LanguageClientAware {
         val serverCapabilities = ServerCapabilities()
         serverCapabilities.setTextDocumentSync(TextDocumentSyncKind.Full)
         serverCapabilities.setHoverProvider(true)
-//        serverCapabilities.setFoldingRangeProvider(true)
 
         val workspaceFolder = params!!.workspaceFolders[0]
         val workspaceFolderFile = File(URI.create(workspaceFolder.uri))
@@ -43,6 +43,8 @@ class DeclarativeLanguageServer : LanguageServer, LanguageClientAware {
             textDocumentService.setResources(declarativeBuildModel)
         }
 
+        LoggingUtils.useLspLogger(client)
+
         initialized = true
         System.err.println("Gradle Declartive Language Server: initialized")
         return CompletableFuture.completedFuture(InitializeResult(serverCapabilities))

diff --git a/lsp/src/main/kotlin/org/gradle/declarative/lsp/DeclarativeTextDocumentService.kt b/lsp/src/main/kotlin/org/gradle/declarative/lsp/DeclarativeTextDocumentService.kt
@@ -109,20 +109,6 @@ class DeclarativeTextDocumentService : TextDocumentService, LanguageClientAware
         return CompletableFuture.completedFuture(hover)
     }
 
-    override fun foldingRange(params: FoldingRangeRequestParams?): CompletableFuture<MutableList<FoldingRange>> {
-        System.err.println("Asking for folding ranges")
-        params?.let { nonNullParams ->
-            val uri = URI(nonNullParams.textDocument.uri)
-            val foldingRanges = withDom(uri) { dom ->
-                val visitor = FoldingRangeVisitor()
-                dom.visit(visitor)
-                visitor.foldingRanges
-            }
-            return CompletableFuture.completedFuture(foldingRanges)
-        }
-        return CompletableFuture.completedFuture(mutableListOf())
-    }
-
     // Utility and other member functions -------------------------------------
 
     private fun parse(uri: URI, text: String): DeclarativeDocument {
@@ -133,7 +119,8 @@ class DeclarativeTextDocumentService : TextDocumentService, LanguageClientAware
         )
 
         System.err.println("Parsed declarative model for document: $uri")
-        return AnalysisDocumentUtils.documentWithConventions(settingsSchema, fileSchema)!!.document
+        val document = AnalysisDocumentUtils.documentWithModelDefaults(settingsSchema, fileSchema)
+        return document!!.document
     }
 
     private fun <T> withDom(uri: URI, work: (DeclarativeDocument) -> T): T? {