diff --git a/Sources/Frontend/Commands/ScanCommand.swift b/Sources/Frontend/Commands/ScanCommand.swift index 9ce12635e..e432b5787 100644 --- a/Sources/Frontend/Commands/ScanCommand.swift +++ b/Sources/Frontend/Commands/ScanCommand.swift @@ -57,8 +57,8 @@ struct ScanCommand: FrontendCommand { @Flag(help: "Disable identification of redundant public accessibility") var disableRedundantPublicAnalysis: Bool = defaultConfiguration.$disableRedundantPublicAnalysis.defaultValue - @Flag(help: "Enable identification of unused imports") - var enableUnusedImportAnalysis: Bool = defaultConfiguration.$enableUnusedImportsAnalysis.defaultValue + @Flag(help: "Disable identification of unused imports") + var disableUnusedImportAnalysis: Bool = defaultConfiguration.$disableUnusedImportAnalysis.defaultValue @Flag(help: "Retain properties that are assigned, but never used") var retainAssignOnlyProperties: Bool = defaultConfiguration.$retainAssignOnlyProperties.defaultValue @@ -147,7 +147,7 @@ struct ScanCommand: FrontendCommand { configuration.apply(\.$retainUnusedProtocolFuncParams, retainUnusedProtocolFuncParams) configuration.apply(\.$retainSwiftUIPreviews, retainSwiftUIPreviews) configuration.apply(\.$disableRedundantPublicAnalysis, disableRedundantPublicAnalysis) - configuration.apply(\.$enableUnusedImportsAnalysis, enableUnusedImportAnalysis) + configuration.apply(\.$disableUnusedImportAnalysis, disableUnusedImportAnalysis) configuration.apply(\.$externalEncodableProtocols, externalEncodableProtocols) configuration.apply(\.$externalCodableProtocols, externalCodableProtocols) configuration.apply(\.$externalTestCaseClasses, externalTestCaseClasses) diff --git a/Sources/PeripheryKit/Indexer/SwiftIndexer.swift b/Sources/PeripheryKit/Indexer/SwiftIndexer.swift index 29b450d66..a48cf3547 100644 --- a/Sources/PeripheryKit/Indexer/SwiftIndexer.swift +++ b/Sources/PeripheryKit/Indexer/SwiftIndexer.swift @@ -254,8 +254,8 @@ public final class SwiftIndexer: Indexer { multiplexingSyntaxVisitor.visit() sourceFile.importStatements = importSyntaxVisitor.importStatements - - if configuration.enableUnusedImportsAnalysis { + + if !configuration.disableUnusedImportAnalysis { for stmt in sourceFile.importStatements { if stmt.isExported { graph.addExportedModule(stmt.module, exportedBy: sourceFile.modules) @@ -288,7 +288,7 @@ public final class SwiftIndexer: Indexer { } } - if configuration.enableUnusedImportsAnalysis { + if !configuration.disableUnusedImportAnalysis { graph.addIndexedModules(modules) } diff --git a/Sources/PeripheryKit/SourceGraph/Mutators/UnusedImportMarker.swift b/Sources/PeripheryKit/SourceGraph/Mutators/UnusedImportMarker.swift index 0d3fc2d99..6645691a6 100644 --- a/Sources/PeripheryKit/SourceGraph/Mutators/UnusedImportMarker.swift +++ b/Sources/PeripheryKit/SourceGraph/Mutators/UnusedImportMarker.swift @@ -19,7 +19,7 @@ final class UnusedImportMarker: SourceGraphMutator { } func mutate() throws { - guard configuration.enableUnusedImportsAnalysis else { return } + guard !configuration.disableUnusedImportAnalysis else { return } var referencedModulesByFile = [SourceFile: Set]() diff --git a/Sources/Shared/Configuration.swift b/Sources/Shared/Configuration.swift index 902ef8fa2..a9473584c 100644 --- a/Sources/Shared/Configuration.swift +++ b/Sources/Shared/Configuration.swift @@ -77,8 +77,8 @@ public final class Configuration { @Setting(key: "disable_redundant_public_analysis", defaultValue: false) public var disableRedundantPublicAnalysis: Bool - @Setting(key: "enable_unused_import_analysis", defaultValue: true) - public var enableUnusedImportsAnalysis: Bool + @Setting(key: "disable_unused_import_analysis", defaultValue: false) + public var disableUnusedImportAnalysis: Bool @Setting(key: "retain_codable_properties", defaultValue: false) public var retainCodableProperties: Bool @@ -204,8 +204,8 @@ public final class Configuration { config[$disableRedundantPublicAnalysis.key] = disableRedundantPublicAnalysis } - if $enableUnusedImportsAnalysis.hasNonDefaultValue { - config[$enableUnusedImportsAnalysis.key] = enableUnusedImportsAnalysis + if $disableUnusedImportAnalysis.hasNonDefaultValue { + config[$disableUnusedImportAnalysis.key] = disableUnusedImportAnalysis } if $autoRemove.hasNonDefaultValue { @@ -313,8 +313,8 @@ public final class Configuration { $retainSwiftUIPreviews.assign(value) case $disableRedundantPublicAnalysis.key: $disableRedundantPublicAnalysis.assign(value) - case $enableUnusedImportsAnalysis.key: - $enableUnusedImportsAnalysis.assign(value) + case $disableUnusedImportAnalysis.key: + $disableUnusedImportAnalysis.assign(value) case $autoRemove.key: $autoRemove.assign(value) case $verbose.key: @@ -362,7 +362,7 @@ public final class Configuration { $retainUnusedProtocolFuncParams.reset() $retainSwiftUIPreviews.reset() $disableRedundantPublicAnalysis.reset() - $enableUnusedImportsAnalysis.reset() + $disableUnusedImportAnalysis.reset() $autoRemove.reset() $externalEncodableProtocols.reset() $externalCodableProtocols.reset()