Minor fixes

Author: stevapple

Package.swift

@@ -197,7 +197,7 @@ let package = Package(
         .target(
             /** Parse `@package` marks */
             name: "ScriptParse",
-            dependencies: ["SwiftSyntax", "SwiftToolsSupport-auto", "ArgumentParser"]
+            dependencies: ["SwiftToolsSupport-auto", "ArgumentParser", "SwiftSyntax"]
         ),
 
         .target(
@@ -249,7 +249,7 @@ let package = Package(
             name: "swift-script",
             dependencies: ["Commands"]),
         .target(
-            /** Manages and runs a script */
+            /** Parse `@package` marks */
             name: "package-parser",
             dependencies: ["ScriptParse"]),
         .target(

Sources/Commands/SwiftScriptTool.swift

@@ -1,12 +1,12 @@
 /*
-This source file is part of the Swift.org open source project
+ This source file is part of the Swift.org open source project
 
-Copyright 2015 - 2016 Apple Inc. and the Swift project authors
-Licensed under Apache License v2.0 with Runtime Library Exception
+ Copyright 2015 - 2021 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
 
-See http://swift.org/LICENSE.txt for license information
-See http://swift.org/CONTRIBUTORS.txt for Swift project authors
-*/
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+ */
 
 import ArgumentParser
 import Basics
@@ -179,7 +179,7 @@ extension SwiftScriptTool {
 
         @OptionGroup()
         var options: ScriptToolOptions
-        
+
         func run(_ swiftTool: SwiftTool, as productName: String, at cacheDirPath: AbsolutePath) throws {
             try swiftTool.getActiveWorkspace().clean(with: swiftTool.diagnostics)
         }
@@ -194,12 +194,12 @@ extension SwiftScriptTool {
 
         @OptionGroup()
         var options: ScriptToolOptions
-        
+
         func run(_ swiftTool: SwiftTool, as productName: String, at cacheDirPath: AbsolutePath) throws {
             try localFileSystem.removeFileTree(cacheDirPath)
         }
     }
-    
+
     struct Update: ScriptCommand {
         static let configuration = CommandConfiguration(
             abstract: "Update package dependencies")
@@ -209,11 +209,11 @@ extension SwiftScriptTool {
 
         @OptionGroup()
         var options: ScriptToolOptions
-        
+
         @Flag(name: [.long, .customShort("n")],
               help: "Display the list of dependencies that can be updated")
         var dryRun: Bool = false
-        
+
         @Argument(help: "The packages to update")
         var packages: [String] = []
 
@@ -284,10 +284,10 @@ extension SwiftScriptTool {
     struct ResolveOptions: ParsableArguments {
         @Option(help: "The version to resolve at", transform: { Version(string: $0) })
         var version: Version?
-        
+
         @Option(help: "The branch to resolve at")
         var branch: String?
-        
+
         @Option(help: "The revision to resolve at")
         var revision: String?
 
@@ -298,7 +298,7 @@ extension SwiftScriptTool {
     struct Resolve: ScriptCommand {
         static let configuration = CommandConfiguration(
             abstract: "Resolve package dependencies")
-        
+
         @OptionGroup(_hiddenFromHelp: true)
         var swiftOptions: SwiftToolOptions
 
@@ -307,7 +307,7 @@ extension SwiftScriptTool {
 
         @OptionGroup()
         var resolveOptions: ResolveOptions
-        
+
         func run(_ swiftTool: SwiftTool, as productName: String, at cacheDirPath: AbsolutePath) throws {
             // If a package is provided, use that to resolve the dependencies.
             if let packageName = resolveOptions.packageName {
@@ -351,11 +351,11 @@ fileprivate func run(
 /// - Parameter stream: Stream used for logging
 fileprivate func logPackageChanges(changes: [(PackageReference, Workspace.PackageStateChange)], pins: PinsStore, on stream: OutputByteStream = TSCBasic.stdoutStream) {
     let changes = changes.filter { $0.1 != .unchanged }
-    
+
     stream <<< "\n"
     stream <<< "\(changes.count) dependenc\(changes.count == 1 ? "y has" : "ies have") changed\(changes.count > 0 ? ":" : ".")"
     stream <<< "\n"
-    
+
     for (package, change) in changes {
         let currentVersion = pins.pinsMap[package.identity]?.state.description ?? ""
         switch change {

Sources/ScriptParse/Models.swift

@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
  FIXME: This is a temporary alternative of the frontend implementation.
-*/
+ */
 
 import struct Foundation.URL
 import TSCBasic
@@ -31,7 +31,7 @@ struct PackageModel: Codable {
 struct PackageDependency: Codable {
     let package: PackageModel
     var modules: [String] = []
-    
+
     init(of package: PackageModel) {
         self.package = package
     }

Sources/ScriptParse/ScriptParse.swift

@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
  FIXME: This is a temporary alternative of the frontend implementation.
-*/
+ */
 
 import SwiftSyntax
 import TSCBasic
@@ -23,14 +23,13 @@ public struct ScriptParse: ParsableCommand {
         encoder.outputFormatting = .prettyPrinted
         return encoder
     }()
-    
+
     public init() {}
 }
 
 extension ScriptParse {
     static func parse(_ path: AbsolutePath) throws -> ScriptDependencies {
         let syntaxTree = try SyntaxParser.parse(path.asURL)
-//        let converter = SourceLocationConverter(file: path.basename, tree: syntaxTree)
 
         var inPackageScope = false
         var keyStatements: [CodeBlockItemSyntax] = []
@@ -90,13 +89,13 @@ extension ScriptParse {
         }
         return ScriptDependencies(sourceFile: path, modules: collected)
     }
-    
+
     public func run() throws {
         let path = try AbsolutePath(validating: file)
         let json = try ScriptParse.manifest(for: path)
         print(String(data: json, encoding: .utf8)!)
     }
-    
+
     // FIXME: This should be removed some day.
     public static func manifest(for path: AbsolutePath) throws -> Data {
         let output = try parse(path)

Sources/ScriptParse/StatementKind.swift

@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
  FIXME: This is a temporary alternative of the frontend implementation.
-*/
+ */
 
 import SwiftSyntax
 

Sources/ScriptParse/misc.swift

@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
  FIXME: This is a temporary alternative of the frontend implementation.
-*/
+ */
 
 import SwiftSyntax
 import Foundation

Sources/ScriptingCore/Models.swift

@@ -16,7 +16,7 @@ public struct PackageModel: Codable {
     public let raw: String
     public let url: Foundation.URL?
     public let path: AbsolutePath?
-    public let _name: String?
+    private let _name: String?
 
     public var name: String {
         if let name = _name {
@@ -37,7 +37,7 @@ public struct PackageModel: Codable {
 public struct PackageDependency: Codable {
     public let package: PackageModel
     public var modules: [String] = []
-    
+
     init(of package: PackageModel) {
         self.package = package
     }