diff --git a/tapi-model/src/main/java/org/gradle/declarative/lsp/build/action/GetDeclarativeResourcesModel.java b/tapi-model/src/main/java/org/gradle/declarative/lsp/build/action/GetDeclarativeResourcesModel.java index 2b0c3b7..f9dd0aa 100644 --- a/tapi-model/src/main/java/org/gradle/declarative/lsp/build/action/GetDeclarativeResourcesModel.java +++ b/tapi-model/src/main/java/org/gradle/declarative/lsp/build/action/GetDeclarativeResourcesModel.java @@ -26,9 +26,10 @@ 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.Stream; import java.util.stream.StreamSupport; public class GetDeclarativeResourcesModel implements BuildAction { @@ -104,13 +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. - List candidateFiles = Stream.of("settings.gradle.dcl", "settings.gradle.kts") - .map(it -> new File(getRootDir(), "settings.gradle.dcl")) - .collect(Collectors.toList()); - return candidateFiles.stream() + List candidateFileNames = Arrays.asList("settings.gradle.dcl", "settings.gradle.kts"); + Function asFileInRootDirectory = it -> new File(getRootDir(), it); + + return candidateFileNames.stream() + .map(asFileInRootDirectory) .filter(File::exists) .findFirst() - .orElse(candidateFiles.get(0)); + .orElse(asFileInRootDirectory.apply(candidateFileNames.get(0))); } @Override