Merge pull request swiftlang#78 from allevato/disable-pretty-print-linter

Correctly apply debug flags in lint mode.

Author: allevato

Sources/SwiftFormat/SwiftLinter.swift

@@ -81,6 +81,10 @@ public final class SwiftLinter {
     var pipeline = LintPipeline(context: context)
     syntax.walk(&pipeline)
 
+    if debugOptions.contains(.disablePrettyPrint) {
+      return
+    }
+
     // Perform whitespace linting by comparing the input source text with the output of the
     // pretty-printer.
     let operatorContext = OperatorContext.makeBuiltinOperatorContext()

Sources/swift-format/Run.swift

@@ -24,12 +24,15 @@ import SwiftSyntax
 ///   - configuration: The `Configuration` that contains user-specific settings.
 ///   - sourceFile: A file handle from which to read the source code to be linted.
 ///   - assumingFilename: The filename of the source file, used in diagnostic output.
+///   - debugOptions: The set containing any debug options that were supplied on the command line.
 /// - Returns: Zero if there were no lint errors, otherwise a non-zero number.
-func lintMain(configuration: Configuration, sourceFile: FileHandle, assumingFilename: String?)
-  -> Int
-{
+func lintMain(
+  configuration: Configuration, sourceFile: FileHandle, assumingFilename: String?,
+  debugOptions: DebugOptions
+) -> Int {
   let diagnosticEngine = makeDiagnosticEngine()
   let linter = SwiftLinter(configuration: configuration, diagnosticEngine: diagnosticEngine)
+  linter.debugOptions = debugOptions
   let assumingFileURL = URL(fileURLWithPath: assumingFilename ?? "<stdin>")
 
   guard let source = readSource(from: sourceFile) else {

Sources/swift-format/main.swift

@@ -44,11 +44,13 @@ fileprivate func main(_ arguments: [String]) -> Int32 {
       return Int32(
         lintMain(
           configuration: configuration, sourceFile: FileHandle.standardInput,
-          assumingFilename: options.assumeFilename))
+          assumingFilename: options.assumeFilename, debugOptions: options.debugOptions))
     }
     return processSources(from: options.paths, configurationPath: options.configurationPath) {
       (sourceFile, path, configuration) in
-      lintMain(configuration: configuration, sourceFile: sourceFile, assumingFilename: path)
+      lintMain(
+        configuration: configuration, sourceFile: sourceFile, assumingFilename: path,
+        debugOptions: options.debugOptions)
     }
   case .dumpConfiguration:
     dumpDefaultConfiguration()