Merge pull request #2540 from tshortli/unknown-default

tshortli · web-flow · commit e63ea8a6a11f · 2024-03-14T15:13:05.000-07:00
Resolve `switch covers known cases, but 'Enum' may have additional unknown values` warnings
diff --git a/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparserdiagnostics/TokenNameForDiagnosticsFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparserdiagnostics/TokenNameForDiagnosticsFile.swift
@@ -29,6 +29,21 @@ let tokenNameForDiagnosticFile = SourceFileSyntax(leadingTrivia: copyrightHeader
         SwitchCaseSyntax("case .keyword(let keyword):") {
           StmtSyntax("return String(syntaxText: keyword.defaultText)")
         }
+        IfConfigDeclSyntax(
+          clauses: IfConfigClauseListSyntax {
+            IfConfigClauseSyntax(
+              poundKeyword: .poundIfToken(),
+              condition: ExprSyntax("RESILIENT_LIBRARIES"),
+              elements: .switchCases(
+                SwitchCaseListSyntax {
+                  SwitchCaseSyntax("@unknown default:") {
+                    StmtSyntax("fatalError()")
+                  }
+                }
+              )
+            )
+          }
+        )
       }
     }
   }
diff --git a/Sources/SwiftCompilerPluginMessageHandling/Diagnostics.swift b/Sources/SwiftCompilerPluginMessageHandling/Diagnostics.swift
@@ -54,6 +54,9 @@ extension PluginMessage.Diagnostic.Severity {
     case .warning: self = .warning
     case .note: self = .note
     case .remark: self = .remark
+    #if RESILIENT_LIBRARIES
+    @unknown default: fatalError()
+    #endif
     }
   }
 }
@@ -122,6 +125,10 @@ extension PluginMessage.Diagnostic {
               to: .afterTrailingTrivia
             )
             text = newTrivia.description
+          #if RESILIENT_LIBRARIES
+          @unknown default:
+            fatalError()
+          #endif
           }
           guard let range = range else {
             return nil
diff --git a/Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift b/Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift
@@ -153,6 +153,9 @@ class SourceManager {
     switch filePathMode {
     case .fileID: file = base.location.fileID
     case .filePath: file = base.location.fileName
+    #if RESILIENT_LIBRARIES
+    @unknown default: fatalError()
+    #endif
     }
 
     let localPosition = node.position(at: kind)
@@ -185,6 +188,10 @@ fileprivate extension Syntax {
       return self.endPositionBeforeTrailingTrivia
     case .afterTrailingTrivia:
       return self.endPosition
+    #if RESILIENT_LIBRARIES
+    @unknown default:
+      fatalError()
+    #endif
     }
   }
 }
diff --git a/Sources/SwiftOperators/OperatorTable+Semantics.swift b/Sources/SwiftOperators/OperatorTable+Semantics.swift
@@ -62,6 +62,10 @@ extension PrecedenceGroup {
         default:
           break
         }
+      #if RESILIENT_LIBRARIES
+      @unknown default:
+        fatalError()
+      #endif
       }
     }
   }
diff --git a/Sources/SwiftParser/StringLiteralRepresentedLiteralValue.swift b/Sources/SwiftParser/StringLiteralRepresentedLiteralValue.swift
@@ -43,6 +43,10 @@ extension StringLiteralExprSyntax {
       case .expressionSegment:
         // Bail out if there are any interpolation segments.
         return nil
+      #if RESILIENT_LIBRARIES
+      @unknown default:
+        fatalError()
+      #endif
       }
     }
 
