Handle settings.gradle.kts or missing settings.gradle.dcl (#4)

gradle · Nov 13, 2024 · 1a2128b · 1a2128b
1 parent a9b700b
commit 1a2128b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lsp/src/main/kotlin/org/gradle/declarative/lsp/DeclarativeTextDocumentService.kt b/lsp/src/main/kotlin/org/gradle/declarative/lsp/DeclarativeTextDocumentService.kt
@@ -308,7 +308,8 @@ class DeclarativeTextDocumentService : TextDocumentService {
         val fileName = uri.path.substringAfterLast('/')
         val fileSchema = schemaAnalysisEvaluator.evaluate(fileName, text)
         val settingsSchema = schemaAnalysisEvaluator.evaluate(
-            declarativeResources.settingsFile.name, declarativeResources.settingsFile.readText()
+            declarativeResources.settingsFile.name, 
+            declarativeResources.settingsFile.takeIf { it.canRead() }?.readText().orEmpty()
         )
 
         val document = AnalysisDocumentUtils.documentWithModelDefaults(settingsSchema, fileSchema)

diff --git a/...l/src/main/java/org/gradle/declarative/lsp/build/action/GetDeclarativeResourcesModel.java b/...l/src/main/java/org/gradle/declarative/lsp/build/action/GetDeclarativeResourcesModel.java
@@ -26,7 +26,9 @@
 import org.gradle.tooling.model.gradle.GradleBuild;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.List;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -103,7 +105,14 @@ public File getRootDir() {
         @Override
         public File getSettingsFile() {
             // TODO: this is an assumption about the location of the settings file – get it from Gradle instead.
-            return new File(getRootDir(), "settings.gradle.dcl");
+            List<String> candidateFileNames = Arrays.asList("settings.gradle.dcl", "settings.gradle.kts");
+            Function<String, File> asFileInRootDirectory = it -> new File(getRootDir(), it);
+
+            return candidateFileNames.stream()
+                    .map(asFileInRootDirectory)
+                    .filter(File::exists)
+                    .findFirst()
+                    .orElse(asFileInRootDirectory.apply(candidateFileNames.get(0)));
         }
 
         @Override