forked from phoedos/pmd
Add swift 5.9 support
This commit is contained in:
kenji
parent
c6d55ca059
commit
10ae2fae96
@ -122,6 +122,7 @@ public class AntlrNameDictionary {
|
||||
|
||||
case "@": return "at-symbol";
|
||||
case "$": return "dollar";
|
||||
case "#": return "hash";
|
||||
|
||||
case "\\": return "backslash";
|
||||
case "/": return "slash";
|
||||
|
||||
@ -60,7 +60,7 @@ class BinaryDistributionIT extends AbstractBinaryDistributionTest {
|
||||
"scala-2.10", "scala-2.11", "scala-2.12", "scala-2.13",
|
||||
"swift-4.2", "swift-5.0", "swift-5.1", "swift-5.2",
|
||||
"swift-5.3", "swift-5.4", "swift-5.5", "swift-5.6",
|
||||
"swift-5.7", "vf-52", "vf-53", "vf-54", "vf-55", "vf-56",
|
||||
"swift-5.7", "swift-5.8", "swift-5.9", "vf-52", "vf-53", "vf-54", "vf-55", "vf-56",
|
||||
"vf-57", "vf-58", "vf-59",
|
||||
"vm-2.0", "vm-2.1", "vm-2.2", "vm-2.3", "wsdl-1.1",
|
||||
"wsdl-2.0", "xml-1.0", "xml-1.1", "xsl-1.0", "xsl-2.0",
|
||||
|
||||
@ -211,6 +211,7 @@ declaration
|
||||
| constantDeclaration ';'?
|
||||
| variableDeclaration ';'?
|
||||
| typealiasDeclaration ';'?
|
||||
| macroExpansionExpression ';'?
|
||||
| functionDeclaration ';'?
|
||||
| enumDeclaration ';'?
|
||||
| structDeclaration ';'?
|
||||
@ -297,6 +298,10 @@ typealiasHead : attributes? accessLevelModifier? 'typealias' typealiasName gener
|
||||
typealiasName : identifier ;
|
||||
typealiasAssignment : '=' sType ;
|
||||
|
||||
// GRAMMAR OF A MACRO DECLARATION
|
||||
|
||||
macroExpansionExpression: '#' identifier genericArgumentClause? functionCallArgumentClause? ;
|
||||
|
||||
// GRAMMAR OF A FUNCTION DECLARATION
|
||||
|
||||
/* HACK: functionBody? is intentionally not used to force the parser to try and match a functionBody first
|
||||
|
||||
@ -30,7 +30,9 @@ public class SwiftLanguageModule extends SimpleLanguageModuleBase {
|
||||
.addVersion("5.4")
|
||||
.addVersion("5.5")
|
||||
.addVersion("5.6")
|
||||
.addDefaultVersion("5.7"),
|
||||
.addVersion("5.7")
|
||||
.addVersion("5.8")
|
||||
.addDefaultVersion("5.9"),
|
||||
new SwiftHandler());
|
||||
}
|
||||
|
||||
|
||||
@ -50,6 +50,11 @@ class SwiftTokenizerTest extends CpdTextComparisonTest {
|
||||
doTest("Swift5.6");
|
||||
}
|
||||
|
||||
@Test
|
||||
void testSwift59() {
|
||||
doTest("Swift5.9");
|
||||
}
|
||||
|
||||
@Test
|
||||
void testStackoverflowOnLongLiteral() {
|
||||
doTest("Issue628");
|
||||
|
||||
43
pmd-swift/src/test/resources/net/sourceforge/pmd/lang/swift/cpd/testdata/Swift5.9.swift
vendored
Normal file
43
pmd-swift/src/test/resources/net/sourceforge/pmd/lang/swift/cpd/testdata/Swift5.9.swift
vendored
Normal file
@ -0,0 +1,43 @@
|
||||
import SwiftUI
|
||||
|
||||
struct ContentView: View {
|
||||
var body: some View {
|
||||
TabBarView()
|
||||
}
|
||||
}
|
||||
|
||||
#Preview {
|
||||
ContentView()
|
||||
}
|
||||
|
||||
// Macro Expansion: https://github.com/apple/swift-evolution/blob/main/proposals/0382-expression-macros.md#macro-expansion
|
||||
let _: Font = #fontLiteral(name: "SF Mono", size: 14, weight: .regular)
|
||||
|
||||
// Parameter packs
|
||||
func all<each Wrapped>(_ optional: repeat (each Wrapped)?) -> (repeat each Wrapped)?
|
||||
|
||||
func useAll() {
|
||||
if let (int, double, string, bool) = all(optionalInt, optionalDouble, optionalString, optionalBool) {
|
||||
print(int, double, string, bool)
|
||||
}
|
||||
else {
|
||||
print("got a nil")
|
||||
}
|
||||
}
|
||||
|
||||
// return value on if/else if/else
|
||||
statusBar.text = if !hasConnection { "Disconnected" }
|
||||
else if let error = lastError { error.localizedDescription }
|
||||
else { "Ready" }
|
||||
|
||||
// https://docs.swift.org/swift-book/documentation/the-swift-programming-language/macros/
|
||||
@attached(member)
|
||||
@attached(conformance)
|
||||
public macro OptionSet<RawType>() = #externalMacro(module: "SwiftMacros", type: "OptionSetMacro")
|
||||
|
||||
import SwiftUI
|
||||
|
||||
#Preview {
|
||||
Text()
|
||||
.padding()
|
||||
}
|
||||
217
pmd-swift/src/test/resources/net/sourceforge/pmd/lang/swift/cpd/testdata/Swift5.9.txt
vendored
Normal file
217
pmd-swift/src/test/resources/net/sourceforge/pmd/lang/swift/cpd/testdata/Swift5.9.txt
vendored
Normal file
@ -0,0 +1,217 @@
|
||||
[Image] or [Truncated image[ Bcol Ecol
|
||||
L1
|
||||
[import] 1 7
|
||||
[SwiftUI] 8 15
|
||||
L3
|
||||
[struct] 1 7
|
||||
[ContentView] 8 19
|
||||
[:] 19 20
|
||||
[View] 21 25
|
||||
[{] 26 27
|
||||
L4
|
||||
[var] 5 8
|
||||
[body] 9 13
|
||||
[:] 13 14
|
||||
[some] 15 19
|
||||
[View] 20 24
|
||||
[{] 25 26
|
||||
L5
|
||||
[TabBarView] 9 19
|
||||
[(] 19 20
|
||||
[)] 20 21
|
||||
L6
|
||||
[}] 5 6
|
||||
L7
|
||||
[}] 1 2
|
||||
L9
|
||||
[#] 1 2
|
||||
[Preview] 2 9
|
||||
[{] 10 11
|
||||
L10
|
||||
[ContentView] 5 16
|
||||
[(] 16 17
|
||||
[)] 17 18
|
||||
L11
|
||||
[}] 1 2
|
||||
L14
|
||||
[let] 1 4
|
||||
[_] 5 6
|
||||
[:] 6 7
|
||||
[Font] 8 12
|
||||
[=] 13 14
|
||||
[#] 15 16
|
||||
[fontLiteral] 16 27
|
||||
[(] 27 28
|
||||
[name] 28 32
|
||||
[:] 32 33
|
||||
["SF Mono"] 34 43
|
||||
[,] 43 44
|
||||
[size] 45 49
|
||||
[:] 49 50
|
||||
[14] 51 53
|
||||
[,] 53 54
|
||||
[weight] 55 61
|
||||
[:] 61 62
|
||||
[.] 63 64
|
||||
[regular] 64 71
|
||||
[)] 71 72
|
||||
L17
|
||||
[func] 1 5
|
||||
[all] 6 9
|
||||
[<] 9 10
|
||||
[each] 10 14
|
||||
[Wrapped] 15 22
|
||||
[>] 22 23
|
||||
[(] 23 24
|
||||
[_] 24 25
|
||||
[optional] 26 34
|
||||
[:] 34 35
|
||||
[repeat] 36 42
|
||||
[(] 43 44
|
||||
[each] 44 48
|
||||
[Wrapped] 49 56
|
||||
[)] 56 57
|
||||
[?] 57 58
|
||||
[)] 58 59
|
||||
[->] 60 62
|
||||
[(] 63 64
|
||||
[repeat] 64 70
|
||||
[each] 71 75
|
||||
[Wrapped] 76 83
|
||||
[)] 83 84
|
||||
[?] 84 85
|
||||
L19
|
||||
[func] 1 5
|
||||
[useAll] 6 12
|
||||
[(] 12 13
|
||||
[)] 13 14
|
||||
[{] 15 16
|
||||
L20
|
||||
[if] 5 7
|
||||
[let] 8 11
|
||||
[(] 12 13
|
||||
[int] 13 16
|
||||
[,] 16 17
|
||||
[double] 18 24
|
||||
[,] 24 25
|
||||
[string] 26 32
|
||||
[,] 32 33
|
||||
[bool] 34 38
|
||||
[)] 38 39
|
||||
[=] 40 41
|
||||
[all] 42 45
|
||||
[(] 45 46
|
||||
[optionalInt] 46 57
|
||||
[,] 57 58
|
||||
[optionalDouble] 59 73
|
||||
[,] 73 74
|
||||
[optionalString] 75 89
|
||||
[,] 89 90
|
||||
[optionalBool] 91 103
|
||||
[)] 103 104
|
||||
[{] 105 106
|
||||
L21
|
||||
[print] 9 14
|
||||
[(] 14 15
|
||||
[int] 15 18
|
||||
[,] 18 19
|
||||
[double] 20 26
|
||||
[,] 26 27
|
||||
[string] 28 34
|
||||
[,] 34 35
|
||||
[bool] 36 40
|
||||
[)] 40 41
|
||||
L22
|
||||
[}] 5 6
|
||||
L23
|
||||
[else] 5 9
|
||||
[{] 10 11
|
||||
L24
|
||||
[print] 9 14
|
||||
[(] 14 15
|
||||
["got a nil"] 15 26
|
||||
[)] 26 27
|
||||
L25
|
||||
[}] 5 6
|
||||
L26
|
||||
[}] 1 2
|
||||
L29
|
||||
[statusBar] 1 10
|
||||
[.] 10 11
|
||||
[text] 11 15
|
||||
[=] 16 17
|
||||
[if] 18 20
|
||||
[!] 21 22
|
||||
[hasConnection] 22 35
|
||||
[{] 36 37
|
||||
["Disconnected"] 38 52
|
||||
[}] 53 54
|
||||
L30
|
||||
[else] 18 22
|
||||
[if] 23 25
|
||||
[let] 26 29
|
||||
[error] 30 35
|
||||
[=] 36 37
|
||||
[lastError] 38 47
|
||||
[{] 48 49
|
||||
[error] 50 55
|
||||
[.] 55 56
|
||||
[localizedDescription] 56 76
|
||||
[}] 77 78
|
||||
L31
|
||||
[else] 18 22
|
||||
[{] 23 24
|
||||
["Ready"] 25 32
|
||||
[}] 33 34
|
||||
L34
|
||||
[@] 1 2
|
||||
[attached] 2 10
|
||||
[(] 10 11
|
||||
[member] 11 17
|
||||
[)] 17 18
|
||||
L35
|
||||
[@] 1 2
|
||||
[attached] 2 10
|
||||
[(] 10 11
|
||||
[conformance] 11 22
|
||||
[)] 22 23
|
||||
L36
|
||||
[public] 1 7
|
||||
[macro] 8 13
|
||||
[OptionSet] 14 23
|
||||
[<] 23 24
|
||||
[RawType] 24 31
|
||||
[>] 31 32
|
||||
[(] 32 33
|
||||
[)] 33 34
|
||||
[=] 35 36
|
||||
[#] 37 38
|
||||
[externalMacro] 38 51
|
||||
[(] 51 52
|
||||
[module] 52 58
|
||||
[:] 58 59
|
||||
["SwiftMacros"] 60 73
|
||||
[,] 73 74
|
||||
[type] 75 79
|
||||
[:] 79 80
|
||||
["OptionSetMacro"] 81 97
|
||||
[)] 97 98
|
||||
L38
|
||||
[import] 1 7
|
||||
[SwiftUI] 8 15
|
||||
L40
|
||||
[#] 1 2
|
||||
[Preview] 2 9
|
||||
[{] 10 11
|
||||
L41
|
||||
[Text] 5 9
|
||||
[(] 9 10
|
||||
[)] 10 11
|
||||
L42
|
||||
[.] 5 6
|
||||
[padding] 6 13
|
||||
[(] 13 14
|
||||
[)] 14 15
|
||||
L43
|
||||
[}] 1 2
|
||||
EOF
|
||||
Loading…
x
Reference in New Issue
Block a user