Add package modifier

taku0 · taku0 · commit 6b19157def17 · 2023-09-30T17:52:04.000+09:00
https://github.com/apple/swift-evolution/blob/main/proposals/0386-package-access-modifier.md
diff --git a/swift-mode-font-lock.el b/swift-mode-font-lock.el
@@ -522,9 +522,9 @@ Return nil otherwise."
 
 (defconst swift-mode:declaration-keywords
   '("associatedtype" "class" "deinit" "enum" "extension" "fileprivate" "func"
-    "import" "init" "inout" "internal" "let" "open" "operator" "private"
-    "protocol" "public" "any" "some" "static" "struct" "subscript" "typealias"
-    "var" "actor" "nonisolated" "isolated" "distributed"
+    "import" "init" "inout" "internal" "let" "open" "operator" "package"
+    "private" "protocol" "public" "any" "some" "static" "struct" "subscript"
+    "typealias" "var" "actor" "nonisolated" "isolated" "distributed"
     "borrowing" "consuming")
   "Keywords used in declarations.")
 
diff --git a/swift-mode-lexer.el b/swift-mode-lexer.el
@@ -669,7 +669,7 @@ return non-nil."
               '("indirect" "convenience" "dynamic" "final" "infix" "lazy"
                 "mutating" "nonmutating" "optional" "override" "postfix"
                 "prefix" "required" "static" "unowned" "weak" "internal"
-                "private" "public" "open" "fileprivate" "nonisolated"
+                "package" "private" "public" "open" "fileprivate" "nonisolated"
                 "distributed"))
       nil)
 
@@ -703,7 +703,7 @@ return non-nil."
               '("indirect" "convenience" "dynamic" "final" "infix" "lazy"
                 "mutating" "nonmutating" "optional" "override" "postfix"
                 "prefix" "required" "static" "unowned" "weak" "internal"
-                "private" "public" "open" "fileprivate" "nonisolated"
+                "package" "private" "public" "open" "fileprivate" "nonisolated"
                 "distributed"))
       t)
 
diff --git a/test/swift-files/indent/declarations.swift b/test/swift-files/indent/declarations.swift
@@ -760,6 +760,10 @@ class Foo {
       subscript(foo: Int) -> Int {
         return foo
     }
+
+    package
+      func foo() {
+    }
 }
 
 // async let
diff --git a/test/swift-files/indent/identifiers.swift b/test/swift-files/indent/identifiers.swift
@@ -94,6 +94,9 @@ func foo() {
     foo(
       public: 1
     )
+    foo(
+      package: 1
+    )
     foo(
       static: 1
     )

Original file line number	Diff line number	Diff line change
`@@ -760,6 +760,10 @@ class Foo {`
`760`	`760`	`subscript(foo: Int) -> Int {`
`761`	`761`	`return foo`
`762`	`762`	`}`
	`763`	`+`
	`764`	`+ package`
	`765`	`+ func foo() {`
	`766`	`+ }`
`763`	`767`	`}`
`764`	`768`
`765`	`769`	`// async let`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ func foo() {`
`94`	`94`	`foo(`
`95`	`95`	`public: 1`
`96`	`96`	`)`
	`97`	`+ foo(`
	`98`	`+ package: 1`
	`99`	`+ )`
`97`	`100`	`foo(`
`98`	`101`	`static: 1`
`99`	`102`	`)`