Allows any character except # for file names in SnapKit constraint de…

…scriptions (#16)
johnpatrickmorgan · Mar 12, 2019 · b750462 · b750462
1 parent 298d39b
commit b750462
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 2 deletions.
diff --git a/Sources/App/Parsing/ConstraintsParser+Instances.swift b/Sources/App/Parsing/ConstraintsParser+Instances.swift
@@ -35,7 +35,7 @@ private extension ConstraintsParser {
         .named("memory address")
     static let identifier = many(identifierCharacter.butNot(sqm), boundedBy: sqm).asString()
         .named("identifier")
-    static let fileLocation = character("@").skipThen(many(character(condition: isClassNameCharacter), untilSkipping: character("#")).asString()).then(integer)
+    static let fileLocation = character("@").skipThen(many(anyCharacter(), untilSkipping: character("#")).asString()).then(integer)
         .named("file location")
 
     static let partialIdentifierCharacter = characterNot(in: "[]|()<>\":")

diff --git a/Tests/AppTests/Inputs/Input+GitHubIssues.swift b/Tests/AppTests/Inputs/Input+GitHubIssues.swift
@@ -79,4 +79,8 @@ extension Input {
         "<NSLayoutConstraint:0x283c8c8c0 UILayoutGuide:0x2826f9880'UIViewLayoutMarginsGuide'.bottom == UIButton:0x10f755100'Cancel'.bottom NSSpace(0)   (active)>",
         "<NSLayoutConstraint:0x283c8c730 'UIView-bottomMargin-guide-constraint' V:[UILayoutGuide:0x2826f9880'UIViewLayoutMarginsGuide']-(42)-|   (active, names: '|':UIView:0x10f754f20 )>"
     """
+
+    static let issue16 = """
+        "<SnapKit.LayoutConstraint:0x7feb4e8fa260@PViewController+Ext.swift#21 App_Debug.StackView:0x7feb4e8d58b0.leading == UILayoutGuide:0x7feb50d2aa70.leading + 10.0>"
+    """
 }
diff --git a/Tests/AppTests/ParserTests.swift b/Tests/AppTests/ParserTests.swift
@@ -37,7 +37,8 @@ class ParserTests: XCTestCase {
             Input.issue4,
             Input.issue5,
             Input.issue10,
-            Input.issue13
+            Input.issue13,
+            Input.issue16
         ]
 
         for input in inputs {

diff --git a/Tests/AppTests/__Snapshots__/ParserTests/testGitHubIssues.7.json b/Tests/AppTests/__Snapshots__/ParserTests/testGitHubIssues.7.json
@@ -0,0 +1,50 @@
+{
+  "constraints" : [
+    {
+      "constant" : {
+        "prefix" : "+ ",
+        "value" : "10"
+      },
+      "description" : "<code style=\"box-shadow: 0px -1px 0px #E67E22 inset; padding-bottom: 1px;\">StackView<\/code>'s leading edge should equal <code style=\"box-shadow: 0px -1px 0px #F5D76E inset; padding-bottom: 1px;\">LayoutGuide<\/code>'s leading edge plus 10.",
+      "first" : {
+        "attribute" : {
+          "includesMargin" : false,
+          "name" : "leading"
+        },
+        "instance" : {
+          "address" : "0x7feb4e8d58b0",
+          "className" : "App_Debug.StackView",
+          "color" : "rgb(230,126,34)",
+          "initial" : "S",
+          "name" : "StackView",
+          "suffix" : ""
+        }
+      },
+      "identity" : {
+        "address" : "0x7feb4e8fa260",
+        "className" : "SnapKit.LayoutConstraint",
+        "color" : "rgb(26,188,156)",
+        "initial" : "L",
+        "name" : "LayoutConstraint"
+      },
+      "relation" : "==",
+      "second" : {
+        "attribute" : {
+          "includesMargin" : false,
+          "name" : "leading"
+        },
+        "instance" : {
+          "address" : "0x7feb50d2aa70",
+          "className" : "UILayoutGuide",
+          "color" : "rgb(245,215,110)",
+          "initial" : "L",
+          "name" : "LayoutGuide",
+          "suffix" : ""
+        }
+      }
+    }
+  ],
+  "footnotes" : [
+
+  ]
+}