diff --git a/Sources/SwiftParser/StringLiterals.swift b/Sources/SwiftParser/StringLiterals.swift
@@ -167,7 +167,10 @@ extension Parser {
     openQuoteHasTrailingNewline: Bool,
     middleSegments: inout [RawStringLiteralSegmentListSyntax.Element]
   ) -> Bool {
-    switch middleSegments.last {
+    guard let segment = middleSegments.last else {
+      return openQuoteHasTrailingNewline
+    }
+    switch segment {
     case .stringSegment(let lastMiddleSegment):
       if !lastMiddleSegment.content.trailingTriviaPieces.isEmpty {
         precondition(
@@ -218,8 +221,10 @@ extension Parser {
       }
     case .expressionSegment:
       return false
-    case nil:
-      return openQuoteHasTrailingNewline
+    #if RESILIENT_LIBRARIES
+    @unknown default:
+      fatalError()
+    #endif
     }
   }
 
@@ -282,6 +287,10 @@ extension Parser {
         if let rewrittenSegment = expressionIndentationChecker.checkIndentation(of: segment) {
           middleSegments[index] = .expressionSegment(rewrittenSegment)
         }
+      #if RESILIENT_LIBRARIES
+      @unknown default:
+        fatalError()
+      #endif
       }
     }
   }
diff --git a/Sources/SwiftParser/TokenPrecedence.swift b/Sources/SwiftParser/TokenPrecedence.swift
@@ -358,6 +358,10 @@ enum TokenPrecedence: Comparable {
       .wrt,
       .unsafe:
       self = .exprKeyword
+    #if RESILIENT_LIBRARIES
+    @unknown default:
+      fatalError()
+    #endif
     }
   }
 }
diff --git a/Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift b/Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift
@@ -230,6 +230,10 @@ public extension SwiftSyntax.TokenDiagnostic {
     case .unicodeCurlyQuote: return StaticTokenError.unicodeCurlyQuote
     case .unprintableAsciiCharacter: return StaticTokenError.unprintableAsciiCharacter
     case .unterminatedBlockComment: return StaticTokenError.unterminatedBlockComment
+    #if RESILIENT_LIBRARIES
+    @unknown default:
+      fatalError()
+    #endif
     }
   }
 
diff --git a/Sources/SwiftParserDiagnostics/SyntaxExtensions.swift b/Sources/SwiftParserDiagnostics/SyntaxExtensions.swift
@@ -216,6 +216,10 @@ extension TypeSpecifierListSyntax {
       switch specifier {
       case .simpleTypeSpecifier(let specifier): return specifier.specifier
       case .lifetimeTypeSpecifier: return nil
+      #if RESILIENT_LIBRARIES
+      @unknown default:
+        fatalError()
+      #endif
       }
     }
   }
diff --git a/Sources/SwiftParserDiagnostics/generated/TokenNameForDiagnostics.swift b/Sources/SwiftParserDiagnostics/generated/TokenNameForDiagnostics.swift
@@ -117,6 +117,9 @@ extension TokenKind {
       return "wildcard"
     case .keyword(let keyword):
       return String(syntaxText: keyword.defaultText)
+    #if RESILIENT_LIBRARIES
+    @unknown default:fatalError()
+    #endif
     }
   }
 }
diff --git a/Sources/SwiftRefactor/FormatRawStringLiteral.swift b/Sources/SwiftRefactor/FormatRawStringLiteral.swift
@@ -47,6 +47,10 @@ public struct FormatRawStringLiteral: SyntaxRefactoringProvider {
       case .stringSegment(let string):
         // Find the longest run of # characters in the content of the literal.
         maximumHashes = max(maximumHashes, string.content.text.longestRun(of: "#"))
+      #if RESILIENT_LIBRARIES
+      @unknown default:
+        fatalError()
+      #endif
       }
     }
 
diff --git a/Sources/SwiftSyntaxMacroExpansion/BasicMacroExpansionContext.swift b/Sources/SwiftSyntaxMacroExpansion/BasicMacroExpansionContext.swift
@@ -230,6 +230,11 @@ extension BasicMacroExpansionContext: MacroExpansionContext {
 
     case .filePath:
       fileName = knownRoot.fullFilePath
+
+    #if RESILIENT_LIBRARIES
+    @unknown default:
+      fatalError()
+    #endif
     }
 
     // Find the node's offset relative to its root.
@@ -246,6 +251,11 @@ extension BasicMacroExpansionContext: MacroExpansionContext {
 
     case .afterTrailingTrivia:
       rawPosition = node.endPosition
+
+    #if RESILIENT_LIBRARIES
+    @unknown default:
+      fatalError()
+    #endif
     }
 
     // Do the location lookup.
diff --git a/Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift b/Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift
@@ -402,6 +402,10 @@ fileprivate extension SyntaxProtocol {
       formatted = self.formatted(using: BasicFormat(indentationWidth: indentationWidth))
     case .disabled:
       formatted = Syntax(self)
+    #if RESILIENT_LIBRARIES
+    @unknown default:
+      fatalError()
+    #endif
     }
     return formatted.trimmedDescription(matching: { $0.isWhitespace })
   }
