Skip to content

Search for configuration in config directories (dotfiles, etc) #749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WuerfelDev wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Search for configuration in config directories (dotfiles, etc) #749

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4eefa53
[config] Search in OS config directories
WuerfelDev Jun 5, 2024
46b1d47
Documentation for global configuration
WuerfelDev Jun 5, 2024
7b9586c
adjust order of searching config directories
WuerfelDev Nov 8, 2024
9d598bd
config loading cleaned
WuerfelDev Nov 13, 2024
3a27b02
Configuration fallback ~/.config/
WuerfelDev Nov 15, 2024
e1e10ef
Merge main into fork
WuerfelDev Nov 15, 2024
fa16f61
apply .swift-format
WuerfelDev Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
config loading cleaned
  • Loading branch information
@WuerfelDev
WuerfelDev committed Nov 13, 2024
commit 9d598bd44bd264578631423950e152058619038c
20 changes: 10 additions & 10 deletions Sources/swift-format/Frontend/Frontend.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,14 @@ class Frontend {
configLocations.append(URL(fileURLWithPath: xdgConfigHome))
}

if let libraryUrl = FileManager.default.urls(
for: .applicationSupportDirectory, in: .userDomainMask
).first {
configLocations.append(libraryUrl)
if let homeLocation = ProcessInfo.processInfo.environment["HOME"] {
configLocations.append(URL(fileURLWithPath: homeLocation + "/.config/"))
}

for supportDirectoryUrl in FileManager.default.urls(
for: .applicationSupportDirectory, in: .userDomainMask)
{
configLocations.append(supportDirectoryUrl)
}

if let xdgConfigDirs = ProcessInfo.processInfo.environment["XDG_CONFIG_DIRS"] {
Expand All @@ -279,12 +283,8 @@ class Frontend {
#endif

for case var location? in configLocations {
if #available(macOS 13.0, iOS 16.0, *) {
location.append(components: "swift-format", "config.json")
} else {
location.appendPathComponent("swift-format", isDirectory: true)
location.appendPathComponent("config.json", isDirectory: false)
}
location.appendPathComponent("swift-format", isDirectory: true)
location.appendPathComponent("config.json", isDirectory: false)
if FileManager.default.fileExists(atPath: location.path) {
do {
let configuration = try configurationLoader.configuration(at: location)
Expand Down