add more tests, remove docs, code cleanup

Author: Jesse Haigh

Sources/SwiftDocC/Model/Rendering/Content/RenderBlockContent.swift

@@ -721,10 +721,7 @@ extension RenderBlockContent: Codable {
             }
             self = try .aside(.init(style: style, content: container.decode([RenderBlockContent].self, forKey: .content)))
         case .codeListing:
-            var copy = false
-            if FeatureFlags.current.isExperimentalCodeBlockEnabled {
-                copy = true
-            }
+            let copy = FeatureFlags.current.isExperimentalCodeBlockEnabled
             self = try .codeListing(.init(
                 syntax: container.decodeIfPresent(String.self, forKey: .syntax),
                 code: container.decode([String].self, forKey: .code),

Sources/SwiftDocC/Semantics/Snippets/Snippet.swift

@@ -68,18 +68,12 @@ extension Snippet: RenderableDirectiveConvertible {
                 let lines = snippetMixin.lines[lineRange]
                 let minimumIndentation = lines.map { $0.prefix { $0.isWhitespace }.count }.min() ?? 0
                 let trimmedLines = lines.map { String($0.dropFirst(minimumIndentation)) }
-                var copy = false
-                if FeatureFlags.current.isExperimentalCodeBlockEnabled {
-                    copy = true
-                }
+                let copy = FeatureFlags.current.isExperimentalCodeBlockEnabled
                 return [RenderBlockContent.codeListing(.init(syntax: snippetMixin.language, code: trimmedLines, metadata: nil, copyToClipboard: copy))]
             } else {
                 // Render the whole snippet with its explanation content.
                 let docCommentContent = snippetEntity.markup.children.flatMap { contentCompiler.visit($0) }
-                var copy = false
-                if FeatureFlags.current.isExperimentalCodeBlockEnabled {
-                    copy = true
-                }
+                let copy = FeatureFlags.current.isExperimentalCodeBlockEnabled
                 let code = RenderBlockContent.codeListing(.init(syntax: snippetMixin.language, code: snippetMixin.lines, metadata: nil, copyToClipboard: copy))
                 return docCommentContent + [code]
             }

Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Convert.swift

@@ -478,7 +478,7 @@ extension Docc {
 
             @Flag(
                 name: .customLong("enable-experimental-code-block"),
-                help: "Annotate code blocks with additional metadata to support copy-to-clipboard, highlighting, and wrapping on code blocks."
+                help: "Support copy-to-clipboard for code blocks."
             )
             var enableExperimentalCodeBlock = false
 

Sources/docc/DocCDocumentation.docc/formatting-your-documentation-content.md

@@ -143,27 +143,6 @@ add a new line and terminate the code listing by adding another three backticks:
 instead of tabs so that DocC preserves the indentation when compiling your 
 documentation.
 
-#### Formatting Code Listings
-
-A copy-to-clipboard button is added to code listings by default behind the
-feature flag `--enable-experimental-code-block`.
-This renders a copy button in the top-right cotner of the code listing in
-generated documentation. When clicked, it copies the contents of the code
-block to the clipboard.
-
-If you don't want a code block to have a copy-to-clipboard button, you can
-include the `nocopy` option after the name of the programming language to
-disable it for that code listing:
-
-```swift, nocopy
-struct Sightseeing: Activity {
-    func perform(with sloth: inout Sloth) -> Speed {
-        sloth.energyLevel -= 10
-        return .slow
-    }
-}
-```
-
 DocC uses the programming language you specify to apply the correct syntax 
 color formatting. For the example above, DocC generates the following:
 

Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift

@@ -271,4 +271,49 @@ class RenderContentCompilerTests: XCTestCase {
 
         XCTAssertEqual(codeListing.copyToClipboard, false)
     }
+
+    func testCopyToClipboardNoFeatureFlag() async throws {
+        let (bundle, context) = try await testBundleAndContext()
+        var compiler = RenderContentCompiler(context: context, bundle: bundle, identifier: ResolvedTopicReference(bundleID: bundle.id, path: "/path", fragment: nil, sourceLanguage: .swift))
+
+        let source = #"""
+        ```swift
+        let x = 1
+        ```
+        """#
+        let document = Document(parsing: source)
+
+        let result = document.children.flatMap { compiler.visit($0) }
+
+        let renderCodeBlock = try XCTUnwrap(result[0] as? RenderBlockContent)
+        guard case let .codeListing(codeListing) = renderCodeBlock else {
+            XCTFail("Expected RenderBlockContent.codeListing")
+            return
+        }
+
+        XCTAssertEqual(codeListing.copyToClipboard, false)
+    }
+
+    func testNoCopyToClipboardNoFeatureFlag() async throws {
+        let (bundle, context) = try await testBundleAndContext()
+        var compiler = RenderContentCompiler(context: context, bundle: bundle, identifier: ResolvedTopicReference(bundleID: bundle.id, path: "/path", fragment: nil, sourceLanguage: .swift))
+
+        let source = #"""
+        ```swift, nocopy
+        let x = 1
+        ```
+        """#
+        let document = Document(parsing: source)
+
+        let result = document.children.flatMap { compiler.visit($0) }
+
+        let renderCodeBlock = try XCTUnwrap(result[0] as? RenderBlockContent)
+        guard case let .codeListing(codeListing) = renderCodeBlock else {
+            XCTFail("Expected RenderBlockContent.codeListing")
+            return
+        }
+
+        XCTAssertEqual(codeListing.syntax, "swift, nocopy")
+        XCTAssertEqual(codeListing.copyToClipboard, false)
+    }
 }