diff --git a/Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift b/Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift
@@ -1296,6 +1296,10 @@ private extension AccessorBlockSyntax {
         )
       )
       result.accessors = .accessors(AccessorDeclListSyntax([getterAsAccessor] + Array(newAccessors)))
+    #if RESILIENT_LIBRARIES
+    @unknown default:
+      fatalError()
+    #endif
     }
     return result
   }
diff --git a/cmake/modules/AddSwiftHostLibrary.cmake b/cmake/modules/AddSwiftHostLibrary.cmake
@@ -73,6 +73,7 @@ function(add_swift_syntax_library name)
   # Configure the emission of the Swift module files.
   target_compile_options("${name}" PRIVATE
     $<$<COMPILE_LANGUAGE:Swift>:
+      -DRESILIENT_LIBRARIES;
       -module-name;${name};
       -enable-library-evolution;
       -emit-module-path;${module_file};

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,21 @@ let tokenNameForDiagnosticFile = SourceFileSyntax(leadingTrivia: copyrightHeader`
`29`	`29`	`SwitchCaseSyntax("case .keyword(let keyword):") {`
`30`	`30`	`StmtSyntax("return String(syntaxText: keyword.defaultText)")`
`31`	`31`	`}`
	`32`	`+ IfConfigDeclSyntax(`
	`33`	`+ clauses: IfConfigClauseListSyntax {`
	`34`	`+ IfConfigClauseSyntax(`
	`35`	`+ poundKeyword: .poundIfToken(),`
	`36`	`+ condition: ExprSyntax("RESILIENT_LIBRARIES"),`
	`37`	`+ elements: .switchCases(`
	`38`	`+ SwitchCaseListSyntax {`
	`39`	`+ SwitchCaseSyntax("@unknown default:") {`
	`40`	`+ StmtSyntax("fatalError()")`
	`41`	`+ }`
	`42`	`+ }`
	`43`	`+ )`
	`44`	`+ )`
	`45`	`+ }`
	`46`	`+ )`
`32`	`47`	`}`
`33`	`48`	`}`
`34`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ extension PluginMessage.Diagnostic.Severity {`
`54`	`54`	`case .warning: self = .warning`
`55`	`55`	`case .note: self = .note`
`56`	`56`	`case .remark: self = .remark`
	`57`	`+ #if RESILIENT_LIBRARIES`
	`58`	`+ @unknown default: fatalError()`
	`59`	`+ #endif`
`57`	`60`	`}`
`58`	`61`	`}`
`59`	`62`	`}`
`@@ -122,6 +125,10 @@ extension PluginMessage.Diagnostic {`
`122`	`125`	`to: .afterTrailingTrivia`
`123`	`126`	`)`
`124`	`127`	`text = newTrivia.description`
	`128`	`+ #if RESILIENT_LIBRARIES`
	`129`	`+ @unknown default:`
	`130`	`+ fatalError()`
	`131`	`+ #endif`
`125`	`132`	`}`
`126`	`133`	`guard let range = range else {`
`127`	`134`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,9 @@ class SourceManager {`
`153`	`153`	`switch filePathMode {`
`154`	`154`	`case .fileID: file = base.location.fileID`
`155`	`155`	`case .filePath: file = base.location.fileName`
	`156`	`+ #if RESILIENT_LIBRARIES`
	`157`	`+ @unknown default: fatalError()`
	`158`	`+ #endif`
`156`	`159`	`}`
`157`	`160`
`158`	`161`	`let localPosition = node.position(at: kind)`
`@@ -185,6 +188,10 @@ fileprivate extension Syntax {`
`185`	`188`	`return self.endPositionBeforeTrailingTrivia`
`186`	`189`	`case .afterTrailingTrivia:`
`187`	`190`	`return self.endPosition`
	`191`	`+ #if RESILIENT_LIBRARIES`
	`192`	`+ @unknown default:`
	`193`	`+ fatalError()`
	`194`	`+ #endif`
`188`	`195`	`}`
`189`	`196`	`}`
`190`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ extension PrecedenceGroup {`
`62`	`62`	`default:`
`63`	`63`	`break`
`64`	`64`	`}`
	`65`	`+ #if RESILIENT_LIBRARIES`
	`66`	`+ @unknown default:`
	`67`	`+ fatalError()`
	`68`	`+ #endif`
`65`	`69`	`}`
`66`	`70`	`}`
`67`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@ extension StringLiteralExprSyntax {`
`43`	`43`	`case .expressionSegment:`
`44`	`44`	`// Bail out if there are any interpolation segments.`
`45`	`45`	`return nil`
	`46`	`+ #if RESILIENT_LIBRARIES`
	`47`	`+ @unknown default:`
	`48`	`+ fatalError()`
	`49`	`+ #endif`
`46`	`50`	`}`
`47`	`51`	`}`
`48`	`52`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,10 @@ extension Parser {`
`167`	`167`	`openQuoteHasTrailingNewline: Bool,`
`168`	`168`	`middleSegments: inout [RawStringLiteralSegmentListSyntax.Element]`
`169`	`169`	`) -> Bool {`
`170`		`- switch middleSegments.last {`
	`170`	`+ guard let segment = middleSegments.last else {`
	`171`	`+ return openQuoteHasTrailingNewline`
	`172`	`+ }`
	`173`	`+ switch segment {`
`171`	`174`	`case .stringSegment(let lastMiddleSegment):`
`172`	`175`	`if !lastMiddleSegment.content.trailingTriviaPieces.isEmpty {`
`173`	`176`	`precondition(`
`@@ -218,8 +221,10 @@ extension Parser {`
`218`	`221`	`}`
`219`	`222`	`case .expressionSegment:`
`220`	`223`	`return false`
`221`		`- case nil:`
`222`		`- return openQuoteHasTrailingNewline`
	`224`	`+ #if RESILIENT_LIBRARIES`
	`225`	`+ @unknown default:`
	`226`	`+ fatalError()`
	`227`	`+ #endif`
`223`	`228`	`}`
`224`	`229`	`}`
`225`	`230`
`@@ -282,6 +287,10 @@ extension Parser {`
`282`	`287`	`if let rewrittenSegment = expressionIndentationChecker.checkIndentation(of: segment) {`
`283`	`288`	`middleSegments[index] = .expressionSegment(rewrittenSegment)`
`284`	`289`	`}`
	`290`	`+ #if RESILIENT_LIBRARIES`
	`291`	`+ @unknown default:`
	`292`	`+ fatalError()`
	`293`	`+ #endif`
`285`	`294`	`}`
`286`	`295`	`}`
`287`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,10 @@ enum TokenPrecedence: Comparable {`
`358`	`358`	`.wrt,`
`359`	`359`	`.unsafe:`
`360`	`360`	`self = .exprKeyword`
	`361`	`+ #if RESILIENT_LIBRARIES`
	`362`	`+ @unknown default:`
	`363`	`+ fatalError()`
	`364`	`+ #endif`
`361`	`365`	`}`
`362`	`366`	`}`
`363`	`367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,10 @@ public extension SwiftSyntax.TokenDiagnostic {`
`230`	`230`	`case .unicodeCurlyQuote: return StaticTokenError.unicodeCurlyQuote`
`231`	`231`	`case .unprintableAsciiCharacter: return StaticTokenError.unprintableAsciiCharacter`
`232`	`232`	`case .unterminatedBlockComment: return StaticTokenError.unterminatedBlockComment`
	`233`	`+ #if RESILIENT_LIBRARIES`
	`234`	`+ @unknown default:`
	`235`	`+ fatalError()`
	`236`	`+ #endif`
`233`	`237`	`}`
`234`	`238`	`}`
`235`	`239`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,10 @@ extension TypeSpecifierListSyntax {`
`216`	`216`	`switch specifier {`
`217`	`217`	`case .simpleTypeSpecifier(let specifier): return specifier.specifier`
`218`	`218`	`case .lifetimeTypeSpecifier: return nil`
	`219`	`+ #if RESILIENT_LIBRARIES`
	`220`	`+ @unknown default:`
	`221`	`+ fatalError()`
	`222`	`+ #endif`
`219`	`223`	`}`
`220`	`224`	`}`
`221`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,9 @@ extension TokenKind {`
`117`	`117`	`return "wildcard"`
`118`	`118`	`case .keyword(let keyword):`
`119`	`119`	`return String(syntaxText: keyword.defaultText)`
	`120`	`+ #if RESILIENT_LIBRARIES`
	`121`	`+ @unknown default:fatalError()`
	`122`	`+ #endif`
`120`	`123`	`}`
`121`	`124`	`}`
`122`	`125`	`}`